Changeset 2254 for pykota/trunk/bin/cupspykota

Timestamp:

05/17/05 22:24:40 (19 years ago)

Author:

jerome

Message:

Integrated the major rewrite of ipp.py into PyKota.
Now the job-originating-hostname is correctly retrieved
in all cases I've seen.

Files:

• pykota/trunk/bin/cupspykota (modified) (2 diffs)

pykota/trunk/bin/cupspykota

@@ -40 +40 @@
 from pykota.storage import PyKotaStorageError
 from pykota.accounter import PyKotaAccounterError
-from pykota.ipp import IPPMessage, PyKotaIPPError
+from pykota.ipp import IPPMessage, IPPError
     
 class PyKotaPopen4(popen2.Popen4) :
@@ -215 +215 @@
                 ippdatafile.close()
             self.dropPriv()    
-            clienthost = ippmessage.get("job-originating-host-name") 
-            billingcode = ippmessage.get("job-billing")
+            
+            try :
+                (chtype, clienthost) = ippmessage.operation_attributes.get("job-originating-host-name", \
+                                          ippmessage.job_attributes.get("job-originating-host-name", (None, None)))
+                (jbtype, billingcode) = ippmessage.job_attributes.get("job-billing", (None, None))
+            except AttributeError :    
+                clienthost = None
+                billingcode = None
             if clienthost is None :
                 (billingcode, clienthost) = self.getJobInfosFromPageLog(cupsdconf, printer.Name, user.Name, self.jobid)
             self.logdebug("Client Hostname : %s" % (clienthost or "Unknown"))    
             self.logdebug("Billing Code : %s" % (billingcode or "None"))    
+            
             os.environ["PYKOTAJOBORIGINATINGHOSTNAME"] = str(clienthost or "")
             os.environ["PYKOTAJOBBILLING"] = str(billingcode or "")