Changeset 1576

Timestamp:

06/29/04 00:38:41 (20 years ago)

Author:

jalet

Message:

Increased speed by a factor of 2 in PCLXL parser

Files:

• pykota/trunk/pykota/pdlanalyzer.py (modified) (4 diffs)

pykota/trunk/pykota/pdlanalyzer.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.20  2004/06/28 22:38:41  jalet
+# Increased speed by a factor of 2 in PCLXL parser
+#
 # Revision 1.19  2004/06/28 21:20:30  jalet
 # PCLXL support now works !
@@ -332 +335 @@
     def handleArray(self, itemsize) :        
         """Handles arrays."""
-        datatype = self.minfile[self.pos]
-        self.pos += 1
+        pos = self.pos
+        datatype = self.minfile[pos]
+        pos += 1
         length = self.tags[ord(datatype)]
-        if length is None :
-            raise PDLAnalyzerError, "Error on array length at %s" % self.pos
-        elif callable(length) :
+        if callable(length) :
+            self.pos = pos
             length = length()
-        pos = self.pos    
+            pos = self.pos
         posl = pos + length
         sarraysize = self.minfile[pos:posl]
@@ -372 +375 @@
     def embeddedDataSmall(self) :
         """Handle small amounts of data."""
-        length = ord(self.minfile[self.pos])
-        self.pos += 1
+        pos = self.pos
+        length = ord(self.minfile[pos])
+        self.pos = pos + 1
         return length
         
@@ -401 +405 @@
         """Counts pages in a PCLXL (PCL6) document."""
         infileno = self.infile.fileno()
-        self.minfile = mmap.mmap(infileno, os.fstat(infileno).st_size, access=mmap.ACCESS_READ)
+        self.minfile = minfile = mmap.mmap(infileno, os.fstat(infileno).st_size, access=mmap.ACCESS_READ)
+        tags = self.tags
         self.pagecount = 0
-        self.pos = self.infile.tell()
+        self.pos = pos = self.infile.tell()
         try :
             while 1 :
-                char = self.minfile[self.pos]
-                self.pos += 1
-                length = self.tags[ord(char)]
-                if not length :    
+                char = minfile[pos]
+                pos += 1
+                length = tags[ord(char)]
+                if not length :
                     continue
                 if callable(length) :    
+                    self.pos = pos
                     length = length()
-                self.pos += length    
+                    pos = self.pos
+                pos += length    
         except IndexError : # EOF ?
             self.minfile.close() # reached EOF