Changeset 2891

Timestamp:

05/22/06 23:32:15 (18 years ago)

Author:

jerome

Message:

Now uses pkipplib if present.

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (3 diffs)
• NEWS (modified) (1 diff)
• pykota/version.py (modified) (1 diff)
• README (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -47 +47 @@
 from pykota.tool import PyKotaTool, PyKotaToolError, crashed
 from pykota.accounter import openAccounter
-from pykota.ipp import IPPRequest, IPPError
-        
+# TODO : remove the three lines below and the code which handles
+# TODO : them in a future release.
+from pykota.ipp import IPPRequest as oldIPPRequest
+from pykota.ipp import IPPError as oldIPPError
+
+try :
+    from pkipplib import pkipplib
+except ImportError :        
+    haspkipplib = False
+else :    
+    haspkipplib = True
+    
 class FakeObject :        
     """Fake object."""
@@ -272 +282 @@
                    (self.myname, self.PrinterName, self.UserName, self.JobId))
         
-        (ippfilename, ippmessage) = self.parseIPPRequestFile()
-        self.ControlFile = ippfilename
-        john = ippmessage.operation_attributes.get("job-originating-host-name", \
-               ippmessage.job_attributes.get("job-originating-host-name", \
-               (None, None)))
+        if not haspkipplib :
+            (ippfilename, ippmessage) = self.parseIPPRequestFile()
+            self.ControlFile = ippfilename
+            john = ippmessage.operation_attributes.get("job-originating-host-name", \
+                   ippmessage.job_attributes.get("job-originating-host-name", \
+                   (None, None)))
+            jbing = ippmessage.job_attributes.get("job-billing", (None, None))
+        else :
+            cupsserver = pkipplib.CUPS(url="http://%s:%s" % \
+                                  (os.environ.get("CUPS_SERVER", "localhost"), \
+                                   os.environ.get("IPP_PORT", "631")))
+            answer = cupsserver.getJobAttributes(self.JobId)
+            self.ControlFile = "NotUsedAnymore"
+            try :
+                john = answer.job["job-originating-host-name"]
+            except KeyError :    
+                try :
+                    john = answer.operation["job-originating-host-name"]
+                except KeyError :    
+                    john = (None, None)
+            try :        
+                jbing = answer.job["job-billing"]
+            except KeyError :    
+                jbing = (None, None)
         if type(john) == type([]) : 
             john = john[-1]
         (chtype, self.ClientHost) = john 
-        jbing = ippmessage.job_attributes.get("job-billing", (None, None))
         if type(jbing) == type([]) : 
             jbing = jbing[-1]
@@ -520 +548 @@
             self.logdebug("Parsing of IPP request file %s begins." % ippmessagefile)
             try :
-                ippmessage = IPPRequest(ippdatafile.read())
+                ippmessage = oldIPPRequest(ippdatafile.read())
                 ippmessage.parse()
-            except IPPError, msg :    
+            except oldIPPError, msg :    
                 self.printInfo("Error while parsing %s : %s" \
                                       % (ippmessagefile, msg), "warn")

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
        
+    - 1.25alpha4 (2006-05-22) :
+    
+        - Now uses pkipplib if present to directly retrieve the job
+          information from the CUPS server over IPP.
+          
     - 1.25alpha3 (2006-05-11) :
     

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.25alpha3_unofficial"
+__version__ = "1.25alpha4_unofficial"
 
 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS."

pykota/trunk/README

@@ -369 +369 @@
       tool is now mandatory for PyKota to work. 
       (http://www.librelogiciel.com/software/)
+    - The pkipplib Python library (http://www.pykota.com/software/pkipplib)  
     - The JAXML Python module to be able to dump datas in the XML format.
       (http://www.librelogiciel.com/software/)