Changeset 3299

Timestamp:

01/24/08 10:37:53 (16 years ago)

Author:

jerome

Message:

Temporary decoding solution for the output of pknotify.

Files:

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

pykota/trunk/bin/cupspykota

@@ -301 +301 @@
             self.OriginalJobBillingCode = None
         else :    
-            self.Ticket.BillingCode = self.UTF8ToUserCharset(self.Ticket.BillingCode)
+            self.Ticket.BillingCode = self.UTF8ToUserCharset(self.Ticket.BillingCode).decode("UTF-8")
             self.OriginalJobBillingCode = self.Ticket.BillingCode[:]
             
@@ -416 +416 @@
                         action = "CANCEL"
                     elif line.startswith("USERNAME=") :    
-                        username = self.userCharsetToUTF8(line.split("=", 1)[1].strip())
+                        username = self.userCharsetToUTF8(line.split("=", 1)[1].strip()).decode("UTF-8")
                         self.logdebug("Seen new username [%s]" % username)
                     elif line.startswith("BILLINGCODE=") :    
-                        billingcode = self.userCharsetToUTF8(line.split("=", 1)[1].strip())
+                        billingcode = self.userCharsetToUTF8(line.split("=", 1)[1].strip()).decode("UTF-8")
                         self.logdebug("Seen new billing code [%s]" % billingcode)
                     elif line.startswith("REASON=") :
-                        reason = self.userCharsetToUTF8(line.split("=", 1)[1].strip())
+                        reason = self.userCharsetToUTF8(line.split("=", 1)[1].strip()).decode("UTF-8")
                         self.logdebug("Seen new reason [%s]" % reason)
             except IOError, msg :            
@@ -559 +559 @@
         setenv("PYKOTABALANCE", str(self.User.AccountBalance or 0.0), self.charset)
         setenv("PYKOTALIFETIMEPAID", str(self.User.LifeTimePaid or 0.0), self.charset)
-        setenv("PYKOTAUSERDESCRIPTION", str(self.User.Description or ""), self.charset)
+        setenv("PYKOTAUSERDESCRIPTION", self.User.Description or "", self.charset)
         
         setenv("PYKOTAPAGECOUNTER", str(self.UserPQuota.PageCounter or 0), self.charset)
@@ -579 +579 @@
         # printer is a member of
         setenv("PYKOTAPGROUPS", ",".join([p.Name for p in self.storage.getParentPrinters(self.Printer)]), self.charset)
-        setenv("PYKOTAPRINTERDESCRIPTION", str(self.Printer.Description or ""), self.charset)
+        setenv("PYKOTAPRINTERDESCRIPTION", self.Printer.Description or "", self.charset)
         setenv("PYKOTAPRINTERMAXJOBSIZE", str(self.Printer.MaxJobSize or _("Unlimited")), self.charset)
         setenv("PYKOTAPRINTERPASSTHROUGHMODE", (self.Printer.PassThrough and _("ON")) or _("OFF"), self.charset)
@@ -602 +602 @@
         """Exports the job's action status and optional reason."""
         self.logdebug("Exporting job's action status...")
-        setenv("PYKOTAACTION", str(self.Action), self.charset)
+        setenv("PYKOTAACTION", self.Action or "", self.charset)
         if self.Reason :
-            setenv("PYKOTAREASON", str(self.Reason), self.charset)
+            setenv("PYKOTAREASON", self.Reason or "", self.charset)
         self.logdebug("Environment updated.")