Changeset 410 for pkpgcounter/trunk

Timestamp:

09/13/06 11:40:37 (18 years ago)

Author:

jerome

Message:

Integrated the SPL1 parser.

Location:

pkpgcounter/trunk/pkpgpdls

Files:

• analyzer.py (modified) (2 diffs)
• spl1.py (modified) (2 diffs)

pkpgcounter/trunk/pkpgpdls/analyzer.py

@@ -30 +30 @@
 
 import version, pdlparser, postscript, pdf, pcl345, pclxl, \
-       escp2, dvi, tiff, ooo, zjstream, qpdl
+       escp2, dvi, tiff, ooo, zjstream, qpdl, spl1
 import inkcoverage
 
@@ -172 +172 @@
                            pdf, \
                            qpdl, \
+                           spl1, \
                            pcl345, \
                            escp2, \

pkpgcounter/trunk/pkpgpdls/spl1.py

@@ -31 +31 @@
 import pdlparser
 import pjl
+import version
 
 ESCAPECHARS = (chr(0x1b), chr(0x24))
@@ -112 +113 @@
                     else :    
                         if not self.isbitmap :
-                            raise pdlparser.PDLParserError, "Unfortunately this file format is incompletely recognized. Parsing aborted."
+                            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]
                         codesop = " ".join([ "%02x" % ord(v) for v in minfile[pos+6:pos+12]])
                         if codesop != "06 00 00 80 13 40" :
-                            raise pdlparser.PDLParserError, "Unfortunately this file format is incompletely recognized. Parsing aborted."
-                        self.logdebug("%08x   ==>   %04x   ==>   %s" % (pos, sequencenum, codesop))    
+                            raise pdlparser.PDLParserError, "Unfortunately SPL1 is incompletely recognized. Parsing aborted. Please report the problem to %s" % version.__authoremail__
                         if not sequencenum :
                             self.pagecount += 1