Changeset 478

Show
Ignore:
Timestamp:
09/29/07 07:13:02 (15 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:
3 modified

Legend:

Unmodified
Added
Removed
  • pkpgcounter/trunk/pkpgpdls/pcl345.py

    r471 r478  
    9797           (self.firstblock.find("\033%-12345X") != -1) or \ 
    9898           (self.firstblock.find("@PJL ENTER LANGUAGE=PCL\012\015\033") != -1) or \ 
    99            (self.firstblock.startswith(chr(0xcd)+chr(0xca)) and self.firstblock.find("\033E\033")) : 
     99           (self.firstblock.startswith(chr(0xcd)+chr(0xca)) and (self.firstblock.find("\033E\033") != -1)) : 
    100100            self.logdebug("DEBUG: Input file is in the PCL3/4/5 format.") 
    101101            return True 
  • pkpgcounter/trunk/pkpgpdls/pclxl.py

    r463 r478  
    8383    def isValid(self) :     
    8484        """Returns True if data is PCLXL aka PCL6, else False.""" 
    85         if ((self.firstblock[:128].find("\033%-12345X") != -1) and \ 
     85        if (((self.firstblock[:128].find("\033%-12345X") != -1) and \ 
    8686             (self.firstblock.find(" HP-PCL XL;") != -1) and \ 
    8787             ((self.firstblock.find("LANGUAGE=PCLXL") != -1) or \ 
    88               (self.firstblock.find("LANGUAGE = PCLXL") != -1))) : 
     88              (self.firstblock.find("LANGUAGE = PCLXL") != -1)))) \ 
     89             or ((self.firstblock.startswith(chr(0xcd)+chr(0xca)) and (self.firstblock.find(" HP-PCL XL;") != -1))) : 
    8990            self.logdebug("DEBUG: Input file is in the PCLXL (aka PCL6) format.") 
    9091            return True 
  • pkpgcounter/trunk/pkpgpdls/version.py

    r473 r478  
    2222 
    2323 
    24 __version__ = "3.10" 
     24__version__ = "3.11alpha" 
    2525 
    2626__doc__ = """pkpgcounter : a generic Page Description Languages parser."""