Changeset 3163 for pykota/trunk

Timestamp:

04/15/07 17:18:31 (18 years ago)

Author:

jerome

Message:

If skipinitialwait is set to 'yes' in pykota.conf, don't take it into
account unless the printer really is in 'idle' state. This doesn't cost
anything since we've already retrieved the page counter and idle status
a single time before the test, but will now correctly loop until the printer
is idle if it is not already for some strange reason (no paper, and
so on).

Location:

pykota/trunk/pykota/accounters

Files:

• pjl.py (modified) (1 diff)
• snmp.py (modified) (2 diffs)

pykota/trunk/pykota/accounters/pjl.py

@@ -179 +179 @@
     def waitIdle(self) :
         """Waits for printer status being 'idle'."""
-        idle_num = idle_flag = 0
+        idle_num = 0
         while 1 :
             self.retrievePJLValues()
-            if (self.printerInternalPageCounter is not None) \
-               and self.skipinitialwait \
-               and (os.environ.get("PYKOTAPHASE") == "BEFORE") :
-                self.parent.filter.logdebug("No need to wait for the printer to be idle, this should be the case already.")
-                return 
-            idle_flag = 0
             if self.printerStatus in ('10000', '10001', '35078', '40000') :
-                idle_flag = 1
-            if idle_flag :    
+                if (self.printerInternalPageCounter is not None) \
+                   and self.skipinitialwait \
+                   and (os.environ.get("PYKOTAPHASE") == "BEFORE") :
+                    self.parent.filter.logdebug("No need to wait for the printer to be idle, it is the case already.")
+                    return 
                 idle_num += 1
                 if idle_num >= STABILIZATIONDELAY :

pykota/trunk/pykota/accounters/snmp.py

@@ -211 +211 @@
         while 1 :
             self.retrieveSNMPValues()
-            if (self.printerInternalPageCounter is not None) \
-               and self.skipinitialwait \
-               and (os.environ.get("PYKOTAPHASE") == "BEFORE") :
-                self.parent.filter.logdebug("No need to wait for the printer to be idle, this should be the case already.")
-                return 
             pstatusAsString = printerStatusValues.get(self.printerStatus)
             dstatusAsString = deviceStatusValues.get(self.deviceStatus)
@@ -225 +220 @@
                 idle_flag = 1       # Standby / Powersave is considered idle
             if idle_flag :    
+                if (self.printerInternalPageCounter is not None) \
+                   and self.skipinitialwait \
+                   and (os.environ.get("PYKOTAPHASE") == "BEFORE") :
+                    self.parent.filter.logdebug("No need to wait for the printer to be idle, it is the case already.")
+                    return 
                 idle_num += 1
                 if idle_num >= STABILIZATIONDELAY :