Changeset 1566 for pykota/trunk

Timestamp:

06/25/04 01:09:53 (20 years ago)

Author:

jalet

Message:

Fix for number of copies in PCL5 parser

Location:

pykota/trunk

Files:

• NEWS (modified) (1 diff)
• pykota/pdlanalyzer.py (modified) (5 diffs)

pykota/trunk/NEWS

@@ -25 +25 @@
     
         - Fixed PCL5 parser according to the sources of rastertohp.
+        
+        - Fixed number of copies handling in PCL5 parser : the number
+          of copies could vary from page to page.
         
     - 1.19alpha25 :

pykota/trunk/pykota/pdlanalyzer.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.12  2004/06/24 23:09:53  jalet
+# Fix for number of copies in PCL5 parser
+#
 # Revision 1.11  2004/06/23 22:07:50  jalet
 # Fixed PCL5 parser according to the sources of rastertohp
@@ -170 +173 @@
         self.data = []             
         self.pos = self.len = 0
-        copies = 1
         pagecount = resets = 0
         tag = None
+        copies = {}
         while 1 :
             char = self.readone()
@@ -192 +195 @@
                 #     <ESC>(f###W -> Start of a symbol set block
                 #     <ESC>&b###W -> Start of configuration data block
-                #     <ESC>&l###X -> Number of copies
+                #     <ESC>&l###X -> Number of copies for current page
                 #     <ESC>&n###W -> Starts an alphanumeric string ID block
                 #     <ESC>&p###X -> Start of a non printable characters block
@@ -217 +220 @@
                         size = (size * 10) + int(char)    
                     if char in tagend :    
-                        if (tag == "&l") and (char == "X") :
-                            copies = size
+                        if (tag == "&l") and (char == "X") : # copies for current page
+                            copies[pagecount] = size
                         elif (tag == "&l") and (char == "H") and (size == 0) :    
                             pagecount += 1      # Eject if NumPlanes > 1
@@ -242 +245 @@
         # PCL files with this. If resets < 2, then the file is
         # probably not a valid PCL file, so we return 0
-        return copies * (pagecount or ((resets - 3) * (resets > 2)))
+        # TODO : this code is probably not needed anymore
+        # TODO : since we added more page ejections detections
+        pagecount = (pagecount or ((resets - 3) * (resets > 2)))
+        
+        # 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 1.
+            nb = copies.get(pnum, copies.get(pnum-1, 1))
+            pagecount += (nb - 1)
+        return pagecount
         
 class PCLXLAnalyzer :