Changeset 522 for pkpgcounter/trunk/pkpgpdls/analyzer.py

Timestamp:

11/28/07 11:13:33 (16 years ago)

Author:

jerome

Message:

Finally we need to duplicate some datas, since for some file formats (e.g. mstrash)
a preliminary conversion will have to be done (through wvware for example) and we
would need to overwrite original values, which is not desirable.

Files:

• pkpgcounter/trunk/pkpgpdls/analyzer.py (modified) (4 diffs)

pkpgcounter/trunk/pkpgpdls/analyzer.py

@@ -56 +56 @@
         self.workfile = None 
         self.mustclose = None
-        self.firstblock = None
-        self.lastblock = None
         
     def getJobSize(self) :    
@@ -128 +126 @@
             self.workfile.close()    
         
-    def readFirstAndLastBlocks(self) :    
+    def readFirstAndLastBlocks(self, inputfile) :
         """Reads the first and last blocks of data."""
         # Now read first and last block of the input file
         # to be able to detect the real file format and the parser to use.
-        self.firstblock = self.workfile.read(pdlparser.FIRSTBLOCKSIZE)
-        try :
-            self.workfile.seek(-pdlparser.LASTBLOCKSIZE, 2)
-            self.lastblock = self.workfile.read(pdlparser.LASTBLOCKSIZE)
+        firstblock = inputfile.read(pdlparser.FIRSTBLOCKSIZE)
+        try :
+            inputfile.seek(-pdlparser.LASTBLOCKSIZE, 2)
+            lastblock = inputfile.read(pdlparser.LASTBLOCKSIZE)
         except IOError :    
-            self.lastblock = ""
+            lastblock = ""
+        return (firstblock, lastblock)     
             
     def detectPDLHandler(self) :    
@@ -146 +145 @@
         if not os.stat(self.filename).st_size :
             raise pdlparser.PDLParserError, "input file %s is empty !" % str(self.filename)
-        self.readFirstAndLastBlocks()
+        (firstblock, lastblock) = self.readFirstAndLastBlocks(self.workfile)
             
         # IMPORTANT : the order is important below. FIXME.
@@ -167 +166 @@
                        plain) :     # IMPORTANT : don't move this one up !
             try :               
-                return module.Parser(self)
+                return module.Parser(self, (firstblock, lastblock))
             except pdlparser.PDLParserError :
                 pass # try next parser