Changeset 3285 for pykota/trunk

Timestamp:

01/09/08 00:17:47 (16 years ago)

Author:

jerome

Message:

Now external preaccounter/accounter scripts must read the print job's datas
from the file pointed to by the PYKOTADATAFILE environment variable, instead
of from their stdin.

Location:

pykota/trunk

Files:

• conf/pykota.conf.sample (modified) (3 diffs)
• pykota/accounters/software.py (modified) (2 diffs)

pykota/trunk/conf/pykota.conf.sample

@@ -600 +600 @@
 # languages, but may occasionally fail for some printer drivers.
 # You can however use any other command, provided it can read the datas to
-# parse from its standard input, and prints a single integer on its standard
+# parse from the file pointed to by the PYKOTADATAFILE environment
+# variable, and prints a single integer on its standard
 # output, representing the number of pages in the print job.
 # Software accounting unfortunately may overcharge users in case of paper
@@ -647 +648 @@
 # accounter : hardware(/opt/local/net-snmp/bin/snmpwalk -v 1 -Cc -c public %(printer)s | grep mib-2.43.10.2.1.4.1.1 | cut -d " " -f4)
 # accounter : hardware(/opt/local/net-snmp/bin/snmpwalk -v 1 -Cc -c public -Ov %(printer)s | grep Counter32 | tail -2 | head -1 | cut -d " " -f2)
-# accounter : software(/usr/bin/pkpgcounter) 
+# accounter : software(/usr/bin/pkpgcounter "$PYKOTADATAFILE") 
 # accounter : software()
 # accounter : ink(cmyk, 150)
@@ -718 +719 @@
 # reasons. If unset, "software()" is assumed. If you use your own script, 
 # ensure that it only prints the job's number of pages (or an estimation 
-# of it) on its standard output.
+# of it) on its standard output, and that it reads the print job's datas
+# from the file pointed to by the PYKOTADATAFILE environment variable.
 #
 # You may want to define for example 'preaccounter : software(/bin/echo 1)'

pykota/trunk/pykota/accounters/software.py

@@ -75 +75 @@
         """Does software accounting through an external script."""
         self.filter.printInfo(_("Launching SOFTWARE(%s)...") % self.arguments)
-        MEGABYTE = 1024*1024
-        infile = open(self.filter.DataFile, "rb")
-        child = popen2.Popen4(self.arguments)
+        pagecounter = None
+        child = os.popen(self.arguments, "r")
         try :
-            data = infile.read(MEGABYTE)    
-            while data :
-                child.tochild.write(data)
-                data = infile.read(MEGABYTE)
-            child.tochild.flush()
-            child.tochild.close()    
-        except (IOError, OSError), msg :    
-            msg = "%s : %s" % (self.arguments, msg) 
-            self.filter.printInfo(_("Unable to compute job size with accounter %s") % msg)
-        infile.close()
-        pagecounter = None
-        try :
-            answer = child.fromchild.read()
+            answer = child.read()
         except (IOError, OSError), msg :    
             msg = "%s : %s" % (self.arguments, msg) 
@@ -104 +91 @@
                 else :    
                     break
-        child.fromchild.close()
-        
+                    
+        status = child.close()
         try :
-            status = child.wait()
-        except OSError, msg :    
-            self.filter.printInfo(_("Problem while waiting for software accounter pid %s to exit : %s") % (child.pid, msg))
-        else :    
             if os.WIFEXITED(status) :
                 status = os.WEXITSTATUS(status)
-            self.filter.printInfo(_("Software accounter %s exit code is %s") % (self.arguments, str(status)))
+        except TypeError :        
+            pass # None means no error occured.
+        self.filter.printInfo(_("Software accounter %s exit code is %s") % (self.arguments, str(status)))
             
         if pagecounter is None :