Changeset 155

Timestamp:

1999-02-08T14:28:04+13:00 (25 years ago)

Author:

rjmcnab

Message:

Got the receptionist producing something using the statusaction.

Location:

trunk/gsdl/src/recpt

Files:

• Makefile (modified) (3 diffs)
• action.cpp (modified) (5 diffs)
• action.h (modified) (5 diffs)
• cgiutils.cpp (modified) (3 diffs)
• cgiwrapper.cpp (modified) (7 diffs)
• htmlgen.cpp (modified) (2 diffs)
• htmlgen.h (modified) (1 diff)
• htmlutils.cpp (modified) (2 diffs)
• receptionist.cpp (modified) (7 diffs)
• receptionist.h (modified) (6 diffs)
• recptconfig.cpp (modified) (5 diffs)

trunk/gsdl/src/recpt/Makefile

@@ -36 +36 @@
 
 HEADERS = receptionist.h cgiwrapper.h cgiargs.h action.h \
-          converter.h recptconfig.h cgiutils.h
+          converter.h recptconfig.h cgiutils.h htmlgen.h statusaction.h
 
 SOURCES = receptionist.cpp cgiwrapper.cpp cgiargs.cpp recptmain.cpp action.cpp \
-          converter.cpp recptconfig.cpp cgiutils.cpp
+          converter.cpp recptconfig.cpp cgiutils.cpp htmlgen.cpp statusaction.cpp
 
 OBJECTS = receptionist.o cgiwrapper.o cgiargs.o recptmain.o action.o \
-          converter.o recptconfig.o cgiutils.o
+          converter.o recptconfig.o cgiutils.o htmlgen.o statusaction.o
 
 EXEC    = recpt
@@ -70 +70 @@
 
 receptionist.o: receptionist.h ../../lib/gsdlconf.h ../../lib/site.h
-receptionist.o: ../../lib/text_t.h cgiargs.h ../../lib/fileutil.h
+receptionist.o: ../../lib/text_t.h cgiargs.h ../../lib/display.h action.h
+receptionist.o: ../../lib/fileutil.h cgiutils.h
 cgiwrapper.o: ../../lib/gsdlconf.h ../../lib/site.h cgiwrapper.h
-cgiwrapper.o: receptionist.h ../../lib/text_t.h cgiargs.h recptconfig.h
+cgiwrapper.o: receptionist.h ../../lib/text_t.h cgiargs.h ../../lib/display.h
+cgiwrapper.o: action.h recptconfig.h statusaction.h
 cgiwrapper.o: ../../packages/fcgi/include/fcgiapp.h
 cgiwrapper.o: ../../packages/fcgi/include/fcgi_config.h
@@ -78 +80 @@
 cgiargs.o: ../../lib/gsdlunicode.h
 recptmain.o: receptionist.h ../../lib/gsdlconf.h ../../lib/site.h
-recptmain.o: ../../lib/text_t.h cgiargs.h cgiwrapper.h
+recptmain.o: ../../lib/text_t.h cgiargs.h ../../lib/display.h action.h
+recptmain.o: cgiwrapper.h
 action.o: action.h ../../lib/gsdlconf.h ../../lib/site.h ../../lib/text_t.h
-action.o: cgiargs.h
+action.o: cgiargs.h ../../lib/display.h
 converter.o: converter.h ../../lib/gsdlconf.h ../../lib/site.h
 converter.o: ../../lib/text_t.h ../../lib/gsdlunicode.h
 recptconfig.o: recptconfig.h ../../lib/gsdlconf.h ../../lib/site.h
 recptconfig.o: ../../lib/text_t.h receptionist.h cgiargs.h
-recptconfig.o: ../../lib/fileutil.h ../../lib/cfgread.h
-cgiutils.o: cgiutils.h ../../lib/text_t.h ../../lib/gsdlconf.h
-cgiutils.o: ../../lib/site.h cgiargs.h
+recptconfig.o: ../../lib/display.h action.h ../../lib/fileutil.h
+recptconfig.o: ../../lib/cfgread.h
+cgiutils.o: cgiutils.h ../../lib/gsdlconf.h ../../lib/site.h
+cgiutils.o: ../../lib/text_t.h cgiargs.h
+htmlgen.o: htmlgen.h ../../lib/gsdlconf.h ../../lib/site.h ../../lib/text_t.h
+htmlgen.o: ../../lib/display.h ../../packages/mg-1.3d/lib/unitool.h
+statusaction.o: statusaction.h ../../lib/gsdlconf.h ../../lib/site.h action.h
+statusaction.o: ../../lib/text_t.h cgiargs.h ../../lib/display.h
+statusaction.o: receptionist.h

trunk/gsdl/src/recpt/action.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.4  1999/02/08 01:27:59  rjmcnab
+
+   Got the receptionist producing something using the statusaction.
+
    Revision 1.3  1999/02/05 10:42:41  rjmcnab
 
@@ -36 +40 @@
 
 
+// define all the macros which are related to pages generated
+// by this action
+void action::define_internal_macros (displayclass &/*disp*/, cgiargsclass &/*args*/, 
+                     ostream &/*logout*/) {
+}
+
 action::action () {
 }
@@ -49 +59 @@
 }
 
+// check_cgiargs should be called before get_cgihead_info, 
+// define_external_macros, and do_action. If an error is found
+// a message will be written to logout, if the error is severe
+// then the function will return false and no page content
+// should be produced based on the arguments.
+bool action::check_cgiargs (cgiargsclass &args, ostream &logout) {
+  return true;
+}
+
 // get_cgihead_info determines the cgi header information for
 // a set of cgi arguments. If response contains location then
@@ -54 +73 @@
 // contains content then reponse_data contains the content-type.
 // Note that images can now be produced by the receptionist.
-void action::get_cgihead_info (cgiargsclass &args, response_t &response,
-                   text_t &response_data, ostream &logout) {
+void action::get_cgihead_info (cgiargsclass &/*args*/, response_t &response,
+                   text_t &response_data, ostream &/*logout*/) {
   response = location;
   response_data = "http://www.nzdl.org";
 }
   
+// define all the macros which might be used by other actions
+// to produce pages. These macros should be well documented.
+void action::define_external_macros (displayclass &/*disp*/, cgiargsclass &/*args*/, 
+                     ostream &/*logout*/) {
+}
+
 // returns false if there was an error which prevented the action
 // from outputing anything.
-bool action::do_action (cgiargsclass &args, outconvertclass &outconvert, 
-            ostream &textout, ostream &logout) {
+bool action::do_action (cgiargsclass &/*args*/, outconvertclass &/*outconvert*/, 
+            ostream &/*textout*/, ostream &/*logout*/) {
   return true;
 }
 
 // configure should be called once for each configuration line
-void action::configure (const text_tarray &cfgline) {
+// the default version configures the default for any arguments
+// which this action uses
+void action::configure (const text_t &key, const text_tarray &cfgline) {
+  cgiarginfo *info = NULL;
+  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];
+    }
+  }
 }
 
 
+
+actionmapclass::actionmapclass () {
+}
 
 // theaction becomes the property of this class after addaction
@@ -98 +136 @@
   return (*here).second.a;
 }
+

trunk/gsdl/src/recpt/action.h

@@ -17 +17 @@
 #include "text_t.h"
 #include "cgiargs.h"
+#include "display.h"
 
 #if defined(GSDL_USE_OBJECTSPACE)
@@ -31 +32 @@
   cgiargsinfoclass argsinfo;
 
+  // define all the macros which are related to pages generated
+  // by this action
+  virtual void define_internal_macros (displayclass &disp, cgiargsclass &args, 
+                       ostream &logout);
+
 public:
   action ();
@@ -40 +46 @@
   virtual text_t get_action_name ();
 
-  // response_t is used to inform the calling code what type of
-  // cgi header it should produce
-  // eventually this should reside in cgiutils.h
-  enum response_t {location, content};
+  // check_cgiargs should be called before get_cgihead_info, 
+  // define_external_macros, and do_action. If an error is found
+  // a message will be written to logout, if the error is severe
+  // then the function will return false and no page content
+  // should be produced based on the arguments.
+  virtual bool check_cgiargs (cgiargsclass &args, ostream &logout);
 
   // get_cgihead_info determines the cgi header information for
@@ -53 +61 @@
                  text_t &response_data, ostream &logout);
   
+  // define all the macros which might be used by other actions
+  // to produce pages. These macros should be well documented.
+  virtual void define_external_macros (displayclass &disp, cgiargsclass &args, 
+                       ostream &logout);
+
   // returns false if there was an error which prevented the action
   // from outputing anything.
@@ -59 +72 @@
 
   // configure should be called once for each configuration line
-  virtual void configure (const text_tarray &cfgline);
+  virtual void configure (const text_t &key, const text_tarray &cfgline);
 
   // getargsinfo should be called after all configuration files

trunk/gsdl/src/recpt/cgiutils.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.3  1999/02/08 01:28:00  rjmcnab
+
+   Got the receptionist producing something using the statusaction.
+
    Revision 1.2  1999/02/05 10:42:43  rjmcnab
 
@@ -92 +96 @@
 
 // split up the cgi arguments
-void parse_cgi_args (text_t argstr, cgiargsclass &args) {
+void split_cgi_args (text_t argstr, cgiargsclass &args) {
   args.clear();
   
@@ -143 +147 @@
   return outtext;
 }
+
+
+
+
+static text_t::const_iterator get_next_save_arg (text_t::const_iterator first, 
+                       text_t::const_iterator last,
+                       text_t &argname) {
+  first = getdelimitstr (first, last, '-', argname);
+  return first;
+}
+
+
+// check_save_conf_str checks the configuration string for
+// the saved args and makes sure it does not conflict with
+// the information about the arguments. If an error is encountered
+// it will return false and the program should not produce any
+// output.
+bool check_save_conf_str (const text_t &saveconf, 
+              const cgiargsinfoclass &argsinfo,
+              ostream &logout) {
+  outconvertclass text_t2ascii;
+
+  text_tset argsset;
+  text_t::const_iterator saveconfhere = saveconf.begin ();
+  text_t::const_iterator saveconfend = saveconf.end ();
+  text_t argname;
+  const cgiarginfo *info;
+
+  // first check to make sure all saved arguments can be saved
+  
+  while (saveconfhere != saveconfend) {
+    saveconfhere = get_next_save_arg (saveconfhere, saveconfend, argname);
+
+    if (!argname.empty()) {
+      // save the argument name for later
+      argsset.insert (argname);
+
+      // check the argument
+      info =  argsinfo.getarginfo (argname);
+      if (info == NULL) {
+    logout << text_t2ascii << "Error: the cgi argument \"" << argname 
+           << "\" is used in the configuration string for the\n"
+           << "saved arguments but does not exist as a valid argument.\n\n";
+    return false;
+      }
+      if (info->savedarginfo == cgiarginfo::mustnot) {
+    logout << text_t2ascii << "Error: the cgi argument \"" << argname
+           << "\" is used in the configuration string for the\n"
+           << "saved arguments but has been specified as an argument whose\n"
+           << "state must not be saved.\n\n";
+    return false;
+      }
+    }
+  }
+
+
+  // next check that all saved arguments that should be saved
+  // are saved
+  cgiargsinfoclass::const_iterator argsinfohere = argsinfo.begin ();
+  cgiargsinfoclass::const_iterator argsinfoend = argsinfo.end ();
+
+  while (argsinfohere != argsinfoend) {
+    if (((*argsinfohere).second.savedarginfo == cgiarginfo::must) &&
+    (argsset.find((*argsinfohere).second.shortname) == argsset.end())) {
+      logout << text_t2ascii << "Error: the cgi argument \"" 
+         << (*argsinfohere).second.shortname << "\" was specified as needing to\n"
+         << "be save but was not listed in the saved arguments.\n\n";
+      return false;
+    }
+
+    argsinfohere++;
+  }
+  
+  return true; // made it, no clashes
+}
+
+
+// create_save_conf_str will create a configuration string
+// based on the information in argsinfo. This method of configuration
+// is not recomended as small changes can produce large changes in
+// the resulting configuration string (for instance a totally different
+// ordering). Only arguments which "must" be saved are included in
+// the resulting string.
+text_t create_save_conf_str (const cgiargsinfoclass &argsinfo,
+                 ostream &/*logout*/) {
+  cgiargsinfoclass::const_iterator argsinfohere = argsinfo.begin ();
+  cgiargsinfoclass::const_iterator argsinfoend = argsinfo.end ();
+  text_t saveconf;
+  bool first = true;
+
+  while (argsinfohere != argsinfoend) {
+    // save this argument if it must be saved
+    if ((*argsinfohere).second.savedarginfo == cgiarginfo::must) {
+      if (!first) saveconf.push_back ('-');
+      else first = false;
+      saveconf += (*argsinfohere).second.shortname;
+    }
+
+    argsinfohere++;
+  }
+  
+  return saveconf;
+}
+
+
+// expand_save_args will expand the saved arguments based
+// on saveconf placing the results in args if they are not
+// already defined. If it encounters an error it will return false
+// and output more information to logout.
+bool expand_save_args (const cgiargsinfoclass &argsinfo,
+               const text_t &saveconf, 
+               cgiargsclass &args,
+               ostream &logout) {
+  outconvertclass text_t2ascii;
+
+  text_t *arg_e = args.getarg("e");
+  if (arg_e == NULL) return true; // no compressed arguments
+  if (arg_e->empty()) return true; // no compressed arguments
+
+  text_t argname, argvalue;
+  const cgiarginfo *argnameinfo;
+  
+  text_t::const_iterator saveconfhere = saveconf.begin();
+  text_t::const_iterator saveconfend = saveconf.end();
+  
+  text_t::iterator arg_ehere = arg_e->begin();
+  text_t::iterator arg_eend = arg_e->end();
+  while (saveconfhere != saveconfend && arg_ehere != arg_eend) {
+    saveconfhere = get_next_save_arg (saveconfhere, saveconfend, argname);
+
+    if (!argname.empty()) {
+      // found another entry
+      argnameinfo = argsinfo.getarginfo (argname);
+
+      if (argnameinfo == NULL) {
+    // no information about the argument could be found
+    // we can't keep going because we don't know whether
+    // this argument is a single or multiple character value
+    logout << text_t2ascii << "Error: the cgi argument \"" << argname
+           << "\" was specified as being a compressed argument\n"
+           << "but no information about it could be found within the "
+           << "cgiargsinfoclass.\n";
+    return false;
+
+      } else {
+    // found the argument information
+    if (argnameinfo->multiplechar) {
+      arg_ehere = getdelimitstr (arg_ehere, arg_eend, '-', argvalue);
+      if (!argvalue.empty()) args.setdefaultarg (argname, argvalue);
+    } else {
+      args.setdefaultcarg (argname,*arg_ehere);
+      arg_ehere++;
+    }
+      }
+    }
+  }
+
+  return true;
+}
+
+
+// adds the default values for those arguments which have not
+// been specified
+void add_default_args (const cgiargsinfoclass &argsinfo,
+               cgiargsclass &args,
+               ostream &/*logout*/) {
+  cgiargsinfoclass::const_iterator argsinfohere = argsinfo.begin ();
+  cgiargsinfoclass::const_iterator argsinfoend = argsinfo.end ();
+
+  while (argsinfohere != argsinfoend) {
+    if ((*argsinfohere).second.defaultstatus != cgiarginfo::none) {
+      args.setdefaultarg ((*argsinfohere).second.shortname,
+              (*argsinfohere).second.argdefault);
+    }
+    argsinfohere++;
+  }
+}
+
+
+// compress_save_args will compress the arguments and return
+// them in compressed_args. If an error was encountered
+// compressed_args will be set to to "", an error will be
+// written to logout, and the function will return false.
+bool compress_save_args (const cgiargsinfoclass &argsinfo,
+             const text_t &saveconf,
+             cgiargsclass &args,
+             text_t &compressed_args,
+             ostream &logout) {
+  outconvertclass text_t2ascii;
+
+  compressed_args.clear();
+
+  text_t argname, argvalue;
+  const cgiarginfo *argnameinfo;
+  
+  text_t::const_iterator saveconfhere = saveconf.begin();
+  text_t::const_iterator saveconfend = saveconf.end();
+  
+  while (saveconfhere != saveconfend) {
+    saveconfhere = get_next_save_arg (saveconfhere, saveconfend, argname);
+
+    if (!argname.empty()) {
+      // found another entry
+      argnameinfo = argsinfo.getarginfo (argname);
+
+      if (argnameinfo == NULL) {
+    // no information about the argument could be found
+    // we can't keep going because we don't know whether
+    // this argument is a single or multiple character value
+    logout << text_t2ascii << "Error: the cgi argument \"" << argname
+           << "\" was specified as being a compressed argument\n"
+           << "but no information about it could be found within the "
+           << "cgiargsinfoclass.\n";
+    compressed_args.clear();
+    return false;
+
+      } else {
+    // found the argument information
+    if (argnameinfo->multiplechar) {
+      // multiple character argument
+      compressed_args += args[argname];
+      if (saveconfhere != saveconfend) compressed_args.push_back ('-');
+
+    } else {
+      // single character argument
+      if (args[argname].size() == 0) {
+        logout << text_t2ascii << "Error: the cgi argument \"" << argname
+           << "\" was specified as being a compressed argument which\n"
+           << "should have a one character value but it was empty.\n\n";
+        compressed_args.clear ();
+        return false;
+
+      } else if (args[argname].size() > 1) {
+        logout << text_t2ascii << "Error: the cgi argument \"" << argname
+           << "\" was specified as being a compressed argument which\n"
+           << "should have a one character value but it had multiple characters.\n\n";
+        compressed_args.clear ();
+        return false;
+      }
+
+      // everything is ok
+      compressed_args += args[argname];
+    }
+      }
+    }
+  }
+
+  return true;
+}
+
+
+// args_tounicode converts any arguments which are not in unicode
+// to unicode using inconvert
+void args_tounicode (cgiargsclass &args, inconvertclass &inconvert) {
+  cgiargsclass::iterator here = args.begin();
+  cgiargsclass::iterator end = args.end();
+
+  while (here != end) {
+    if ((*here).second.getencoding() > 0) {
+      (*here).second = inconvert.convert((*here).second);
+    }
+    
+    here++;
+  }
+}

trunk/gsdl/src/recpt/cgiwrapper.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.4  1999/02/08 01:28:01  rjmcnab
+
+   Got the receptionist producing something using the statusaction.
+
    Revision 1.3  1999/02/05 10:42:44  rjmcnab
 
@@ -39 +43 @@
 #include "cgiwrapper.h"
 #include "recptconfig.h"
+#include "action.h"
+#include "statusaction.h"
 #include <stdlib.h>
 
@@ -111 +117 @@
 
 
-static void page_errorsitecfg (const text_t &gsdlhome, const text_t &collection) {
-  outconvertclass text_t2ascii;
-
-  cout << "Content-type: text/html\n\n";
-
-  cout << "<html>\n";
-  cout << "<head>\n";
-  cout << "<title>Error</title>\n";
-  cout << "</head>\n";
-  cout << "<body>\n";
-  cout << "<h2>Oops!</h2>\n";
-  cout << "The site.cfg configuration file could not be found. This file\n";
-  cout << "should contain configuration information relating to this\n";
-  cout << "site's setup. ";
+static void page_errorsitecfg (const text_t &gsdlhome, const text_t &collection,
+                   text_t &errorpage) {
+  errorpage += "Content-type: text/html\n\n";
+
+  errorpage += "<html>\n";
+  errorpage += "<head>\n";
+  errorpage += "<title>Error</title>\n";
+  errorpage += "</head>\n";
+  errorpage += "<body>\n";
+  errorpage += "<h2>Oops!</h2>\n";
+  errorpage += "The site.cfg configuration file could not be found. This file\n";
+  errorpage += "should contain configuration information relating to this\n";
+  errorpage += "site's setup. ";
   if (collection.empty()) {
-    cout << "As this cgi script is not being run in collection specific mode,\n";
-    cout << "the file should reside at ";
-    cout << text_t2ascii << gsdlhome;
-    cout << "/etc/site.cfg.\n";
+    errorpage += "As this cgi script is not being run in collection specific mode,\n";
+    errorpage += "the file should reside at ";
+    errorpage += gsdlhome;
+    errorpage += "/etc/site.cfg.\n";
   } else {
-    cout << "As this cgi script is being run in collection specific mode,\n";
-    cout << text_t2ascii << "the file can reside in " << gsdlhome << "/collect/" 
-     << collection << "/etc/site.cfg or " << gsdlhome << "/etc/site.cfg.\n";
-  }
-  cout << "</body>\n";
-  cout << "</html>\n";
-}
-
-
-static void page_errormaincfg (const text_t &gsdlhome, const text_t &collection) {
-  outconvertclass text_t2ascii;
-
-  cout << "Content-type: text/html\n\n";
-
-  cout << "<html>\n";
-  cout << "<head>\n";
-  cout << "<title>Error</title>\n";
-  cout << "</head>\n";
-  cout << "<body>\n";
-  cout << "<h2>Oops!</h2>\n";
+    errorpage += "As this cgi script is being run in collection specific mode,\n";
+    errorpage += "the file can reside in ";
+    errorpage += gsdlhome;
+    errorpage += "/collect/";
+    errorpage += collection;
+    errorpage += "/etc/site.cfg or ";
+    errorpage += gsdlhome;
+    errorpage += "/etc/site.cfg.\n";
+  }
+  errorpage += "</body>\n";
+  errorpage += "</html>\n";
+}
+
+
+static void page_errormaincfg (const text_t &gsdlhome, const text_t &collection,
+                   text_t &errorpage) {
+  errorpage += "Content-type: text/html\n\n";
+
+  errorpage += "<html>\n";
+  errorpage += "<head>\n";
+  errorpage += "<title>Error</title>\n";
+  errorpage += "</head>\n";
+  errorpage += "<body>\n";
+  errorpage += "<h2>Oops!</h2>\n";
   if (collection.empty()) {
-    cout << "The main.cfg configuration file could not be found. This file\n";
-    cout << "should contain configuration information relating to the\n";
-    cout << "setup of the interface. As this cgi script is not being run\n";
-    cout << "in collection specific mode the file should reside at\n";
-    cout << text_t2ascii << gsdlhome << "/etc/main.cfg.\n";
+    errorpage += "The main.cfg configuration file could not be found. This file\n";
+    errorpage += "should contain configuration information relating to the\n";
+    errorpage += "setup of the interface. As this cgi script is not being run\n";
+    errorpage += "in collection specific mode the file should reside at\n";
+    errorpage += gsdlhome;
+    errorpage += "/etc/main.cfg.\n";
   } else {
-    cout << "Neither the collect.cfg or main.cfg configuration files could\n";
-    cout << "not be found. This file should contain configuration information\n";
-    cout << "relating to the setup of the interface. As this cgi script is\n";
-    cout << "being run in collection specific mode the file should reside\n";
-    cout << "at either ";
-    cout << text_t2ascii << gsdlhome << "/collect/" << collection 
-     << "/etc/collect.cfg, " << gsdlhome << "/etc/collect.cfg or " 
-     << gsdlhome << "/etc/main.cfg.\n";
-  }
-  cout << "</body>\n";
-  cout << "</html>\n";
-}
-
-
-static void page_errorinit (const text_t &gsdlhome) {
-  outconvertclass text_t2ascii;
-
-  cout << "Content-type: text/html\n\n";
-
-  cout << "<html>\n";
-  cout << "<head>\n";
-  cout << "<title>Error</title>\n";
-  cout << "</head>\n";
-  cout << "<body>\n";
-  cout << "<h2>Oops!</h2>\n";
-  cout << "An error occurred during the initialisation of the Greenstone Digital\n";
-  cout << "Library software. It is likely that the software has not been setup\n";
-  cout << "correctly, consult ";
-  cout << text_t2ascii << gsdlhome << "/etc/initout.txt for more information.\n";
-  cout << "</body>\n";
-  cout << "</html>\n";
+    errorpage += "Neither the collect.cfg or main.cfg configuration files could\n";
+    errorpage += "not be found. This file should contain configuration information\n";
+    errorpage += "relating to the setup of the interface. As this cgi script is\n";
+    errorpage += "being run in collection specific mode the file should reside\n";
+    errorpage += "at either ";
+    errorpage += gsdlhome;
+    errorpage += "/collect/";
+    errorpage += collection;
+    errorpage += "/etc/collect.cfg, ";
+    errorpage += gsdlhome;
+    errorpage += "/etc/collect.cfg or ";
+    errorpage += gsdlhome;
+    errorpage += "/etc/main.cfg.\n";
+  }
+  errorpage += "</body>\n";
+  errorpage += "</html>\n";
+}
+
+
+static void page_errorinit (const text_t &gsdlhome, text_t &errorpage) {
+  errorpage += "Content-type: text/html\n\n";
+
+  errorpage += "<html>\n";
+  errorpage += "<head>\n";
+  errorpage += "<title>Error</title>\n";
+  errorpage += "</head>\n";
+  errorpage += "<body>\n";
+  errorpage += "<h2>Oops!</h2>\n";
+  errorpage += "An error occurred during the initialisation of the Greenstone Digital\n";
+  errorpage += "Library software. It is likely that the software has not been setup\n";
+  errorpage += "correctly.\n";
+
+  ifstream initin (GSDL_GSDLHOME "/etc/initout.txt");
+  if (initin) {
+    errorpage += "The initialisation error log, " GSDL_GSDLHOME "/etc/initout.txt, contains the\n";
+    errorpage += "following information:\n\n";
+    errorpage += "<pre>\n";
+
+    char c;
+    initin.get(c);
+    while (!initin.eof ()) {
+      errorpage.push_back(c);
+      initin.get(c);
+    }
+    
+    errorpage += "</pre>\n";
+
+    initin.close();
+
+  } else {
+    errorpage += "Please consult " GSDL_GSDLHOME "/etc/initout.txt for more information.\n";
+  }
+
+  errorpage += "</body>\n";
+  errorpage += "</html>\n";
+}
+
+static void page_errorparseargs (const text_t &gsdlhome, text_t &errorpage) {
+  errorpage += "Content-type: text/html\n\n";
+
+  errorpage += "<html>\n";
+  errorpage += "<head>\n";
+  errorpage += "<title>Error</title>\n";
+  errorpage += "</head>\n";
+  errorpage += "<body>\n";
+  errorpage += "<h2>Oops!</h2>\n";
+  errorpage += "An error occurred during the parsing of the cgi arguments.\n";
+
+  ifstream errin (GSDL_GSDLHOME "/etc/errout.txt");
+  if (errin) {
+    errorpage += "The error log, " GSDL_GSDLHOME "/etc/errout.txt, contains the\n";
+    errorpage += "following information:\n\n";
+    errorpage += "<pre>\n";
+
+    char c;
+    errin.get(c);
+    while (!errin.eof ()) {
+      errorpage.push_back(c);
+      errin.get(c);
+    }
+    errorpage += "</pre>\n";
+    errin.close();
+
+  } else {
+    errorpage += "Please consult " GSDL_GSDLHOME "/etc/errout.txt for more information.\n";
+  }
+
+  errorpage += "</body>\n";
+  errorpage += "</html>\n";
+}
+
+static void page_errorcgipage (const text_t &gsdlhome, text_t &errorpage) {
+  errorpage += "Content-type: text/html\n\n";
+
+  errorpage += "<html>\n";
+  errorpage += "<head>\n";
+  errorpage += "<title>Error</title>\n";
+  errorpage += "</head>\n";
+  errorpage += "<body>\n";
+  errorpage += "<h2>Oops!</h2>\n";
+  errorpage += "An error occurred during the construction of the cgi page.\n";
+
+  ifstream errin (GSDL_GSDLHOME "/etc/errout.txt");
+  if (errin) {
+    errorpage += "The error log, " GSDL_GSDLHOME "/etc/errout.txt, contains the\n";
+    errorpage += "following information:\n\n";
+    errorpage += "<pre>\n";
+
+    char c;
+    errin.get(c);
+    while (!errin.eof ()) {
+      errorpage.push_back(c);
+      errin.get(c);
+    }
+    errorpage += "</pre>\n";
+    errin.close();
+
+  } else {
+    errorpage += "Please consult " GSDL_GSDLHOME "/etc/errout.txt for more information.\n";
+  }
+
+  errorpage += "</body>\n";
+  errorpage += "</html>\n";
 }
 
@@ -201 +303 @@
 #endif
 
-  // init stuff
+  // init stuff - we can't output error pages directly with
+  // fastcgi so the pages are stored until we can output them
+  text_t errorpage;
+  outconvertclass text_t2ascii;
+
+  // the the list of actions
+  statusaction *astatusaction = new statusaction;
+  if (astatusaction != NULL) {
+    astatusaction->set_receptionist (&recpt);
+    recpt.add_action (astatusaction);
+  }
 
   // set defaults
@@ -215 +327 @@
   if (!site_cfg_read (recpt, GSDL_GSDLHOME, collection, maxrequests)) {
     // couldn't find the site configuration file
-    page_errorsitecfg (GSDL_GSDLHOME, collection);
-    return;
-  }
-  if (!main_cfg_read (recpt, GSDL_GSDLHOME, collection)) {
+    page_errorsitecfg (GSDL_GSDLHOME, collection, errorpage);
+  } else if (!main_cfg_read (recpt, GSDL_GSDLHOME, collection)) {
     // couldn't find the main configuration file
-    page_errormaincfg (GSDL_GSDLHOME, collection);
-    return;
+    page_errormaincfg (GSDL_GSDLHOME, collection, errorpage);
   }
 
   // initialise the library software
-  ofstream initout (GSDL_GSDLHOME "/etc/initout.txt");
-  if (!recpt.init(initout)) {
-    // an error occurred during the initialisation
+  if (errorpage.empty()) {
+    ofstream initout (GSDL_GSDLHOME "/etc/initout.txt");
+    if (!recpt.init(initout)) {
+      // an error occurred during the initialisation
+      initout.close();
+      page_errorinit(GSDL_GSDLHOME, errorpage);
+    }
     initout.close();
-    page_errorinit(GSDL_GSDLHOME);
-    return;
-  }
-  initout.close();
+  }
   
   // find out whether this is being run as a cgi-script
@@ -248 +358 @@
   // script
   text_t argstr = "";
+  cgiargsclass args;
   char *aURIStr;
   if (!isfastcgi) {
@@ -282 +393 @@
 #define pageout cout
 #endif
-    ofstream errout (GSDL_GSDLHOME "/etc/errout.txt");
-    cerr = errout;
+
+    if (errorpage.empty()) {
+      ofstream errout (GSDL_GSDLHOME "/etc/errout.txt");
+      cerr = errout;
     
-    // get the query page
-    recpt.produce_cgi_page (argstr, pageout, errout);
+      // parse the cgi arguments and produce the resulting page if there
+      // has been no errors so far
+      if (!recpt.parse_cgi_args (argstr, args, errout)) {
+    errout.close ();
+    page_errorparseargs(GSDL_GSDLHOME, errorpage);
+      } else {
+    if (!recpt.produce_cgi_page (args, pageout, errout)) {
+      errout.close ();
+      page_errorcgipage(GSDL_GSDLHOME, errorpage);
+    } else {
+      errout.close ();
+    }
+      }
+    }
+    // there was an error, output the error page
+    if (!errorpage.empty()) {
+      pageout << text_t2ascii << errorpage;
+      errorpage.clear();
+      numrequests = maxrequests; // make this the last page
+    }
+    pageout << flush;
     
     // finish with the output streams
-    errout.close();
 #ifdef USE_FASTCGI
     if (isfastcgi) FCGX_Finish();

trunk/gsdl/src/recpt/htmlgen.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.2  1999/02/08 01:28:02  rjmcnab
+
+   Got the receptionist producing something using the statusaction.
+
    Revision 1.1  1999/01/08 08:40:56  rjmcnab
 
@@ -22 +26 @@
  */
 
-static char *RCSID = "$Id$";
+#include "htmlgen.h"
+#include "unitool.h"
 
-
-#include "htmlgen.h"
+#if defined(GSDL_USE_OBJECTSPACE)
+#  include <ospace\std\map>
+#elif defined(GSDL_USE_STL_H)
+#  include <map.h>
+#else
+#  include <map>
+#endif
 
 
 
+// highlighttext highlights query terms in text string and 
+// outputs the resulting text string
+void highlighttext (text_tarray &termvars, displayclass &disp, text_t &text,
+            outconvertclass &outconvert, ostream &textout, ostream &logout) {
+  map<text_t, int, lttext_t> terms;
+  map<text_t, int, lttext_t>::const_iterator it;
+  for (unsigned int i = 0; i < termvars.size(); i++) {
+    terms[termvars[i]] = 1;
+  }
 
+  // get the text to start and end a hightlight
+  text_t starthighlight = "<b><u>";
+  text_t endhighlight = "</u></b>";
+  if (disp.isdefaultmacro("Global", "starthighlight"))
+    disp.expandstring("Global", "_starthighlight_", starthighlight);
+  if (disp.isdefaultmacro("Global", "endhighlight"))
+    disp.expandstring("Global", "_endhighlight_", endhighlight);
+
+
+  text_t::iterator here = text.begin(); 
+  text_t::iterator end = text.end();
+  text_t word, buffer;
+  while (here != end) {
+    if (is_unicode_letdig(*here)) {
+      // not word boundary
+      word.push_back(*here);
+      here++;
+
+    } else {
+      // found word boundary
+      // add last word if there was one
+      if (!word.empty()) {
+    it = terms.find(word);
+    if (it != terms.end()) {
+      word = starthighlight + word + endhighlight;
+    }
+    buffer += word;
+        word.clear();
+      }
+
+      if (*here == '<') {
+        // skip over rest of html tag
+    while ((here != end) && (*here != '>')) {
+      buffer.push_back(*here);
+      here++;
+    }
+      }
+
+      buffer.push_back(*here);
+      here++;
+
+      if (buffer.size() > 1024) {
+    textout << outconvert << buffer;
+    buffer.clear();
+      }
+    }
+  }
+  textout << outconvert << buffer;
+}
+
+

trunk/gsdl/src/recpt/htmlgen.h

@@ -14 +14 @@
 #define HTMLGEN_H
 
+#include "gsdlconf.h"
+#include "text_t.h"
+#include "display.h"
+
+#if defined(GSDL_USE_OBJECTSPACE)
+#  include <ospace\std\iostream>
+#elif defined(GSDL_USE_IOS_H)
+#  include <iostream.h>
+#else
+#  include <iostream>
+#endif
 
 
 
+// highlighttext highlights query terms in text string and 
+// outputs the resulting text string
+void highlighttext (text_tarray &termvars, displayclass &disp, text_t &text,
+            outconvertclass &outconvert, ostream &textout, ostream &logout);
+
+
 #endif

trunk/gsdl/src/recpt/htmlutils.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.2  1999/02/08 01:28:02  rjmcnab
+
+   Got the receptionist producing something using the statusaction.
+
    Revision 1.1  1999/01/08 08:40:58  rjmcnab
 
@@ -22 +26 @@
  */
 
-static char *RCSID = "$Id$";
-
 
 #include "htmlutils.h"

trunk/gsdl/src/recpt/receptionist.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.5  1999/02/08 01:28:02  rjmcnab
+
+   Got the receptionist producing something using the statusaction.
+
    Revision 1.4  1999/02/05 10:42:46  rjmcnab
 
@@ -31 +35 @@
 #include "receptionist.h"
 #include "fileutil.h"
+#include "cgiutils.h"
 #include <assert.h>
 #include <time.h>
@@ -61 +66 @@
 }
 
-
-// sets the http address of the images directory. This is used to
-// speed up the access to the images which are a part of the general
-// interface. If this is not set the interface will have to get the
-// images via gwcgi which will be a lot slower (especially if the
-// browser does not cache the images).
-void receptionist::set_httpimg (const text_t &thehttpimg) {
-  httpimg = thehttpimg;
-}
-
-// sets the http address of the gateway cgi program (ie. the program
-// that contains this receptionist).
-void receptionist::set_gwcgi (const text_t &thegwcgi) {
-  gwcgi = thegwcgi;
-}
-
+// 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.
@@ -84 +88 @@
 // produced by the calling code.
 bool receptionist::init (ostream &logout) {
-  // redirect the error output to logout
-  //  disp.setlogout (&logout);
-
-  // set default values for the configuration file
-  //  cfg_info.defaultaction = "p";
-  //  cfg_info.defaultpage = "about";
-  //  cfg_info.defaultencoding = "w";
-
-  // load up the default macro files, the collection directory
-  // is searched first for the file and then the main directory
-  //  text_t colmacrodir = filename_cat (collectdir, "macros");
-  //  text_t gsdlmacrodir = filename_cat (gsdlhome, "macros");
-  //  text_tarray::iterator arrhere = cfg_info.macrofiles.begin();
-  //  text_tarray::iterator arrend = cfg_info.macrofiles.end();
-  //  while (arrhere != arrend) {
-  //    filename = filename_cat (colmacrodir, *arrhere);
-  //    if (!file_exists (filename)) {
-  //      filename = filename_cat (gsdlmacrodir, *arrhere);
-  //    }
-  //    disp.loaddefaultmacros(filename);
-  //    arrhere++;
-  //  }
-
-  srand(time(NULL));
+  // read in the macro files
+  if (!read_macrofiles (logout)) return false;
+
+  // defined the main cgi arguments
+  if (!define_mainargs (logout)) return false;
+
+  // 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 (saveconf.empty())
+    saveconf = create_save_conf_str (argsinfo, logout);
+
+  // check the saveconf string
+  if (!check_save_conf_str (saveconf, argsinfo, logout))
+    return false;
+
+  // set a random seed
+  srand (time(NULL));
 
   //  utf8outconvert.set_rzws(1);
@@ -116 +124 @@
 
 
-// produce_cgi_page will call parse_cgi_args, get_cgihead_info and 
+// parse_cgi_args parses cgi arguments into an argument class.
+// This function should be called for each page request. It returns false
+// if there was a major problem with the cgi arguments.
+bool receptionist::parse_cgi_args (const text_t &argstr, cgiargsclass &args, 
+                   ostream &logout) {
+  outconvertclass text_t2ascii;
+
+  // get an initial list of cgi arguments
+  args.clear();
+  split_cgi_args (argstr, args);
+
+  // expand the compressed argument (if there was one)
+  if (!expand_save_args (argsinfo, saveconf, args, logout)) return false;
+
+  // add the defaults
+  add_default_args (argsinfo, args, logout);
+
+  // check the main cgi arguments
+  if (!check_mainargs (args, logout)) return false;
+
+  // check the arguments for the action
+  action *a = actions.getaction (args["a"]);
+  if (a != NULL) {
+    if (!a->check_cgiargs (args, logout)) return false;
+  } else {
+    // the action was not found!!
+    logout << text_t2ascii << "Error: the action \"" << args["a"] 
+       << "\" could not be found.\n";
+    return false;
+  }
+
+  return true;
+}
+
+
+// produce_cgi_page will call get_cgihead_info and 
 // produce_content in the appropriate way to output a cgi header and
-// the page content (if needed).
-void receptionist::produce_cgi_page (const text_t &argstr, ostream &contentout, 
+// the page content (if needed). If a page could not be created it
+// will return false
+bool receptionist::produce_cgi_page (cgiargsclass &args, ostream &contentout, 
                      ostream &logout) {
-  contentout << "Content-type: text/plain\n\nHello\n";
+  outconvertclass text_t2ascii;
+
+  response_t response;
+  text_t response_data;
+
+  // produce cgi header
+  get_cgihead_info (args, response, response_data, logout);
+  if (response == location) {
+    // I've forgotten how to do this :-/
+    return true;
+  } else if (response == content) {
+    // content response
+    contentout << text_t2ascii << "Content-type: " << response_data << "\n\n";
+  } else {
+    // unknown response
+    logout << "Error: get_cgihead_info returned an unknown response type.\n";
+    return false;
+  }
+
+  // produce cgi page
+  if (!produce_content (args, contentout, logout)) return false;
+
+  // flush contentout
   contentout << flush;
-}
-
-
-// parse_cgi_args parses cgi arguments into an argument class.
-// This function should be called for each page request.
-void receptionist::parse_cgi_args (const text_t &argstr, cgiargsclass &args, 
-                   ostream &logout) {
+  return true;
 }
 
@@ -140 +200 @@
 void receptionist::get_cgihead_info (cgiargsclass &args, response_t &response,
                      text_t &response_data, ostream &logout) {
+  outconvertclass text_t2ascii;
+
+  // get the action
+  action *a = actions.getaction (args["a"]);
+  if (a != NULL) {
+    a->get_cgihead_info (args, response, response_data, logout);
+
+  } else {
+    // the action was not found!!
+    logout << text_t2ascii << "Error receptionist::get_cgihead_info: the action \"" 
+       << args["a"] << "\" could not be found.\n";
+    response = content;
+    response_data = "text/html";
+  }
 }
 
 
 // produce the page content
-void receptionist::produce_content (cgiargsclass &args, ostream &contentout,
+bool receptionist::produce_content (cgiargsclass &args, ostream &contentout,
                     ostream &logout) {
+  outconvertclass text_t2ascii;
+
+  // decide on the output conversion class
+
+  // 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))
+      return false;
+
+  } else {
+    // the action was not found!!
+    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";
+  }
+
+  return true;
 }
 
@@ -154 +256 @@
   return "";
 }
+
+
+// will read in all the macro files. If one is not found an
+// error message will be written to logout and the method will
+// return false.
+bool receptionist::read_macrofiles (ostream &logout) {
+  outconvertclass text_t2ascii;
+
+  // redirect the error output to logout
+  disp.setlogout (&logout);
+
+  // load up the default macro files, the collection directory
+  // 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 filename;
+  while (arrhere != arrend) {
+    // filename is used as a flag to indicate whether
+    // the macro file has been found
+    filename.clear();
+
+    // try in the collection directory if this is being
+    // run in collection specific mode
+    if (!collection.empty()) {
+      filename = filename_cat (colmacrodir, *arrhere);
+      if (!file_exists (filename)) filename.clear ();
+    }
+
+    // if we haven't found the macro file yet try in
+    // the main macro directory
+    if (filename.empty()) {
+      filename = filename_cat (gsdlmacrodir, *arrhere);
+      if (!file_exists (filename)) filename.clear ();
+    }
+
+    // see if we found the file or not
+    if (filename.empty()) {
+      logout << text_t2ascii 
+         << "Error: the macro file \"" << *arrhere << "\" could not be found.\n";
+      if (collection.empty()) {
+    logout << text_t2ascii
+           << "It should be in " << gsdlmacrodir << ".\n\n";
+      } else {
+    logout << text_t2ascii
+           << "It should be in either " << colmacrodir << " or in " 
+           << gsdlmacrodir << ".\n\n";
+      }
+      return false;
+
+    } else { // found the file
+      disp.loaddefaultmacros(filename);
+    }
+
+    arrhere++;
+  }
+
+  // success
+  return true;
+}
+
+
+// Will define the main general arguments used by the receptionist.
+// If an error occurs a message will be written to logout and the
+// method will return false.
+bool receptionist::define_mainargs (ostream &logout) {
+  // create a list of cgi arguments
+  cgiarginfo ainfo;
+
+  ainfo.shortname = "e";
+  ainfo.longname = "compressed arguments";
+  ainfo.multiplechar = true;
+  ainfo.defaultstatus = cgiarginfo::good;
+  ainfo.argdefault = "";
+  ainfo.savedarginfo = cgiarginfo::mustnot;
+  if (!argsinfo.addarginfo (&logout, ainfo)) return false;
+
+  ainfo.shortname = "a";
+  ainfo.longname = "action";
+  ainfo.multiplechar = true;
+  ainfo.defaultstatus = cgiarginfo::none;
+  ainfo.argdefault = "";
+  ainfo.savedarginfo = cgiarginfo::must;
+  if (!argsinfo.addarginfo (&logout, ainfo)) return false;
+
+  // w=western
+  ainfo.shortname = "w";
+  ainfo.longname = "encoding";
+  ainfo.multiplechar = true;
+  ainfo.defaultstatus = cgiarginfo::weak;
+  ainfo.argdefault = "w";
+  ainfo.savedarginfo = cgiarginfo::must;
+  if (!argsinfo.addarginfo (&logout, ainfo)) return false;
+  
+  ainfo.shortname = "nw";
+  ainfo.longname = "new encoding";
+  ainfo.multiplechar = true;
+  ainfo.defaultstatus = cgiarginfo::none;
+  ainfo.argdefault = "";
+  ainfo.savedarginfo = cgiarginfo::mustnot;
+  if (!argsinfo.addarginfo (&logout, ainfo)) return false;
+  
+  ainfo.shortname = "c";
+  ainfo.longname = "collection";
+  ainfo.multiplechar = true;
+  if (collection.empty()) {
+    ainfo.defaultstatus = cgiarginfo::none;
+    ainfo.argdefault = "";
+    ainfo.savedarginfo = cgiarginfo::must;
+  } else {
+    ainfo.defaultstatus = cgiarginfo::good;
+    ainfo.argdefault = collection;
+    ainfo.savedarginfo = cgiarginfo::can;
+  }
+  if (!argsinfo.addarginfo (&logout, ainfo)) return false;
+  
+  // 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;
+  if (!argsinfo.addarginfo (&logout, ainfo)) return false;
+  
+  // 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;
+  if (!argsinfo.addarginfo (&logout, ainfo)) return false;
+  
+  // the interface language name should use the ISO 639
+  // standard
+  ainfo.shortname = "l";
+  ainfo.longname = "interface language";
+  ainfo.multiplechar = true;
+  ainfo.defaultstatus = cgiarginfo::weak;
+  ainfo.argdefault = "en";
+  ainfo.savedarginfo = cgiarginfo::must;
+  if (!argsinfo.addarginfo (&logout, ainfo)) return false;
+
+  return true;
+}
+ 
+ 
+// check_mainargs will check all the main arguments. If a major
+// error is found it will return false and no cgi page should
+// be created using the arguments.
+bool receptionist::check_mainargs (cgiargsclass &args, ostream &logout) {
+  // if this receptionist is running in collection dependant mode
+  // then it should always set the collection argument to the
+  // collection
+  if (!collection.empty()) args["c"] = collection;
+
+  // argument "v" can only be 0 or 1. Use the default value
+  // if it is out of range
+  int arg_v = args.getintarg ("v");
+  if (arg_v != 0 && arg_v != 1) {
+    cgiarginfo *vinfo = argsinfo.getarginfo ("v");
+    if (vinfo != NULL) args["v"] = vinfo->argdefault;
+  }
+
+  // argument "f" can only be 0 or 1. Use the default value
+  // if it is out of range
+  int arg_f = args.getintarg ("f");
+  if (arg_f != 0 && arg_f != 1) {
+    cgiarginfo *finfo = argsinfo.getarginfo ("f");
+    if (finfo != NULL) args["f"] = finfo->argdefault;
+  }
+
+  return true;
+}

trunk/gsdl/src/recpt/receptionist.h

@@ -17 +17 @@
 #include "text_t.h"
 #include "cgiargs.h"
+#include "display.h"
+#include "action.h"
 
 #ifndef MACROPRECEDENCE
@@ -31 +33 @@
   // is being run for multiple collections ("general" mode).
   void set_gsdlhome (const text_t &thegsdlhome);
+  text_t get_gsdlhome () {return gsdlhome;}
 
   // this version of set_gsdlhome should be used if the receptionist
   // is being run for a single collection ("collection specific" mode).
   void set_gsdlhome (const text_t &thegsdlhome, const text_t &thecollection);
+  text_t get_collection () {return collection;}
 
   // sets the http address of the images directory. This is used to
@@ -41 +45 @@
   // images via gwcgi which will be a lot slower (especially if the
   // browser does not cache the images).
-  void set_httpimg (const text_t &thehttpimg);
+  void set_httpimg (const text_t &thehttpimg) {httpimg=thehttpimg;}
+  text_t get_httpimg () {return httpimg;}
 
   // sets the http address of the gateway cgi program (ie. the program
   // that contains this receptionist).
-  void set_gwcgi (const text_t &thegwcgi);
+  void set_gwcgi (const text_t &thegwcgi) {gwcgi=thegwcgi;}
+  text_t get_gwcgi () {return gwcgi;}
+
+  // set_macrofiles defines the macro files which will be read when
+  // the init function is called.
+  void set_macrofiles (const text_tarray &themacrofiles) {macrofiles=themacrofiles;}
+  text_tarray get_macrofiles () {return macrofiles;}
+
+  // set_saveconf defines what should be included in the compressed
+  // arguments. This string should consist of cgi argument names
+  // seperated by "-".
+  void set_saveconf (const text_t &thesaveconf) {saveconf=thesaveconf;}
+  text_t get_saveconf () {return saveconf;}
+
+  // add_action makes another action available to the receptionist
+  // the action becomes the property of the receptionist
+  void add_action (action *theaction) {actions.addaction(theaction);}
+
+  // 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 configure_actions (const text_t &key, const text_tarray &cfgline);
 
   // init should be called after setgsdhome has been called.
@@ -55 +81 @@
   
   // There are two ways to produce a page. You can either call parse_cgi_args,
-  // get_cgihead_info, and produce_content or you can just call produce_cgi_page
-  // which will be satisfactory in most cases. You might want to call
+  // get_cgihead_info, and produce_content or you can just call parse_cgi_args and
+  // produce_cgi_page (which will be satisfactory in most cases). You might want to call
   // parse_cgi_args, get_cgihead_info, and produce_content when you want to
-  // call get_compressed_arg or interface directly with a web server for which
-  // the standard header is inappropriate.
-
-  // produce_cgi_page will call parse_cgi_args, get_cgihead_info and 
-  // produce_content in the appropriate way to output a cgi header and
-  // the page content (if needed).
-  void produce_cgi_page (const text_t &argstr, ostream &contentout, 
-             ostream &logout);
+  // interface directly with a web server for which the standard header is inappropriate.
 
   // parse_cgi_args parses cgi arguments into an argument class.
-  // This function should be called for each page request.
-  void parse_cgi_args (const text_t &argstr, cgiargsclass &args, ostream &logout);
+  // This function should be called for each page request. It returns false
+  // if there was a major problem with the cgi arguments.
+  bool parse_cgi_args (const text_t &argstr, cgiargsclass &args, ostream &logout);
 
-  // response_t is used to inform the calling code what type of
-  // cgi header it should produce
-  // eventually this should reside in cgiutils.h
-  enum response_t {location, content};
+  // produce_cgi_page will call get_cgihead_info and 
+  // produce_content in the appropriate way to output a cgi header and
+  // the page content (if needed). If a page could not be created it
+  // will return false
+  bool produce_cgi_page (cgiargsclass &args, ostream &contentout, 
+                     ostream &logout);
 
   // get_cgihead_info determines the cgi header information for
@@ -85 +107 @@
 
   // produce the page content
-  void produce_content (cgiargsclass &args, ostream &contentout,
+  bool produce_content (cgiargsclass &args, ostream &contentout,
             ostream &logout);
 
@@ -99 +121 @@
   text_t gwcgi;
 
+  displayclass disp;
+  text_tarray macrofiles;
 
+  text_t saveconf;
+  cgiargsinfoclass argsinfo;
+  actionmapclass actions;
+
+  // will read in all the macro files. If one is not found an
+  // error message will be written to logout and the method will
+  // return false.
+  bool read_macrofiles (ostream &logout);
   
+  // Will define the main general arguments used by the receptionist.
+  // If an error occurs a message will be written to logout and the
+  // method will return false.
+  virtual bool define_mainargs (ostream &logout);
+
+  // check_mainargs will check all the main arguments. If a major
+  // error is found it will return false and no cgi page should
+  // be created using the arguments.
+  virtual bool check_mainargs (cgiargsclass &args, ostream &logout);
 };
 
 
-
 #endif

trunk/gsdl/src/recpt/recptconfig.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.2  1999/02/08 01:28:04  rjmcnab
+
+   Got the receptionist producing something using the statusaction.
+
    Revision 1.1  1999/02/05 06:50:32  rjmcnab
 
@@ -60 +64 @@
   // read in the site configuration file
   text_tarray cfgline;
+  text_t key;
   char *cstr = filename.getcstr();
   ifstream confin (cstr);
@@ -67 +72 @@
     while (read_cfg_line(confin, cfgline) >= 0) {
       if (cfgline.size () >= 2) {
-    if (cfgline[0] == "gsdlhome") {
-      if (collection.empty()) recpt.set_gsdlhome(cfgline[1]);
-      else recpt.set_gsdlhome(cfgline[1], collection);
+    key = cfgline[0];
+    cfgline.erase(cfgline.begin());
+
+    if (key == "gsdlhome") {
+      if (collection.empty()) recpt.set_gsdlhome(cfgline[0]);
+      else recpt.set_gsdlhome(cfgline[0], collection);
     }
-    else if (cfgline[0] == "httpimg") recpt.set_httpimg(cfgline[1]);
-    else if (cfgline[0] == "gwcgi") recpt.set_gwcgi(cfgline[1]);
-    else if (cfgline[0] == "maxrequests") {
-      maxrequests = cfgline[1].getint();
+    else if (key == "httpimg") recpt.set_httpimg(cfgline[0]);
+    else if (key == "gwcgi") recpt.set_gwcgi(cfgline[0]);
+    else if (key == "maxrequests") {
+      maxrequests = cfgline[0].getint();
       if (maxrequests < 1) maxrequests = 1;
     }
+
+    // configure all the actions
+    recpt.configure_actions (key, cfgline);
       }
     }
@@ -112 +123 @@
 
   // read in the site configuration file
+  text_t key;
   text_tarray cfgline;
   char *cstr = filename.getcstr();
@@ -120 +132 @@
     while (read_cfg_line(confin, cfgline) >= 0) {
       if (cfgline.size () >= 2) {
-    // not finished yet
+    key = cfgline[0];
+    cfgline.erase(cfgline.begin());
+    if (key == "macrofiles") recpt.set_macrofiles (cfgline);
+
+    // configure all the actions
+    recpt.configure_actions (key, cfgline);
       }
     }