Changeset 533 for pkpgcounter

Timestamp:

11/30/07 23:48:48 (17 years ago)

Author:

jerome

Message:

Fixed a problem which was due to a too small test suite for SPL1
file format.

Files:

• pkpgcounter/trunk/pkpgpdls/spl1.py (modified) (6 diffs)

pkpgcounter/trunk/pkpgpdls/spl1.py

@@ -23 +23 @@
 """This modules implements a page counter for SPL1 documents."""
 
-import sys
 import os
 import mmap
-from struct import unpack
+import struct
 
 import pdlparser
@@ -51 +50 @@
         self.unpackShort = self.unpackType[2]
         self.unpackLong = self.unpackType[4]
+        # self.logdebug("Little Endian")
         return 0
         
@@ -58 +58 @@
         self.unpackShort = self.unpackType[2]
         self.unpackLong = self.unpackType[4]
+        # self.logdebug("Big Endian")
         return 0
     
@@ -87 +88 @@
         if datas.endswith("$PJL BITMAP START\r\n") :
             self.isbitmap = True
+            # self.logdebug("New bitmap")
         self.logdebug("Escaped datas : [%s]" % repr(datas))
         return endpos - pos + 1
@@ -100 +102 @@
         self.escapedStuff = {}   # For escaped datas, mostly PJL commands
         self.bigEndian()
-        codesop = chr(0x06) + chr(0x00) + chr(0x00) + chr(0x80) + chr(0x13) + chr(0x40)
         self.isbitmap = False
         pos = 0
+        unpack = struct.unpack
         try :
             try :
@@ -112 +114 @@
                         if not self.isbitmap :
                             raise pdlparser.PDLParserError, "Unfortunately SPL1 is incompletely recognized. Parsing aborted. Please report the problem to %s" % version.__authoremail__
-                        offset = unpack(self.unpackLong, minfile[pos:pos+4])[0]
-                        sequencenum = unpack(self.unpackShort, minfile[pos+4:pos+6])[0]
-                        if minfile[pos+6:pos+12] != codesop :
-                            raise pdlparser.PDLParserError, "Unfortunately SPL1 is incompletely recognized. Parsing aborted. Please report the problem to %s" % version.__authoremail__
-                        if not sequencenum :
+                        (offset,
+                         seqnum) = unpack(">IH", minfile[pos:pos+6])
+                        # self.logdebug("Offset : %i      Sequence Number : %i" % (offset, seqnum))
+                        if not seqnum : 
+                            # Sequence number resets to 0 for each new page.
                             self.pagecount += 1
                         pos += 4 + offset
+            except struct.error, msg :     
+                raise pdlparser.PDLParserError, "Unfortunately SPL1 is incompletely recognized (%s). Parsing aborted. Please report the problem to %s" % (msg, version.__authoremail__)
             except IndexError : # EOF ?            
                 pass