Changeset 1578 for pykota/trunk/bin

Timestamp:

06/29/04 09:53:11 (20 years ago)

Author:

jalet

Message:

Improved pkhint

Files:

• pykota/trunk/bin/pkhint (modified) (5 diffs)

pykota/trunk/bin/pkhint

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.12  2004/06/29 07:53:11  jalet
+# Improved pkhint
+#
 # Revision 1.11  2004/06/18 13:34:48  jalet
 # Now all tracebacks include PyKota's version number
@@ -122 +125 @@
                 '/bin/nc -w 2 %(printer)s %(port)s </usr/share/pykota/pagecount.pjl 2>/dev/null | /usr/bin/tail -2', \
               ]
-
+              
 class PKHint(PyKotaTool) :
     """A class to autodetect the best accounting method for printers."""
@@ -236 +239 @@
                             accounter = 'hardware(' + netpjlcommand + ')'
                             configuration.append((printer, accounter))
-                elif devicetype == "direct" : 
-                    sys.stderr.write("Can't currently handle device %s for printer %s\n" % (device, printer))
-                elif devicetype == "serial" : 
-                    sys.stderr.write("Can't currently handle device %s for printer %s\n" % (device, printer))
+                        else :    
+                            configuration.append((printer, "software(/usr/bin/pkpgcounter)"))
+                # elif devicetype == "direct" : 
+                #    sys.stderr.write("Can't currently handle device %s for printer %s\n" % (device, printer))
+                #elif devicetype == "serial" : 
+                #    sys.stderr.write("Can't currently handle device %s for printer %s\n" % (device, printer))
+                #else :
+                #    sys.stderr.write("Can't currently handle device %s for printer %s\n" % (device, printer))
                 else :
-                    sys.stderr.write("Can't currently handle device %s for printer %s\n" % (device, printer))
+                    configuration.append((printer, "software(/usr/bin/pkpgcounter)"))
                     
         if not configuration :            
@@ -247 +254 @@
         else :
             print "\nPut the following lines into your /etc/pykota/pykota.conf file :\n"
+            print "# BEWARE : if software accounting is suggested, this doesn't mean"
+            print "# that hardware accounting wouldn't work, this only means that PyKota"
+            print "# wasn't able to autodetect which hardware accounting method to use."
             for (printer, accounter) in configuration :
                 print "[%s]" % printer
@@ -254 +264 @@
 if __name__ == "__main__" : 
     sys.stderr.write("BEWARE : This tool doesn't support LPRng's printcap files yet.\n")
-    sys.stderr.write("This tool is currently highly experimental, so don't rely on it.\n")
     retcode = 0
     try :