Changeset 1600 for pykota/trunk/pykota

Timestamp:

07/16/04 14:22:47 (20 years ago)

Author:

jalet

Message:

LPRng support early version

Location:

pykota/trunk/pykota

Files:

• accounter.py (modified) (2 diffs)
• accounters/hardware.py (modified) (2 diffs)
• tool.py (modified) (3 diffs)
• version.py (modified) (1 diff)

pykota/trunk/pykota/accounter.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.17  2004/07/16 12:22:47  jalet
+# LPRng support early version
+#
 # Revision 1.16  2004/05/25 09:15:15  jalet
 # accounter.py : old code deleted
@@ -91 +94 @@
         self.filter = kotafilter
         self.arguments = arguments
+        self.isSoftware = 1 # by default software accounting
         
     def getLastPageCounter(self) :    

pykota/trunk/pykota/accounters/hardware.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.7  2004/07/16 12:22:47  jalet
+# LPRng support early version
+#
 # Revision 1.6  2004/07/01 19:56:42  jalet
 # Better dispatching of error messages
@@ -54 +57 @@
         """Initializes querying accounter."""
         AccounterBase.__init__(self, kotabackend, arguments)
+        self.isSoftware = 0
         
     def getPrinterInternalPageCounter(self) :    

pykota/trunk/pykota/tool.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.112  2004/07/16 12:22:47  jalet
+# LPRng support early version
+#
 # Revision 1.111  2004/07/06 18:09:42  jalet
 # Reduced the set of invalid characters in names
@@ -931 +934 @@
         signal.signal(signal.SIGTERM, self.sigterm_handler)
         
+    def sendBackChannelData(self, message) :    
+        """Sends an informational message to CUPS via back channel stream (stderr)."""
+        self.printInfo("PyKota (PID %s) : %s" % (os.getpid(), message.strip()))
+        
     def openJobDataStream(self) :    
         """Opens the file which contains the job's datas."""
@@ -1105 +1112 @@
                 self.printInfo(_("Printer hostname undefined, set to 'localhost'"), "warn")
                 rseen = "localhost"
+            try :    
+                df_name = [line[8:] for line in os.environ.get("HF").split() if line.startswith("df_name=")][0]
+            except IndexError :
+                inputfile = None        
+            else :    
+                inputfile = os.path.join(os.environ.get("SPOOL_DIR", "."), df_name)
             if jseen and Pseen and nseen and rseen :        
-                # job is always in stdin (None)
-                return ("LPRNG", rseen, Pseen, nseen, jseen, None, Kseen, None, None, None)
+                return ("LPRNG", rseen, Pseen, nseen, jseen, inputfile, Kseen, None, None, None)
         self.printInfo(_("Printing system unknown, args=%s") % " ".join(sys.argv), "warn")
         return (None, None, None, None, None, None, None, None, None, None)   # Unknown printing system

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.19alpha31_unofficial"
+__version__ = "1.19alpha32_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""