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

Timestamp:

11/28/07 00:52:52 (16 years ago)

Author:

jerome

Message:

Code cleaning.

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) :    
@@ -126 +128 @@
             self.workfile.close()    
         
+    def readFirstAndLastBlocks(self) :    
+        """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)
+        except IOError :    
+            self.lastblock = ""
+            
     def detectPDLHandler(self) :    
         """Tries to autodetect the document format.
@@ -133 +146 @@
         if not os.stat(self.filename).st_size :
             raise pdlparser.PDLParserError, "input file %s is empty !" % str(self.filename)
-        
-        # Now read first and last block of the input file
-        # to be able to detect the real file format and the parser to use.
-        firstblock = self.workfile.read(pdlparser.FIRSTBLOCKSIZE)
-        try :
-            self.workfile.seek(-pdlparser.LASTBLOCKSIZE, 2)
-            lastblock = self.workfile.read(pdlparser.LASTBLOCKSIZE)
-        except IOError :    
-            lastblock = ""
+        self.readFirstAndLastBlocks()
             
         # IMPORTANT : the order is important below. FIXME.
@@ -162 +167 @@
                        plain) :     # IMPORTANT : don't move this one up !
             try :               
-                return module.Parser(self.filename, firstblock,
-                                                    lastblock,
-                                                    self.options.debug)
+                return module.Parser(self)
             except pdlparser.PDLParserError :
                 pass # try next parser