Changeset 478

Timestamp:

09/29/07 07:13:02 (17 years ago)

Author:

jerome

Message:

Canon ImageRunner? commands can be present in both PCL3/4/5 jobs and
in PCLXL jobs. I thougth only the former one was possible. This
change makes the autodetection of PCLXL+IR work (but nothing done
yet wrt accounting).

Location:

pkpgcounter/trunk/pkpgpdls

Files:

• pcl345.py (modified) (1 diff)
• pclxl.py (modified) (1 diff)
• version.py (modified) (1 diff)

pkpgcounter/trunk/pkpgpdls/pcl345.py

@@ -97 +97 @@
            (self.firstblock.find("\033%-12345X") != -1) or \
            (self.firstblock.find("@PJL ENTER LANGUAGE=PCL\012\015\033") != -1) or \
-           (self.firstblock.startswith(chr(0xcd)+chr(0xca)) and self.firstblock.find("\033E\033")) :
+           (self.firstblock.startswith(chr(0xcd)+chr(0xca)) and (self.firstblock.find("\033E\033") != -1)) :
             self.logdebug("DEBUG: Input file is in the PCL3/4/5 format.")
             return True

pkpgcounter/trunk/pkpgpdls/pclxl.py

@@ -83 +83 @@
     def isValid(self) :    
         """Returns True if data is PCLXL aka PCL6, else False."""
-        if ((self.firstblock[:128].find("\033%-12345X") != -1) and \
+        if (((self.firstblock[:128].find("\033%-12345X") != -1) and \
              (self.firstblock.find(" HP-PCL XL;") != -1) and \
              ((self.firstblock.find("LANGUAGE=PCLXL") != -1) or \
-              (self.firstblock.find("LANGUAGE = PCLXL") != -1))) :
+              (self.firstblock.find("LANGUAGE = PCLXL") != -1)))) \
+             or ((self.firstblock.startswith(chr(0xcd)+chr(0xca)) and (self.firstblock.find(" HP-PCL XL;") != -1))) :
             self.logdebug("DEBUG: Input file is in the PCLXL (aka PCL6) format.")
             return True

pkpgcounter/trunk/pkpgpdls/version.py

@@ -22 +22 @@
 
 
-__version__ = "3.10"
+__version__ = "3.11alpha"
 
 __doc__ = """pkpgcounter : a generic Page Description Languages parser."""