Changeset 2425 for pykota/trunk

Timestamp:

09/05/05 15:02:58 (19 years ago)

Author:

jerome

Message:

Allows 'hardware(pjl:port)' and 'hardware(snmp:community)'.

Location:

pykota/trunk

Files:

• conf/pykota.conf.sample (modified) (1 diff)
• NEWS (modified) (1 diff)
• pykota/accounters/hardware.py (modified) (1 diff)
• pykota/accounters/pjl.py (modified) (1 diff)
• pykota/accounters/snmp.py (modified) (1 diff)
• pykota/version.py (modified) (1 diff)

pykota/trunk/conf/pykota.conf.sample

@@ -401 +401 @@
 # 
 #               Extracts the printer's internal page counter via PJL queries over port tcp/9100.
+#
+#         Advanced uses :
+#
+#             accounter: hardware(snmp:MyCommunity)
+#
+#               To use a different SNMP community name than the default one (which is 'public')
+#
+#             accounter: hardware(pjl:9101) 
+#
+#               To use a different port than the default one (which is 9100)
+#
 #
 #         Other Examples : 

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
        
+    - 1.23alpha26 :
+    
+        - Allows parametrized pjl and snmp hardware accounting methods,
+          to be able to respectively set the TCP port and the SNMP
+          community.
+          
     - 1.23alpha25 :
     

pykota/trunk/pykota/accounters/hardware.py

@@ -111 +111 @@
         commandline = self.arguments.strip() % locals()
         cmdlower = commandline.lower()
-        if cmdlower == "snmp" :
+        if (cmdlower == "snmp") or cmdlower.startswith("snmp:") :
             return snmp.Handler(self, printer).retrieveInternalPageCounter()
-        elif cmdlower == "pjl" :
+        elif (cmdlower == "pjl") or cmdlower.startswith("pjl:") :
             return pjl.Handler(self, printer).retrieveInternalPageCounter()
             

pykota/trunk/pykota/accounters/pjl.py

@@ -60 +60 @@
         self.parent = parent
         self.printerHostname = printerhostname
-        self.port = 9100
+        try :
+            self.port = int(self.parent.arguments.split(":")[1].strip())
+        except (IndexError, ValueError) :
+            self.port = 9100
         self.printerInternalPageCounter = self.printerStatus = None
         self.timedout = 0

pykota/trunk/pykota/accounters/snmp.py

@@ -68 +68 @@
             self.parent = parent
             self.printerHostname = printerhostname
-            self.community = "public"
+            try :
+                self.community = self.parent.arguments.split(":")[1].strip()
+            except IndexError :    
+                self.community = "public"
             self.port = 161
             self.printerInternalPageCounter = None

pykota/trunk/pykota/version.py

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