Changeset 3162 for pykota/trunk/pykota/accounters
- Timestamp:
- 04/14/07 10:50:47 (17 years ago)
- Location:
- pykota/trunk/pykota/accounters
- Files:
-
- 3 modified
Legend:
- Unmodified
- Added
- Removed
-
pykota/trunk/pykota/accounters/hardware.py
r3133 r3162 109 109 The external command must report the life time page number of the printer on stdout. 110 110 """ 111 skipinitialwait = self.filter.config.getPrinterSkipInitialWait(printer) 111 112 commandline = self.arguments.strip() % locals() 112 113 cmdlower = commandline.lower() 113 114 if (cmdlower == "snmp") or cmdlower.startswith("snmp:") : 114 return snmp.Handler(self, printer ).retrieveInternalPageCounter()115 return snmp.Handler(self, printer, skipinitialwait).retrieveInternalPageCounter() 115 116 elif (cmdlower == "pjl") or cmdlower.startswith("pjl:") : 116 return pjl.Handler(self, printer ).retrieveInternalPageCounter()117 return pjl.Handler(self, printer, skipinitialwait).retrieveInternalPageCounter() 117 118 118 119 if printer is None : -
pykota/trunk/pykota/accounters/pjl.py
r3133 r3162 58 58 class Handler : 59 59 """A class for PJL print accounting.""" 60 def __init__(self, parent, printerhostname ) :60 def __init__(self, parent, printerhostname, skipinitialwait=False) : 61 61 self.parent = parent 62 62 self.printerHostname = printerhostname 63 self.skipinitialwait = skipinitialwait 63 64 try : 64 65 self.port = int(self.parent.arguments.split(":")[1].strip()) … … 181 182 while 1 : 182 183 self.retrievePJLValues() 184 if (self.printerInternalPageCounter is not None) \ 185 and self.skipinitialwait \ 186 and (os.environ.get("PYKOTAPHASE") == "BEFORE") : 187 self.parent.filter.logdebug("No need to wait for the printer to be idle, this should be the case already.") 188 return 183 189 idle_flag = 0 184 190 if self.printerStatus in ('10000', '10001', '35078', '40000') : -
pykota/trunk/pykota/accounters/snmp.py
r3161 r3162 109 109 class BaseHandler : 110 110 """A class for SNMP print accounting.""" 111 def __init__(self, parent, printerhostname ) :111 def __init__(self, parent, printerhostname, skipinitialwait=False) : 112 112 self.parent = parent 113 113 self.printerHostname = printerhostname 114 self.skipinitialwait = skipinitialwait 114 115 try : 115 116 self.community = self.parent.arguments.split(":")[1].strip() … … 210 211 while 1 : 211 212 self.retrieveSNMPValues() 213 if (self.printerInternalPageCounter is not None) \ 214 and self.skipinitialwait \ 215 and (os.environ.get("PYKOTAPHASE") == "BEFORE") : 216 self.parent.filter.logdebug("No need to wait for the printer to be idle, this should be the case already.") 217 return 212 218 pstatusAsString = printerStatusValues.get(self.printerStatus) 213 219 dstatusAsString = deviceStatusValues.get(self.deviceStatus)