Changeset 314 for pkpgcounter/trunk/pkpgpdls/pclxl.py

Timestamp:

02/08/06 09:31:42 (18 years ago)

Author:

jerome

Message:

1.76 is out.

Files:

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

pkpgcounter/trunk/pkpgpdls/pclxl.py

@@ -329 +329 @@
         """Handles the ESC code."""
         pos = endpos = self.pos
-        if self.minfile[pos : pos+8] == r"%-12345X" :
+        minfile = self.minfile
+        if minfile[pos : pos+8] == r"%-12345X" :
             endpos = pos + 9
             endmark = chr(0x0c) + chr(0x00) + chr(0x1b)
             asciilimit = chr(0x80)
             quotes = 0
-            while (self.minfile[endpos] not in endmark) and \
-                   ((self.minfile[endpos] < asciilimit) or (quotes % 2)) :
-                if self.minfile[endpos] == '"' :
+            while (minfile[endpos] not in endmark) and \
+                   ((minfile[endpos] < asciilimit) or (quotes % 2)) :
+                if minfile[endpos] == '"' :
                     quotes += 1
                 endpos += 1
@@ -343 +344 @@
             # NB : First time will be at page 0 (i.e. **before** page 1) !
             stuff = self.escapedStuff.setdefault(self.pagecount, [])
-            stuff.append(self.minfile[pos : endpos])
-            self.logdebug("Escaped datas : [%s]" % repr(self.minfile[pos : endpos]))
+            stuff.append(minfile[pos : endpos])
+            self.logdebug("Escaped datas : [%s]" % repr(minfile[pos : endpos]))
         return endpos - pos
         
     def skipKyoceraPrescribe(self) :    
         """Skips Kyocera Prescribe commands."""
+        pos = self.pos - 1
         minfile = self.minfile
-        pos = self.pos - 1
         if minfile[pos:pos+3] == "!R!" :
             while (pos - self.pos) < 1024 :   # This is a realistic upper bound, to avoid infinite loops
                 if (minfile[pos] == ";") and (minfile[pos-4:pos] == "EXIT") :
-                    return (pos + 1 - self.pos)
+                    pos += 1
+                    prescribe = self.prescribeStuff.setdefault(self.pagecount, [])
+                    prescribe.append(minfile[self.pos-1:pos])
+                    self.logdebug("Prescribe commands : [%s]" % repr(minfile[self.pos-1:pos]))
+                    return (pos - self.pos)
                 pos += 1    
         else :
@@ -567 +572 @@
         tags = self.tags
         self.pagecount = 0
-        self.escapedStuff = {}
+        self.escapedStuff = {}   # For escaped datas, mostly PJL commands
+        self.prescribeStuff = {} # For Kyocera Prescribe commands
         self.pos = pos = oldpos = 0
         try :