Changeset 1750

Timestamp:

09/28/04 11:11:56 (20 years ago)

Author:

jalet

Message:

Fix for accented chars in print job's title, filename, and options

Files:

• pykota/trunk/pykota/storages/ldapstorage.py (modified) (3 diffs)

pykota/trunk/pykota/storages/ldapstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.76  2004/09/28 09:11:56  jalet
+# Fix for accented chars in print job's title, filename, and options
+#
 # Revision 1.75  2004/09/24 20:21:50  jalet
 # Fixed pykotaAccountBalance object location during creation
@@ -280 +283 @@
 #
 
+import os
 import types
 import time
@@ -1049 +1053 @@
                    "pykotaPrinterPageCounter" : str(pagecounter),
                    "pykotaAction" : action,
-                   "pykotaFileName" : str(filename), 
-                   "pykotaTitle" : str(title), 
+                   "pykotaFileName" : ((filename is None) and "None") or filename.decode(os.environ.get("CHARSET", "ISO-8859-15")).encode("UTF-8"), 
+                   "pykotaTitle" : ((title is None) and "None") or title.decode(os.environ.get("CHARSET", "ISO-8859-15")).encode("UTF-8"), 
                    "pykotaCopies" : str(copies), 
-                   "pykotaOptions" : str(options), 
+                   "pykotaOptions" : ((options is None) and "None") or options.decode(os.environ.get("CHARSET", "ISO-8859-15")).encode("UTF-8"), 
                    "pykotaHostName" : str(clienthost), 
                    "pykotaJobSizeBytes" : str(jobsizebytes),