Changeset 258

Timestamp:

09/07/05 20:30:56 (19 years ago)

Author:

jerome

Message:

Forgot to commit this afternoon !

Location:

pkpgcounter/trunk

Files:

• NEWS (modified) (1 diff)
• pkpgpdls/pcl345.py (modified) (2 diffs)
• pkpgpdls/pclxl.py (modified) (2 diffs)
• pkpgpdls/version.py (modified) (1 diff)

pkpgcounter/trunk/NEWS

@@ -22 +22 @@
 pkpgcounter News :
    
+  * 1.66 : 
+  
+    - Improved PCLXL parser.
+    
+    - Improved PCL3/4/5 parser.
+    
   * 1.65 :
     

pkpgcounter/trunk/pkpgpdls/pcl345.py

@@ -309 +309 @@
             sys.stderr.write("escstart : %s\n" % escstart)
         
-#        if not pagecount :
-#            pagecount = (pagecount or ((resets - 3) * (resets > 2)))
-#        else :    
-#            # here we add counters for other ways new pages may have
-#            # been printed and ejected by the printer
-#            pagecount += ejects + backsides
-#        
-#        # now handle number of copies for each page (may differ).
-#        # in duplex mode, number of copies may be sent only once.
-#        for pnum in range(pagecount) :
-#            # if no number of copies defined, take the preceding one else the one set before any page else 1.
-#            page = pages.get(pnum, pages.get(pnum - 1, pages.get(0, { "copies" : 1 })))
-#            pagecount += (page["copies"] - 1)
-#            
-#        # in PCL3 files, there's one Start Gfx tag per page
-#        if ispcl3 :
-#            if endgfx == int(startgfx / 2) : # special case for cdj1600
-#                pagecount = endgfx 
-#            elif startgfx :
-#                pagecount = startgfx
-#            elif endgfx :    
-#                pagecount = endgfx
-                
-            
         if resets == ejects == mediasourcecount == mediasizecount == escstart == 1 :
             pagecount = orientationcount
@@ -342 +318 @@
             pass
         elif (not startgfx) and (not endgfx) :
-            if ejects :
-                pagecount = ejects
+            pass
         elif (resets == 2) and (startgfx == endgfx) and (mediasourcecount == 1) :
             pass

pkpgcounter/trunk/pkpgpdls/pclxl.py

@@ -148 +148 @@
             # From what I read in PCLXL documentation, the number
             # of copies is an unsigned 16 bits integer
-            self.pages[self.pagecount]["copies"] = unpack(self.endianness + "H", minfile[pos-5:pos3])[0]
+            try :
+                self.pages[self.pagecount]["copies"] = unpack(self.endianness + "H", minfile[pos-5:pos3])[0]
+            except KeyError :    
+                self.logdebug("It looks like this PCLXL file is corrupted.")
         return 0
         
@@ -461 +464 @@
         
         infileno = self.infile.fileno()
-        self.pages = {}
+        self.pages = { 0 : { "copies" : 1, 
+                             "orientation" : "Default", 
+                             "mediatype" : "Plain", 
+                             "mediasize" : "Default", 
+                             "mediasource" : "Default", 
+                           } 
+                     }      
         self.minfile = minfile = mmap.mmap(infileno, os.fstat(infileno)[6], prot=mmap.PROT_READ, flags=mmap.MAP_SHARED)
         tags = self.tags

pkpgcounter/trunk/pkpgpdls/version.py

@@ -20 +20 @@
 #
 
-__version__ = "1.65"
+__version__ = "1.66"
 
 __doc__ = """pkpgcounter : a generic Page Description Languages parser."""