Changeset 3039

Timestamp:

10/16/06 11:15:14 (18 years ago)

Author:

jerome

Message:

Removed an SNMP OID which is not supported by some printers, and wasn't used anyway.

Files:

• pykota/trunk/pykota/accounters/snmp.py (modified) (6 diffs)

pykota/trunk/pykota/accounters/snmp.py

@@ -102 +102 @@
                     'Input Tray Empty',
                   ]
+# WARNING : some printers don't support this one :                  
 prtConsoleDisplayBufferTextOID = "1.3.6.1.2.1.43.16.5.1.2.1.1" # SNMPv2-SMI::mib-2.43.16.5.1.2.1.1
 
@@ -122 +123 @@
         self.deviceStatus = None
         self.printerDetectedErrorState = None
-        self.consoleDisplayBufferText = None
         self.timebefore = time.time()   # resets timer also in case of error
         
@@ -251 +251 @@
                                                   tuple([int(i) for i in hrPrinterStatusOID.split('.')]), \
                                                   tuple([int(i) for i in hrDeviceStatusOID.split('.')]), \
-                                                  tuple([int(i) for i in hrPrinterDetectedErrorStateOID.split('.')]), \
-                                                  tuple([int(i) for i in prtConsoleDisplayBufferTextOID.split('.')]))
+                                                  tuple([int(i) for i in hrPrinterDetectedErrorStateOID.split('.')]))
             if errorIndication :                                                  
                 self.parent.filter.printInfo("SNMP Error : %s" % errorIndication, "error")
@@ -266 +265 @@
                 self.deviceStatus = int(varBinds[2][1].prettyPrint())
                 self.printerDetectedErrorState = self.extractErrorStates(str(varBinds[3][1]))
-                self.consoleDisplayBufferText = varBinds[4][1].prettyPrint()
-                self.parent.filter.logdebug("SNMP answer decoded : PageCounter : %s  PrinterStatus : '%s'  DeviceStatus : '%s'  PrinterErrorState : '%s'  ConsoleDisplayBuffer : '%s'" \
+                self.parent.filter.logdebug("SNMP answer decoded : PageCounter : %s  PrinterStatus : '%s'  DeviceStatus : '%s'  PrinterErrorState : '%s'" \
                      % (self.printerInternalPageCounter, \
                         printerStatusValues.get(self.printerStatus), \
                         deviceStatusValues.get(self.deviceStatus), \
-                        self.printerDetectedErrorState, \
-                        self.consoleDisplayBufferText))
+                        self.printerDetectedErrorState))
 else :
     class Handler(BaseHandler) :
@@ -285 +282 @@
                                                         (hrPrinterStatusOID, ver.Null()), \
                                                         (hrDeviceStatusOID, ver.Null()), \
-                                                        (hrPrinterDetectedErrorStateOID, ver.Null()), \
-                                                        (prtConsoleDisplayBufferTextOID, ver.Null()))
+                                                        (hrPrinterDetectedErrorStateOID, ver.Null()))
             tsp = Manager()
             try :
@@ -321 +317 @@
                             self.deviceStatus = self.values[2]
                             self.printerDetectedErrorState = self.extractErrorStates(self.values[3])
-                            self.consoleDisplayBufferText = self.values[4]
-                            self.parent.filter.logdebug("SNMP answer decoded : PageCounter : %s  PrinterStatus : '%s'  DeviceStatus : '%s'  PrinterErrorState : '%s'  ConsoleDisplayBuffer : '%s'" \
+                            self.parent.filter.logdebug("SNMP answer decoded : PageCounter : %s  PrinterStatus : '%s'  DeviceStatus : '%s'  PrinterErrorState : '%s'" \
                                  % (self.printerInternalPageCounter, \
                                     printerStatusValues.get(self.printerStatus), \
                                     deviceStatusValues.get(self.deviceStatus), \
-                                    self.printerDetectedErrorState, \
-                                    self.consoleDisplayBufferText))
+                                    self.printerDetectedErrorState))
                         except IndexError :    
                             self.parent.filter.logdebug("SNMP answer is incomplete : %s" % str(self.values))