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

Timestamp:

1999-02-22T11:33:58+13:00 (25 years ago)

Author:

rjmcnab

Message:

Lots of stuff :-)

File:

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

trunk/gsdl/src/recpt/receptionist.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.7  1999/02/21 22:33:55  rjmcnab
+
+   Lots of stuff :-)
+
    Revision 1.6  1999/02/11 01:24:05  rjmcnab
 
@@ -44 +48 @@
 
 
-// this version of set_gsdlhome should be used if the receptionist
-// is being run for multiple collections ("general" mode).
-void receptionist::set_gsdlhome (const text_t &thegsdlhome) {
-  gsdlhome = thegsdlhome;
-  collectdir = thegsdlhome;
-  collection = "";
-}
-
-
-// this version of set_gsdlhome should be used if the receptionist
-// is being run for a single collection ("collection specific" mode).
-void receptionist::set_gsdlhome (const text_t &thegsdlhome, const text_t &thecollection) {
-  gsdlhome = thegsdlhome;
-  collection = thecollection;
-
-  // decide where collectdir is by searching for collect.cfg
-  // look in $GSDLHOME/collect/collection-name/etc/collect.cfg and
-  // then $GSDLHOME/etc/collect.cfg
-  collectdir = filename_cat (gsdlhome, "collect");
-  collectdir = filename_cat (collectdir, collection);
-  text_t filename = filename_cat (collectdir, "etc");
-  filename = filename_cat (filename, "collect.cfg");
-
-  if (!file_exists(filename)) collectdir = gsdlhome;
-}
-
-// configure_actions should be called for each line in the
-// configuration files to configure the actions. The configuration
-// should take place after all the actions have been added.
-void receptionist::configure_actions (const text_t &key, const text_tarray &cfgline) {
-  actionptrmap::iterator here = actions.begin ();
-  actionptrmap::iterator end = actions.end ();
-
-  while (here != end) {
-    assert ((*here).second.a != NULL);
-    if ((*here).second.a != NULL) 
-      (*here).second.a->configure(key, cfgline);
-
-    here++;
-  }
-}
-
-// init should be called after setgsdhome has been called.
+
+// configure should be called for each line in the
+// configuration files to configure the receptionist and everything
+// it contains. The configuration should take place after everything
+// has been added but before the initialisation.
+void receptionist::configure (const text_t &key, const text_tarray &cfgline) {
+  // configure the receptionist
+  if (cfgline.size() >= 1) {
+    if (key == "gsdlhome") configinfo.gsdlhome = cfgline[0];
+    else if (key == "collection") configinfo.collection = cfgline[0];
+    else if (key == "collectdir") configinfo.collectdir = cfgline[0];
+    else if (key == "httpimg") configinfo.httpimg = cfgline[0];
+    else if (key == "gwcgi") configinfo.gwcgi = cfgline[0];
+    else if (key == "macrofiles") configinfo.macrofiles = cfgline;
+    else if (key == "saveconf") configinfo.saveconf = cfgline[0];
+  }
+
+  // configure the actions
+  actionptrmap::iterator actionhere = actions.begin ();
+  actionptrmap::iterator actionend = actions.end ();
+
+  while (actionhere != actionend) {
+    assert ((*actionhere).second.a != NULL);
+    if ((*actionhere).second.a != NULL) 
+      (*actionhere).second.a->configure(key, cfgline);
+
+    actionhere++;
+  }
+
+  // configure the protocols
+  recptprotolistclass::iterator protohere = protocols.begin ();
+  recptprotolistclass::iterator protoend = protocols.end ();
+
+  while (protohere != protoend) {
+    assert ((*protohere).p != NULL);
+    if ((*protohere).p != NULL) 
+      (*protohere).p->configure(key, cfgline);
+    
+    protohere++;
+  }
+}
+
+void receptionist::configure (const text_t &key, const text_t &value) {
+  text_tarray cfgline;
+  cfgline.push_back (value);
+  configure(key, cfgline);
+}
+
+
+// init should be called after all the actions, protocols, and
+// converters have been added to the receptionist and after everything
+// has been configured but before any pages are created.
 // It returns true on success and false on failure. If false is
 // returned getpage should not be called (without producing
@@ -92 +105 @@
 // produced by the calling code.
 bool receptionist::init (ostream &logout) {
+  // first configure collectdir
+  text_t thecollectdir = configinfo.gsdlhome;
+  if (!configinfo.collection.empty()) {
+    // collection specific mode
+    if (!configinfo.collectdir.empty()) {
+      // has already been configured
+      thecollectdir = configinfo.collectdir;
+    } else {
+      // decide where collectdir is by searching for collect.cfg
+      // look in $GSDLHOME/collect/collection-name/etc/collect.cfg and
+      // then $GSDLHOME/etc/collect.cfg
+      text_t thecollectdir = filename_cat (configinfo.gsdlhome, "collect");
+      thecollectdir = filename_cat (thecollectdir, configinfo.collection);
+      text_t filename = filename_cat (thecollectdir, "etc");
+      filename = filename_cat (filename, "collect.cfg");
+      if (!file_exists(filename)) thecollectdir = configinfo.gsdlhome;
+    }
+  }
+  configure("collectdir", thecollectdir);
+
   // read in the macro files
   if (!read_macrofiles (logout)) return false;
@@ -97 +130 @@
   // defined the main cgi arguments
   if (!define_mainargs (logout)) return false;
+
+  // there must be at least one action defined
+  if (actions.empty()) {
+    logout << "Error: no actions have been added to the receptionist\n";
+    return false;
+  }
 
   // add the cgi arguments from the actions
@@ -111 +150 @@
 
   // create a saveconf string if there isn't one already
-  if (saveconf.empty())
-    saveconf = create_save_conf_str (argsinfo, logout);
+  if (configinfo.saveconf.empty())
+    configinfo.saveconf = create_save_conf_str (argsinfo, logout);
 
   // check the saveconf string
-  if (!check_save_conf_str (saveconf, argsinfo, logout))
+  if (!check_save_conf_str (configinfo.saveconf, argsinfo, logout))
     return false;
 
@@ -121 +160 @@
   srand (time(NULL));
 
-  //  utf8outconvert.set_rzws(1);
-  //  gboutconvert.set_rzws(1);
+  // make the output converters remove all the zero-width spaces
+  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 != NULL) && (ainfo->defaultstatus < cgiarginfo::good)) {
+      ainfo->defaultstatus = cgiarginfo::good;
+      ainfo->argdefault = defaultconvertname;
+    }
+  }
+  
+  // init the actions
+  actionptrmap::iterator actionhere = actions.begin ();
+  actionptrmap::iterator actionend = actions.end ();
+  while (actionhere != actionend) {
+    if (((*actionhere).second.a == NULL) || 
+    !(*actionhere).second.a->init(logout)) return false;
+    actionhere++;
+  }
+
+  // init the protocols
+  recptprotolistclass::iterator protohere = protocols.begin ();
+  recptprotolistclass::iterator protoend = protocols.end ();
+  while (protohere != protoend) {
+    if (((*protohere).p == NULL) ||
+    !(*protohere).p->init(logout)) return false;
+    protohere++;
+  }
 
   return true;
@@ -140 +217 @@
 
   // expand the compressed argument (if there was one)
-  if (!expand_save_args (argsinfo, saveconf, args, logout)) return false;
+  if (!expand_save_args (argsinfo, configinfo.saveconf, args, logout)) return false;
 
   // add the defaults
@@ -158 +235 @@
     return false;
   }
+
+  // get the input encoding
+  text_t &arg_w = args["w"];
+  inconvertclass defaultinconvert;
+  inconvertclass *inconvert = converters.get_inconverter (arg_w);
+  if (inconvert == NULL) inconvert = &defaultinconvert;
+
+  // see if the next page will have a different encoding
+  if (args.getarg("nw") != NULL) args["w"] = args["nw"];
+
+  // convert arguments which aren't in unicode to unicode
+  args_tounicode (args, *inconvert);
 
   return true;
@@ -224 +313 @@
 bool receptionist::produce_content (cgiargsclass &args, ostream &contentout,
                     ostream &logout) {
-  outconvertclass text_t2ascii;
-
   // decide on the output conversion class
+  text_t &arg_w = args["w"];
+  rzwsoutconvertclass defaultoutconverter;
+  rzwsoutconvertclass *outconverter = converters.get_outconverter (arg_w);
+  if (outconverter == NULL) outconverter = &defaultoutconverter;
+  outconverter->reset();
+
+  // decide on the protocol used for communicating with
+  // the collection server
+  recptproto *collectproto = NULL;
+  if (!args["c"].empty()) {
+    collectproto = protocols.getrecptproto (args["c"], logout);
+  }
 
   // produce the page using the desired action
   action *a = actions.getaction (args["a"]);
   if (a != NULL) {
-    if (!a->do_action (args, text_t2ascii, contentout, logout))
+    if (!a->do_action (args, (*outconverter), collectproto, contentout, logout))
       return false;
 
   } else {
     // the action was not found!!
+    outconvertclass text_t2ascii;
+
     logout << text_t2ascii << "Error receptionist::produce_content: the action \"" 
        << args["a"] << "\" could not be found.\n";
     
-    contentout << text_t2ascii << "<html>\n";
-    contentout << text_t2ascii << "<head>\n";
-    contentout << text_t2ascii << "<title>Error</title>\n";
-    contentout << text_t2ascii << "</head>\n";
-    contentout << text_t2ascii << "<body>\n";
-    contentout << text_t2ascii << "<h2>Oops!</h2>\n";
-    contentout << text_t2ascii << "Undefined Page. The action \"" 
-           << args["a"] << "\" could not be found.\n";
-    contentout << text_t2ascii << "</body>\n";
-    contentout << text_t2ascii << "</html>\n";
+    contentout << (*outconverter) 
+           << "<html>\n"
+           << "<head>\n"
+           << "<title>Error</title>\n"
+           << "</head>\n"
+           << "<body>\n"
+           << "<h2>Oops!</h2>\n"
+           << "Undefined Page. The action \"" 
+           << args["a"] << "\" could not be found.\n"
+           << "</body>\n"
+           << "</html>\n";
   }
 
@@ -274 +376 @@
   // is searched first for the file (if this is being used in
   // collection specific mode) and then the main directory
-  text_t colmacrodir = filename_cat (collectdir, "macros");
-  text_t gsdlmacrodir = filename_cat (gsdlhome, "macros");
-  text_tarray::iterator arrhere = macrofiles.begin();
-  text_tarray::iterator arrend = macrofiles.end();
+  text_t colmacrodir = filename_cat (configinfo.collectdir, "macros");
+  text_t gsdlmacrodir = filename_cat (configinfo.gsdlhome, "macros");
+  text_tarray::iterator arrhere = configinfo.macrofiles.begin();
+  text_tarray::iterator arrend = configinfo.macrofiles.end();
   text_t filename;
   while (arrhere != arrend) {
@@ -286 +388 @@
     // try in the collection directory if this is being
     // run in collection specific mode
-    if (!collection.empty()) {
+    if (!configinfo.collection.empty()) {
       filename = filename_cat (colmacrodir, *arrhere);
       if (!file_exists (filename)) filename.clear ();
@@ -302 +404 @@
       logout << text_t2ascii 
          << "Error: the macro file \"" << *arrhere << "\" could not be found.\n";
-      if (collection.empty()) {
+      if (configinfo.collection.empty()) {
     logout << text_t2ascii
            << "It should be in " << gsdlmacrodir << ".\n\n";
@@ -367 +469 @@
   ainfo.longname = "collection";
   ainfo.multiplechar = true;
-  if (collection.empty()) {
+  if (configinfo.collection.empty()) {
     ainfo.defaultstatus = cgiarginfo::none;
     ainfo.argdefault = "";
@@ -373 +475 @@
   } else {
     ainfo.defaultstatus = cgiarginfo::good;
-    ainfo.argdefault = collection;
+    ainfo.argdefault = configinfo.collection;
     ainfo.savedarginfo = cgiarginfo::can;
   }
@@ -417 +519 @@
   // then it should always set the collection argument to the
   // collection
-  if (!collection.empty()) args["c"] = collection;
+  if (!configinfo.collection.empty()) args["c"] = configinfo.collection;
 
   // argument "v" can only be 0 or 1. Use the default value