Changeset 615 for tea4cups/trunk/tea4cups

Timestamp:

03/31/05 00:05:34 (19 years ago)

Author:

jerome

Message:

job-billing is now available as $TEABILLING
Job's IPP message file is now available as $TEACONTROLFILE

Files:

• tea4cups/trunk/tea4cups (modified) (5 diffs)

tea4cups/trunk/tea4cups

@@ -37 +37 @@
 from struct import unpack
 
-version = "2.01alpha1_unofficial"
+version = "2.10_unofficial"
 
 class TeeError(Exception):
@@ -415 +415 @@
         self.Directory = self.getPrintQueueOption(self.PrinterName, "directory")
         self.DataFile = os.path.join(self.Directory, "%s-%s-%s-%s" % (self.myname, self.PrinterName, self.UserName, self.JobId))
-        self.ClientHost = self.extractJobOriginatingHostName()
+        (ippfilename, ippmessage) = self.parseIPPMessageFile()
+        self.ControlFile = ippfilename
+        self.ClientHost = ippmessage.get("job-originating-host-name")
+        self.JobBilling = ippmessage.get("job-billing")
             
     def getCupsConfigDirectives(self, directives=[]) :
@@ -444 +447 @@
         return dirvalues       
             
-    def extractJobOriginatingHostName(self) :        
+    def parseIPPMessageFile(self) :        
         """Extracts the client's hostname or IP address from the CUPS message file for current job."""
         cupsdconf = self.getCupsConfigDirectives(["RequestRoot"])
@@ -467 +470 @@
                 self.logDebug("Parsing of IPP message file %s ends." % ippmessagefile)
             ippdatafile.close()
-        return ippmessage.get("job-originating-host-name")    
+        return (ippmessagefile, ippmessage)
                 
     def exportAttributes(self) :    
@@ -484 +487 @@
         os.environ["TEAOPTIONS"] = self.Options
         os.environ["TEAINPUTFILE"] = self.InputFile or ""
+        os.environ["TEABILLING"] = self.JobBilling or ""
+        os.environ["TEACONTROLFILE"] = self.ControlFile
         
     def saveDatasAndCheckSum(self) :