Changeset 2017

Timestamp:

01/08/05 18:13:08 (20 years ago)

Author:

jalet

Message:

Move some functions outside of the CGI to allow their use in other CGI scripts

Location:

pykota/trunk

Files:

• cgi-bin/printquota.cgi (modified) (4 diffs)
• pykota/cgifuncs.py (added)

pykota/trunk/cgi-bin/printquota.cgi

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.41  2005/01/08 17:13:08  jalet
+# Move some functions outside of the CGI to allow their use in other CGI scripts
+#
 # Revision 1.40  2004/10/23 19:28:18  jalet
 # Small fix to the cgi script to please Freshmeat's fmII URL validator/1.1
@@ -161 +164 @@
 from pykota.tool import PyKotaTool, PyKotaToolError
 from pykota.reporter import PyKotaReporterError, openReporter
+import pykota.cgifuncs
 
 header = """Content-type: text/html
@@ -203 +207 @@
   </body>
 </html>"""  
-
-def getLanguagePreference() :
-    """Returns the preferred language."""
-    languages = os.environ.get("HTTP_ACCEPT_LANGUAGE", "")
-    langs = [l.strip().split(';')[0] for l in languages.split(",")]
-    return "%s_%s" % (langs[0], langs[0].upper())
-    
-def getCharsetPreference() :
-    """Returns the preferred charset."""
-    charsets = os.environ.get("HTTP_ACCEPT_CHARSET", "UTF-8")
-    charsets = [l.strip().split(';')[0] for l in charsets.split(",")]
-    return charsets[0]
 
 class PyKotaReportGUI(PyKotaTool) :
@@ -366 +358 @@
             
 if __name__ == "__main__" :
-    os.environ["LC_ALL"] = getLanguagePreference()
-    admin = PyKotaReportGUI(lang=os.environ["LC_ALL"], charset=getCharsetPreference())
+    os.environ["LC_ALL"] = cgifuncs.getLanguagePreference()
+    admin = PyKotaReportGUI(lang=os.environ["LC_ALL"], charset=cgifuncs.getCharsetPreference())
     admin.form = cgi.FieldStorage()
     admin.guiAction()