Changeset 299

Timestamp:

12/07/05 15:43:44 (19 years ago)

Author:

jerome

Message:

Fixed duplex detection code when done from the PCLXL stream itself (forgotten to add it before !)

Files:

• pkpgcounter/trunk/pkpgpdls/pclxl.py (modified) (6 diffs)

pkpgcounter/trunk/pkpgpdls/pclxl.py

@@ -97 +97 @@
         mediasizelabel = "Default"
         orientationlabel = "Portrait"
+        duplexmode = None
         
         # Now go upstream to decode media type, size, source, and orientation
@@ -140 +141 @@
                         break
                 mediatypelabel = minfile[startpos:startpos+size]
+            elif val == 0x34 :    
+                duplexmode = "Simplex"
+                pos = pos - 2
+            elif val in (0x35, 0x36) :    
+                duplexmode = "Duplex"
+                pos = pos - 2
             # else : TODO : CUSTOM MEDIA SIZE AND UNIT ! 
             else :    
@@ -148 +155 @@
                                        "mediasize" : mediasizelabel,
                                        "mediasource" : mediasourcelabel,
+                                       "duplex" : duplexmode,
                                      } 
         return 0
@@ -495 +503 @@
                              "mediasize" : "Default", 
                              "mediasource" : "Default", 
+                             "duplex" : None,
                            } 
                      }      
@@ -535 +544 @@
             # but the formula below is still correct : we want 
             # to decrease the total number of pages in this case.
-            page = self.pages.get(pnum, self.pages.get(1, { "copies" : 1, "mediasize" : "Default" }))
+            page = self.pages.get(pnum, self.pages.get(1, { "copies" : 1, "mediasize" : "Default", "duplex" : None }))
             pjlstuff = self.escapedStuff.get(pnum, self.escapedStuff.get(0, []))
             if pjlstuff :
@@ -556 +565 @@
                     else :    
                         pjlcopies = oldpjlcopies    
-                defaultdm = pjlparser.default_variables.get("DUPLEX", "")
-                if defaultdm :
-                    if defaultdm.upper() == "ON" :
-                        defaultduplexmode = "Duplex"
-                    else :    
-                        defaultduplexmode = "Simplex"
-                envdm = pjlparser.environment_variables.get("DUPLEX", "")
-                if envdm :
-                    if envdm.upper() == "ON" :
-                        duplexmode = "Duplex"
-                    else :    
-                        duplexmode = "Simplex"
-                else :        
-                    if not oldduplexmode :
-                        duplexmode = defaultduplexmode
-                    else :    
-                        duplexmode = oldduplexmode
+                if page["duplex"] :        
+                    duplexmode = page["duplex"]
+                else :    
+                    defaultdm = pjlparser.default_variables.get("DUPLEX", "")
+                    if defaultdm :
+                        if defaultdm.upper() == "ON" :
+                            defaultduplexmode = "Duplex"
+                        else :    
+                            defaultduplexmode = "Simplex"
+                    envdm = pjlparser.environment_variables.get("DUPLEX", "")
+                    if envdm :
+                        if envdm.upper() == "ON" :
+                            duplexmode = "Duplex"
+                        else :    
+                            duplexmode = "Simplex"
+                    else :        
+                        if not oldduplexmode :
+                            duplexmode = defaultduplexmode
+                        else :    
+                            duplexmode = oldduplexmode
                 defaultps = pjlparser.default_variables.get("PAPER", "")
                 if defaultps :