Changeset 3324

Timestamp:

02/02/08 18:56:16 (16 years ago)

Author:

jerome

Message:

Moved some code elsewhere.
Minor changes to ensure that the job's ticket is correctly overwritten when needed.

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (4 diffs)
• bin/pknotify (modified) (1 diff)
• pykota/tool.py (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -227 +227 @@
         
         if not self.checkCUPSVersion() :
-            self.printInfo("BEWARE : CUPS is too old. You must use CUPS v1.3.4 or higher.", "error")
+            self.printInfo("BEWARE : CUPS is too old. You should use CUPS v1.3.4 or higher.", "error")
         
         self.PrinterName = os.environ.get("PRINTER", "")
@@ -259 +259 @@
         self.UserName = self.Ticket.OriginatingUserName                             
                                      
-        self.DataFile = os.path.join(self.Directory, "%s-%s-%s-%s" % \
-                   (self.myname, self.PrinterName, self.UserName, self.Ticket.JobId))
+        self.DataFile = (os.path.join(self.Directory, "%s-%s-%s-%s" % \
+                   (self.myname, self.PrinterName, self.UserName, self.Ticket.JobId)).encode(sys.getfilesystemencoding(), "replace")
         
         muststartwith = "%s:" % self.myname
@@ -301 +301 @@
             self.OriginalJobBillingCode = None
         else :    
-            self.Ticket.BillingCode = self.UTF8ToUserCharset(self.Ticket.BillingCode).decode("UTF-8")
             self.OriginalJobBillingCode = self.Ticket.BillingCode[:]
             
@@ -416 +415 @@
                         action = "CANCEL"
                     elif line.startswith("USERNAME=") :    
-                        username = self.userCharsetToUTF8(line.split("=", 1)[1].strip()).decode("UTF-8")
+                        username = line.split("=", 1)[1].strip().decode(self.charset, "replace")
                         self.logdebug("Seen new username [%s]" % username)
                     elif line.startswith("BILLINGCODE=") :    
-                        billingcode = self.userCharsetToUTF8(line.split("=", 1)[1].strip()).decode("UTF-8")
+                        billingcode = line.split("=", 1)[1].strip().decode(self.charset, "replace")
                         self.logdebug("Seen new billing code [%s]" % billingcode)
                     elif line.startswith("REASON=") :
-                        reason = self.userCharsetToUTF8(line.split("=", 1)[1].strip()).decode("UTF-8")
+                        reason = line.split("=", 1)[1].strip().decode(self.charset, "replace")
                         self.logdebug("Seen new reason [%s]" % reason)
             except IOError, msg :            

pykota/trunk/bin/pknotify

@@ -160 +160 @@
 class PyKotaNotify(Tool) :        
     """A class for pknotify."""
+    def UTF8ToUserCharset(self, text) :
+        """Converts from UTF-8 to user's charset."""
+        if text is None :
+            return None
+        else :    
+            return text.decode("UTF-8", "replace").encode(self.charset, "replace") 
+        
+    def userCharsetToUTF8(self, text) :
+        """Converts from user's charset to UTF-8."""
+        if text is None :
+            return None
+        else :    
+            return text.decode(self.charset, "replace").encode("UTF-8", "replace")    
+        
     def sanitizeMessage(self, msg) :
         """Replaces \\n and returns a messagee in xmlrpclib Binary format."""

pykota/trunk/pykota/tool.py

@@ -149 +149 @@
         arguments = " ".join(['"%s"' % arg for arg in sys.argv])
         self.logdebug("Command line arguments : %s" % arguments)
-        
-    def UTF8ToUserCharset(self, text) :
-        """Converts from UTF-8 to user's charset."""
-        if text is None :
-            return None
-        else :    
-            return text.decode("UTF-8", "replace").encode(self.charset, "replace") 
-        
-    def userCharsetToUTF8(self, text) :
-        """Converts from user's charset to UTF-8."""
-        if text is None :
-            return None
-        else :    
-            return text.decode(self.charset, "replace").encode("UTF-8", "replace")    
         
     def display(self, message) :