Changeset 2277

Timestamp:

06/03/05 10:49:34 (19 years ago)

Author:

jerome

Message:

Fixed incorrect loop counter in pjl and snmp accounters.
Now uses USTATUS in the pjl accounter to workaround printers
which switch to 'busy' state when we request their status
(meaning they were always busy) : seems to work just fine
now on my HP2300N.

Location:

pykota/trunk

Files:

• NEWS (modified) (1 diff)
• pykota/accounters/pjl.py (modified) (4 diffs)
• pykota/accounters/snmp.py (modified) (2 diffs)
• pykota/version.py (modified) (1 diff)

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
        
+    - 1.23alpha7 :
+    
+        - Improvements to the internal PJL and SNMP accounter : now should
+          support more printers and waste less time.
+          
     - 1.23alpha6 :
     

pykota/trunk/pykota/accounters/pjl.py

@@ -29 +29 @@
 import signal
 
-ITERATIONDELAY = 1.0   # 1 Second
+# NB : in fact these variables don't do much, since the time 
+# is in fact wasted in the sock.recv() blocking call, with the timeout
+ITERATIONDELAY = 1   # 1 Second
 STABILIZATIONDELAY = 3 # We must read three times the same value to consider it to be stable
 
-pjlMessage = "\033%-12345X@PJL USTATUSOFF\r\n@PJL INFO STATUS\r\n@PJL INFO PAGECOUNT\r\n\033%-12345X"
+# Here's the real thing :
+TIMEOUT = 3
+
+# Old method : pjlMessage = "\033%-12345X@PJL USTATUSOFF\r\n@PJL INFO STATUS\r\n@PJL INFO PAGECOUNT\r\n\033%-12345X"
+# Here's a new method, which seems to work fine on my HP2300N, while the 
+# previous one didn't.
+# TODO : We could also experiment with USTATUS JOB=ON and we would know for sure 
+# when the job is finished, without having to poll the printer repeatedly.
+pjlMessage = "\033%-12345X@PJL USTATUS DEVICE=ON\r\n@PJL INFO STATUS\r\n@PJL INFO PAGECOUNT\r\n@PJL USTATUS DEVICE=OFF\033%-12345X"
 pjlStatusValues = {
                     "10000" : "Powersave Mode",
@@ -76 +86 @@
                 while (self.timedout == 0) or (actualpagecount is None) or (self.printerStatus is None) :
                     signal.signal(signal.SIGALRM, self.alarmHandler)
-                    signal.alarm(3)
+                    signal.alarm(TIMEOUT)
                     try :
                         answer = sock.recv(1024)
@@ -83 +93 @@
                     else :    
                         readnext = 0
+                        self.parent.filter.logdebug("PJL answer : %s" % repr(answer))
                         for line in [l.strip() for l in answer.split()] : 
                             if line.startswith("CODE=") :
@@ -128 +139 @@
             if idle_flag :    
                 idle_num += 1
-                if idle_num > STABILIZATIONDELAY :
+                if idle_num >= STABILIZATIONDELAY :
                     # printer status is stable, we can exit
                     break

pykota/trunk/pykota/accounters/snmp.py

@@ -23 +23 @@
 #
 
-ITERATIONDELAY = 1.0   # 1 Second
+ITERATIONDELAY = 1.5   # 1.5 Second
 STABILIZATIONDELAY = 3 # We must read three times the same value to consider it to be stable
 
@@ -159 +159 @@
                 if idle_flag :    
                     idle_num += 1
-                    if idle_num > STABILIZATIONDELAY :
+                    if idle_num >= STABILIZATIONDELAY :
                         # printer status is stable, we can exit
                         break

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.23alpha6_unofficial"
+__version__ = "1.23alpha7_unofficial"
 
 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS and LPRng."