Changeset 867 for trunk

Timestamp:

2000-01-26T11:31:09+13:00 (24 years ago)

Author:

sjboddie

Message:

more hacky changes to get preferences to be a bit smarter

File:

• trunk/gsdl/src/recpt/pageaction.cpp (modified) (5 diffs)

trunk/gsdl/src/recpt/pageaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.24  2000/01/25 22:31:09  sjboddie
+   more hacky changes to get preferences to be a bit smarter
+
    Revision 1.23  2000/01/24 22:59:57  sjboddie
    changes to set macros differently for preferences page depending
@@ -269 +272 @@
   // _htmloptions_         set to _htmloptionson_ if DocumentUseHTML is set
 
+  // _PreferencesDocsFromWeb_ set to 1 if corresponding format option is set
+
+  // _languageoption_      interface languages to select from (dependant on PreferenceLanguages)
+
+  // _encodingoption_      will be overridden to "" if chinese language interface isn't specified
 
   // if page is "about"
@@ -332 +340 @@
     
     text_tmap::const_iterator it = cinfo.format.find ("DocumentUseHTML");
-    if ((it != cinfo.format.end()) && ((*it).second == "true"))
+    if ((it != cinfo.format.end()) && ((*it).second == "true")) {
       disp.setmacro ("htmloptions", "preferences", "_htmloptionson_");
 
+
+      // _PreferenceDocsFromWeb_
+
+      it = cinfo.format.find ("PreferenceDocsFromWeb");
+      if ((it == cinfo.format.end()) || ((*it).second == "true"))
+    disp.setmacro ("PreferenceDocsFromWeb", "preferences", "1");
+    }
+
+    // _languageoption_
+    // this is kind of a hack (another one!!). note that there're potential 
+    // problems here as no checking is done anywhere to make sure language
+    // is set to a valid value. this does allow us to set which languages 
+    // should go in the preference selection box (from collect.cfg) however
+    // and that's sufficient for current requirements
+    
+    // currently supported languages (_languageoption_ will default to all
+    // these languages unless PreferenceLanguages is set
+    text_tarray languages;
+    languages.push_back ("en");
+    languages.push_back ("mi");
+    languages.push_back ("zh");
+    text_tarray::const_iterator this_lang = languages.begin();
+    text_tarray::const_iterator end_lang = languages.end();
+
+    text_t languageoption = "_textlanguage_\n<select name=\"l\" onChange=\"updatel();\">\n";
+    it = cinfo.format.find ("PreferenceLanguages");
+    if ((it != cinfo.format.end()) && (!(*it).second.empty())) {
+      text_tset pref_langs;
+      splitchar ((*it).second.begin(), (*it).second.end(), '|', pref_langs);
+      if (pref_langs.size() > 1) {
+    while (this_lang != end_lang) {
+      if (pref_langs.find(*this_lang) != pref_langs.end())
+        languageoption += "_" + *this_lang + "languageoption_\n";
+      this_lang ++;
+    }
+    languageoption += "</select>\n";
+    disp.setmacro ("languageoption", "preferences", languageoption);
+      }
+    
+      // _encodingoption_
+
+      if (pref_langs.find("zh") == pref_langs.end())
+    disp.setmacro ("encodingoption", "preferences", "");
+
+    } else {
+      while (this_lang != end_lang) {
+    languageoption += "_" + *this_lang + "languageoption_\n";
+    this_lang ++;
+      }
+      languageoption += "</select>\n";
+      disp.setmacro ("languageoption", "preferences", languageoption);
+    }
     
   } else if (arg_p == "about" || arg_p == "help") {
@@ -372 +432 @@
     }
     shorttext += "</ul>\n";
-    disp.setmacro ("textbrowseoptions", "help", shorttext + longtext);
+    if (response.docInfo.size() > 1) disp.setmacro ("textbrowseoptions", "help", shorttext + longtext);
+    else disp.setmacro ("textbrowseoptions", "help", longtext);
 
     if (arg_p == "about") {
@@ -381 +442 @@
     text_tarray::const_iterator here = cinfo.ccsCols.begin();
     text_tarray::const_iterator end = cinfo.ccsCols.end();
+    bool first = true;
     while (here != end) {
       if (*here == arg_c) {
-        textsubcollections += "\n<br>" + cinfo.collectionmeta["collectionname"] + "\n";
+        if (!first) textsubcollections += "<br>";
+        textsubcollections += "\n" + cinfo.collectionmeta["collectionname"] + "\n";
       } else {
         ColInfoResponse_t this_cinfo;
         collectproto->get_collectinfo (*here, this_cinfo, err, logout);
         if (err == noError) {
-          textsubcollections += "\n<br>" + this_cinfo.collectionmeta["collectionname"] + "\n";
+          if (!first) textsubcollections += "<br>";
+          textsubcollections += "\n" + this_cinfo.collectionmeta["collectionname"] + "\n";
         }
       }
+      first = false;
       here ++;
     }