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

Timestamp:

1999-09-03T22:02:31+12:00 (25 years ago)

Author:

rjmcnab

Message:

Made the page parameters configurable. Now the page parameters must
correspond to cgi arguments in name and value (ie language=zh should now
be l=zh) which makes things more consistent anyway. Removed a couple of
specialised NZDL page parameters.

Moved the combining of the cgi arguments so that the receptionist does
all the configuration now.

Made the macro precedence configurable.

Made cgi arguments totally configurable. Now any piece of information about
a cgi argument can be configured meaning that cgi arguments can be declared
from the configuration file.

Removed the argdefault configuration argument. This should now be done
using cgiarg.

File:

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

trunk/gsdl/src/recpt/receptionist.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.29  1999/09/03 10:02:30  rjmcnab
+   Made the page parameters configurable. Now the page parameters must
+   correspond to cgi arguments in name and value (ie language=zh should now
+   be l=zh) which makes things more consistent anyway. Removed a couple of
+   specialised NZDL page parameters.
+
+   Moved the combining of the cgi arguments so that the receptionist does
+   all the configuration now.
+
+   Made the macro precedence configurable.
+
+   Made cgi arguments totally configurable. Now any piece of information about
+   a cgi argument can be configured meaning that cgi arguments can be declared
+   from the configuration file.
+
+   Removed the argdefault configuration argument. This should now be done
+   using cgiarg.
+
    Revision 1.28  1999/09/03 04:39:46  rjmcnab
    Made cookies and logs optional (they are turned off by default). To
@@ -150 +168 @@
   usecookies = false;
   logcgiargs = false;
+
+  // these default page parameters can always be overriden
+  // in the configuration file
+  pageparams.erase(pageparams.begin(), pageparams.end());
+  pageparams["c"] = ""; 
+  pageparams["l"] = "en"; 
+
+#ifdef MACROPRECEDENCE
+  macroprecedence = MACROPRECEDENCE;
+#else
+  macroprecedence.clear();
+#endif
 }
 
@@ -199 +229 @@
   ainfo.argdefault = "";
   ainfo.savedarginfo = cgiarginfo::must;
-  argsinfo.addarginfo (NULL, ainfo);
-  
-  // 0=text+graphics, 1=text
-  ainfo.shortname = "v";
-  ainfo.longname = "version";
-  ainfo.multiplechar = false;
-  ainfo.defaultstatus = cgiarginfo::weak;
-  ainfo.argdefault = "0";
-  ainfo.savedarginfo = cgiarginfo::can;
-  argsinfo.addarginfo (NULL, ainfo);
-  
-  // 0=normal, 1=big
-  ainfo.shortname = "f";
-  ainfo.longname = "query box size";
-  ainfo.multiplechar = false;
-  ainfo.defaultstatus = cgiarginfo::weak;
-  ainfo.argdefault = "0";
-  ainfo.savedarginfo = cgiarginfo::can;
   argsinfo.addarginfo (NULL, ainfo);
   
@@ -237 +249 @@
   ainfo.savedarginfo = cgiarginfo::mustnot;
   argsinfo.addarginfo (NULL, ainfo);
-
+}
+
+
+void receptionist::add_action (action *theaction) {
+  // make sure we have an action to add
+  if (theaction == NULL) return;
+
+  // add this action to the list of actions
+  actions.addaction(theaction);
+  
+  // add the cgi arguments from this action
+  argsinfo.addarginfo (NULL, theaction->getargsinfo());
 }
 
@@ -266 +289 @@
     else if (key == "usecookies") configinfo.usecookies = (cfgline[0] == "true");
     else if (key == "logcgiargs") configinfo.logcgiargs = (cfgline[0] == "true");
-
-    else if ((key == "argdefault") && (cfgline.size() == 2) && 
-         ((info = argsinfo.getarginfo(cfgline[0])) != NULL)) {
-      if (info->defaultstatus <= cgiarginfo::config) {
-    info->defaultstatus = cgiarginfo::config;
-    info->argdefault = cfgline[1];
+    else if (key == "pageparam") {
+      if (cfgline.size() >= 2) configinfo.pageparams[cfgline[0]] = cfgline[1];
+      else configinfo.pageparams[cfgline[0]] = "";
+    }
+    else if (key == "macroprecedence") configinfo.macroprecedence = cfgline[0];
+
+    
+    else if (key == "cgiarg") {
+      // get shortname
+      bool seen_defaultstatus = false;
+      text_t subkey, subvalue;
+      text_t shortname;
+      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());
+    }
+    cfgline_here++;
       }
-    }
-  }
-
+
+      // if we found the shortname process the line again filling in values
+      if (!shortname.empty()) {
+    cgiarginfo &chinfo = argsinfo[shortname];
+    chinfo.shortname = shortname; // in case this is a new argument
+    
+    cfgline_here = cfgline.begin();
+    while (cfgline_here != cfgline_end) {
+      cfglinesub_here = getdelimitstr((*cfgline_here).begin(),
+                      (*cfgline_here).end(), '=', subkey);
+      subvalue = substr (cfglinesub_here, (*cfgline_here).end());
+
+      if (subkey == "longname") chinfo.longname = subvalue;
+      else if (subkey == "multiplechar") chinfo.multiplechar = (subvalue == "true");
+      else if (subkey == "defaultstatus") {
+        seen_defaultstatus = true;
+        if (subvalue == "none") chinfo.defaultstatus = cgiarginfo::none;
+        else if (subvalue == "weak") chinfo.defaultstatus = cgiarginfo::weak;
+        else if (subvalue == "good") chinfo.defaultstatus = cgiarginfo::good;
+        else if (subvalue == "config") chinfo.defaultstatus = cgiarginfo::config;
+        else if (subvalue == "imperative") chinfo.defaultstatus = cgiarginfo::imperative;
+      }
+      else if (subkey == "argdefault") {
+        chinfo.argdefault = subvalue;
+        if (!seen_defaultstatus) chinfo.defaultstatus = cgiarginfo::config;
+      }
+      else if (subkey == "savedarginfo") {
+        if (subvalue == "mustnot") chinfo.savedarginfo = cgiarginfo::mustnot;
+        else if (subvalue == "can") chinfo.savedarginfo = cgiarginfo::can;
+        else if (subvalue == "must") chinfo.savedarginfo = cgiarginfo::must;
+      }
+      
+      cfgline_here++;
+    }
+      }
+    }
+  }
+
+  
   // configure the actions
   actionptrmap::iterator actionhere = actions.begin ();
@@ -346 +421 @@
   }
 
-  // add the cgi arguments from the actions
-  actionptrmap::iterator here = actions.begin ();
-  actionptrmap::iterator end = actions.end ();
-  while (here != end) {
-    assert ((*here).second.a != NULL);
-    if ((*here).second.a != NULL) {
-      if (!argsinfo.addarginfo (&logout, (*here).second.a->getargsinfo()))
-    return false;
-    }
-    here++;
-  }
-
   // create a saveconf string if there isn't one already
   if (configinfo.saveconf.empty())
@@ -386 +449 @@
   if (!defaultconvertname.empty()) {
     cgiarginfo *ainfo = argsinfo.getarginfo ("w");
-    if ((ainfo != NULL) && (ainfo->defaultstatus < cgiarginfo::config)) {
+    if ((ainfo != NULL) && (converters.get_outconverter(ainfo->argdefault) == NULL)) {
       ainfo->defaultstatus = cgiarginfo::good;
       ainfo->argdefault = defaultconvertname;
@@ -907 +970 @@
   // set up page parameters
   text_t pageparams;
-
   bool first = true;
-  if (!args["c"].empty()) {
-    pageparams +=  "collection=" + args["c"]; first = false;}
-
-//    if (args.getintarg("u") == 1)
-//      if (first) {pageparams += "style=htmlonly"; first = false;}
-//      else pageparams += ",style=htmlonly";
-//    if (args.getintarg("v") == 1)
-//      if (first) {pageparams += "version=text"; first = false;}
-//      else pageparams += ",version=text";
-//    if (args.getintarg("f") == 1) 
-//      if (first) {pageparams += ",queryversion=big"; first = false;}
-//      else pageparams += ",queryversion=big";
-  if (args["l"] != "en") 
-    if (first) pageparams += ",language=" + args["l"];
-    else pageparams += ",language=" + args["l"];
-
-  // this should be in a configuration file
-  if (args["rl"] != "1") 
-    if (first) pageparams += ",rl=" + args["rl"];
-    else pageparams += ",rl=" + args["rl"];
-  
+
+  text_tmap::iterator params_here = configinfo.pageparams.begin();
+  text_tmap::iterator params_end = configinfo.pageparams.end();
+  while (params_here != params_end) {
+    if (args[(*params_here).first] != (*params_here).second) {
+      if (!first) pageparams += ",";
+      first = false;
+      pageparams += (*params_here).first;
+      pageparams += "=";
+      pageparams += args[(*params_here).first];
+    }
+    
+    params_here++;
+  }
+  
+
   // open the page
-  disp.openpage(pageparams, MACROPRECEDENCE);
+  disp.openpage(pageparams, configinfo.macroprecedence);