Changeset 1761 for pykota/trunk/pykota/tool.py

Timestamp:

10/02/04 07:48:56 (20 years ago)

Author:

jalet

Message:

Should now correctly deal with charsets both when storing into databases and when
retrieving datas. Works with both PostgreSQL and LDAP.

Files:

• pykota/trunk/pykota/tool.py (modified) (4 diffs)

pykota/trunk/pykota/tool.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.124  2004/10/02 05:48:56  jalet
+# Should now correctly deal with charsets both when storing into databases and when
+# retrieving datas. Works with both PostgreSQL and LDAP.
+#
 # Revision 1.123  2004/09/29 20:20:52  jalet
 # Added the winbind_separator directive to pykota.conf to allow the admin to
@@ -493 +497 @@
 class PyKotaTool :    
     """Base class for all PyKota command line tools."""
-    def __init__(self, lang=None, doc="PyKota %s (c) 2003-2004 %s" % (version.__version__, version.__author__)) :
+    def __init__(self, lang=None, charset=None, doc="PyKota %s (c) 2003-2004 %s" % (version.__version__, version.__author__)) :
         """Initializes the command line tool."""
         # locale stuff
@@ -501 +505 @@
         except (locale.Error, IOError) :
             gettext.NullTranslations().install()
+            
+        # We can force the charset.    
+        # The CHARSET environment variable is set by CUPS when printing.
+        # Else we use the current locale's one.
+        # If nothing is set, we use ISO-8859-15 widely used in western Europe.
+        self.charset = charset or os.environ.get("CHARSET") or locale.getlocale()[1] or locale.getdefaultlocale()[1] or "ISO-8859-15"
     
         # pykota specific stuff
@@ -522 +532 @@
         self.softwareJobSize = 0
         self.softwareJobPrice = 0.0
+        self.logdebug("Charset in use : %s" % self.charset)
+        
+    def getCharset(self) :    
+        """Returns the charset in use."""
+        return self.charset
         
     def logdebug(self, message) :