Changeset 1856 for trunk/gsdl/src/recpt/receptionist.cpp

Timestamp:

2001-01-23T10:58:19+13:00 (23 years ago)

Author:

sjboddie

Message:

Added Encoding and Language options to main.cfg configuration file so
it's now hopefully a little easier to add new languages and encodings
to the interface. Each interface language also now has a default encoding
so that changing languages from the preferences page causes the encoding
to change to a value reasonable for the selected language.

File:

• trunk/gsdl/src/recpt/receptionist.cpp (modified) (11 diffs)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -65 +65 @@
   EmailUserEvents = false;
 
+  languages.erase(languages.begin(), languages.end());
+  encodings.erase(encodings.begin(), encodings.end());
+
   // these default page parameters can always be overriden
   // in the configuration file
@@ -84 +87 @@
   info_loaded = false;
   info.clear();
+}
+
+void languageinfo_t::clear () {
+  longname.clear();
+  defaultencoding.clear();
+}
+
+void encodinginfo_t::clear () {
+  longname.clear();
+  label.clear();
 }
 
@@ -112 +125 @@
   ainfo.longname = "encoding";
   ainfo.multiplechar = true;
-  ainfo.defaultstatus = cgiarginfo::weak;
-  ainfo.argdefault = "w";
+  ainfo.defaultstatus = cgiarginfo::none;
+  ainfo.argdefault = "";
   ainfo.savedarginfo = cgiarginfo::must;
   argsinfo.addarginfo (NULL, ainfo);
@@ -142 +155 @@
   ainfo.savedarginfo = cgiarginfo::must;
   argsinfo.addarginfo (NULL, ainfo);
-
+  
+  ainfo.shortname = "nl";
+  ainfo.longname = "new language";
+  ainfo.multiplechar = false;
+  ainfo.defaultstatus = cgiarginfo::none;
+  ainfo.argdefault = "0";
+  ainfo.savedarginfo = cgiarginfo::mustnot;
+  argsinfo.addarginfo (NULL, ainfo);
+  
   // the GSDL_UID (cookie)
   ainfo.shortname = "z";
@@ -293 +314 @@
       cfgline_here++;
     }
+      }
+
+    } else if (key == "Encoding") {
+      text_t subkey, subvalue;
+      text_t shortname, longname, label;
+      text_t::const_iterator cfglinesub_here;
+      text_tarray::const_iterator cfgline_here = cfgline.begin();
+      text_tarray::const_iterator cfgline_end = cfgline.end();
+      while (cfgline_here != cfgline_end) {
+    cfglinesub_here = getdelimitstr((*cfgline_here).begin(),
+                    (*cfgline_here).end(), '=', subkey);
+    if (subkey == "shortname") {
+      shortname = substr (cfglinesub_here, (*cfgline_here).end());
+    } else if (subkey == "longname") {
+      longname = substr (cfglinesub_here, (*cfgline_here).end());
+    } else if (subkey == "label") {
+      label = substr (cfglinesub_here, (*cfgline_here).end());
+    }
+    cfgline_here++;
+      }
+      if (!shortname.empty() && !label.empty()) {
+    encodinginfo_t enc;
+    if (longname.empty()) enc.longname = shortname;
+    else enc.longname = longname;
+    enc.label = label;
+    configinfo.encodings[shortname] = enc;
+      }
+
+    } else if (key == "Language") {
+      text_t subkey, subvalue;
+      text_t shortname, longname, defaultencoding;
+      text_t::const_iterator cfglinesub_here;
+      text_tarray::const_iterator cfgline_here = cfgline.begin();
+      text_tarray::const_iterator cfgline_end = cfgline.end();
+      while (cfgline_here != cfgline_end) {
+    cfglinesub_here = getdelimitstr((*cfgline_here).begin(),
+                    (*cfgline_here).end(), '=', subkey);
+    if (subkey == "shortname") {
+      shortname = substr (cfglinesub_here, (*cfgline_here).end());
+    } else if (subkey == "longname") {
+      longname = substr (cfglinesub_here, (*cfgline_here).end());
+    } else if (subkey == "default_encoding") {
+      defaultencoding = substr (cfglinesub_here, (*cfgline_here).end());
+    }
+    cfgline_here++;
+      }
+      if (!shortname.empty()) {
+    languageinfo_t lang;
+    if (longname.empty()) lang.longname = shortname;
+    else lang.longname = longname;
+    lang.defaultencoding = defaultencoding;
+    configinfo.languages[shortname] = lang;
       }
     }
@@ -400 +473 @@
   convertinfoclass::iterator converthere = converters.begin ();
   convertinfoclass::iterator convertend = converters.end ();
-  text_t defaultconvertname;
   while (converthere != convertend) {
     assert ((*converthere).second.outconverter != NULL);
     if ((*converthere).second.outconverter != NULL) {
       (*converthere).second.outconverter->set_rzws(1);
-      if (defaultconvertname.empty())
-    defaultconvertname = (*converthere).second.name;
     }
     converthere++;
-  }
-  
-  // set default converter if no good one has been defined
-  if (!defaultconvertname.empty()) {
-    cgiarginfo *ainfo = argsinfo.getarginfo ("w");
-    if (ainfo->argdefault != "w") {
-      if ((ainfo != NULL) && (converters.get_outconverter(ainfo->argdefault) == NULL)) {
-    ainfo->defaultstatus = cgiarginfo::good;
-    ainfo->argdefault = defaultconvertname;
-      }
-    }
   }
 
@@ -470 +529 @@
 }
 
+// get the default encoding for the given language - if it fails for any
+// reason return ""
+text_t receptionist::get_default_encoding (const text_t &language) {
+  
+  // make sure language is valid
+  if (configinfo.languages.find(language) == configinfo.languages.end()) return "";
+
+  text_t default_encoding = configinfo.languages[language].defaultencoding;
+
+  // make sure the encoding is valid
+  if (configinfo.encodings.find(default_encoding) == configinfo.encodings.end()) return "";
+
+  return default_encoding;
+}
 
 // parse_cgi_args parses cgi arguments into an argument class.
@@ -476 +549 @@
 bool receptionist::parse_cgi_args (const text_t &argstr, cgiargsclass &args, 
                    ostream &logout, text_tmap &fcgienv) {
-  outconvertclass text_t2ascii;
 
   // get an initial list of cgi arguments
@@ -491 +563 @@
   if (configinfo.usecookies) get_cookie(args["z"], fcgienv);
   
+  // if we're changing languages, set the encoding to the default for the new language
+  if (args["nl"] == "1") {
+    args["nw"] = get_default_encoding(args["l"]);
+  }
+
   // get the input encoding
+  // if encoding isn't set, set it to the default for the current language
+  if ((args.getarg("w") == NULL) || args["w"].empty()) {
+    args["w"] = get_default_encoding(args["l"]);
+  }
+
   text_t &arg_w = args["w"];
+
   inconvertclass defaultinconvert;
   inconvertclass *inconvert = converters.get_inconverter (arg_w);
@@ -520 +603 @@
   } else {
     // the action was not found!!
+    outconvertclass text_t2ascii;
     logout << text_t2ascii << "Error: the action \"" << args["a"] 
        << "\" could not be found.\n";
@@ -744 +828 @@
   // add the encoding information
   if (response == content) {
-    if (args["w"] == "u") {
-      response_data += "; charset=UTF-8";
-    } else if (args["w"] == "g") {
-      response_data += "; charset=GBK";
-    } else if (args["w"] == "a") {
-      response_data += "; charset=windows-1256";
-    } else if (args["w"] == "c") {
-      response_data += "; charset=windows-1251";
+    if (configinfo.encodings.find(args["w"]) != configinfo.encodings.end()) {
+      response_data += "; charset=" + configinfo.encodings[args["w"]].label;
     } else {
-      response_data += "; charset=ISO-8859-1";      
+      // default to latin 1
+      response_data += "; charset=ISO-8859-1";
     }