Changeset 2913 for pykota/trunk

Timestamp:

06/03/06 00:29:01 (18 years ago)

Author:

jerome

Message:

Fixed minor problems with pkipplib.

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (4 diffs)
• NEWS (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -86 +86 @@
         self.myname = "cupspykota"
         self.pid = os.getpid()
+        self.DataFile = None
         
     def deferredInit(self) :    
@@ -282 +283 @@
                    (self.myname, self.PrinterName, self.UserName, self.JobId))
         
-        if not haspkipplib :
+        connerror = False
+        if haspkipplib :
+            self.ControlFile = "NotUsedAnymore"
+            cupsurl = "http://%s:%s" % \
+                               (os.environ.get("CUPS_SERVER", "localhost"), \
+                                os.environ.get("IPP_PORT", "631"))
+            self.logdebug("Querying CUPS server at %s" % cupsurl)                    
+            cupsserver = pkipplib.CUPS(url=cupsurl) # TODO : username and password
+            answer = cupsserver.getJobAttributes(self.JobId)
+            if answer is None :
+                self.printInfo(_("Network error while querying the CUPS server at %s (maybe incorrect authentication)") \
+                                          % cupsurl, "error")
+                connerror = True                        
+            else :    
+                self.logdebug("CUPS server at %s answered without error." % cupsurl)
+                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 connerror or not haspkipplib :        
             (ippfilename, ippmessage) = self.parseIPPRequestFile()
             self.ControlFile = ippfilename
@@ -289 +317 @@
                    (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]
@@ -480 +492 @@
         """Cleans up the place."""
         self.logdebug("Cleaning up...")
+        self.regainPriv()
         self.deinstallSigTermHandler()
         if not self.config.getPrinterKeepFiles(self.PrinterName) :
+            self.logdebug("Work file %s will be deleted." % self.DataFile)
             try :
-                self.logdebug("Work file %s will be deleted." % self.DataFile)
-            except AttributeError :    
-                pass
-            else :    
                 os.remove(self.DataFile)
+            except OSError, msg :
+                self.logdebug("Problem while deleting work file %s : %s" % (self.DataFile, msg))
+            else :
                 self.logdebug("Work file %s has been deleted." % self.DataFile)
         else :    

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
        
-    - 1.25alpha5 (2006-05-31) :
-    
+    - 1.25alpha5 (2006-06-03) :
+    
+        - Fixed minor issues with pkipplib's usage.
+        
         - Fixed MySQL schema to workaround some "features"...