Changeset 799 for trunk

Timestamp:

1999-12-06T10:21:04+13:00 (24 years ago)

Author:

sjboddie

Message:

added support for multiple gsdlhomes and gdbmhomes

Location:

trunk/gsdl/src/recpt

Files:

• receptionist.cpp (modified) (13 diffs)
• receptionist.h (modified) (3 diffs)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.42  1999/12/05 21:21:04  sjboddie
+   added support for multiple gsdlhomes and gdbmhomes
+
    Revision 1.41  1999/11/25 21:44:16  sjboddie
    fixed bug in logout
@@ -220 +223 @@
 void recptconf::clear () {
   gsdlhome.clear();
+  gdbmhome.clear();
+  collectinfo.clear();
   collection.clear();
   collectdir.clear();
@@ -360 +365 @@
     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 == "macrofiles") {
+      // want to append to macrofiles (i.e. may be several config files
+      // contributing, maybe from several collections).
+      text_tarray::const_iterator here = cfgline.begin();
+      text_tarray::const_iterator end = cfgline.end();
+      while (here != end) {
+    configinfo.macrofiles.insert (*here);
+    here ++;
+      }
+    }
     else if (key == "saveconf") configinfo.saveconf = cfgline[0];
     else if (key == "usecookies") configinfo.usecookies = (cfgline[0] == "true");
@@ -369 +383 @@
     }
     else if (key == "macroprecedence") configinfo.macroprecedence = cfgline[0];
-
+    else if (key == "collectinfo") {
+      if (cfgline.size() >= 3) {
+    collectioninfo_t cinfo;
+    cinfo.gsdl_gsdlhome = cfgline[1];
+    cinfo.gsdl_gdbmhome = cfgline[2];
+    configinfo.collectinfo[cfgline[0]] = cinfo;
+      }
+    }
     
     else if (key == "cgiarg") {
@@ -771 +792 @@
 }
 
+text_t receptionist::expandmacros (const text_t &astring, cgiargsclass &args, 
+                   ostream &logout) {
+  text_t outstring;
+  outconvertclass text_t2ascii;
+
+  action *a = actions.getaction (args["a"]);
+  prepare_page (a, args, text_t2ascii, logout);
+  disp.expandstring ("Global", astring, outstring);
+  return outstring;
+}
+
 // produce_cgi_page will call get_cgihead_info and 
 // produce_content in the appropriate way to output a cgi header and
@@ -786 +818 @@
   if (response == location) {
     // location response (url may contain macros!!)
-    text_t ex_location;
-    action *a = actions.getaction (args["a"]);
-    prepare_page (a, args, text_t2ascii, logout);
-    disp.expandstring ("Global", response_data, ex_location);
-    contentout << text_t2ascii << "Location: " << ex_location << "\n\n";
+    response_data = expandmacros (response_data, args, logout);
+    contentout << text_t2ascii << "Location: " << response_data << "\n\n";
     contentout << flush;
     return true;
@@ -854 +883 @@
 bool receptionist::produce_content (cgiargsclass &args, ostream &contentout,
                     ostream &logout) {
+  
   // decide on the output conversion class
   text_t &arg_w = args["w"];
@@ -860 +890 @@
   if (outconverter == NULL) outconverter = &defaultoutconverter;
   outconverter->reset();
+
 
   recptproto *collectproto = protocols.getrecptproto (args["c"], logout);
@@ -916 +947 @@
            << "</html>\n";
   }
-
   return true;
 }
@@ -951 +981 @@
   // 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
+  // collection specific mode) and then the main directory(s)
   text_t colmacrodir = filename_cat (configinfo.collectdir, "macros");
+
+  text_tarray maindirs;
   text_t gsdlmacrodir = filename_cat (configinfo.gsdlhome, "macros");
-  text_tarray::iterator arrhere = configinfo.macrofiles.begin();
-  text_tarray::iterator arrend = configinfo.macrofiles.end();
+  maindirs.push_back (gsdlmacrodir);
+  colinfo_tmap::iterator colhere = configinfo.collectinfo.begin();
+  colinfo_tmap::iterator colend = configinfo.collectinfo.end();
+  while (colhere != colend) {
+    gsdlmacrodir = filename_cat ((*colhere).second.gsdl_gsdlhome, "macros");
+    maindirs.push_back (gsdlmacrodir);
+    colhere ++;
+  }
+
+  text_tset::iterator arrhere = configinfo.macrofiles.begin();
+  text_tset::iterator arrend = configinfo.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();
+    bool foundfile = false;
 
     // try in the collection directory if this is being
@@ -966 +1005 @@
     if (!configinfo.collection.empty()) {
       filename = filename_cat (colmacrodir, *arrhere);
-      if (!file_exists (filename)) filename.clear ();
+      if (file_exists (filename)) {
+    disp.loaddefaultmacros(filename);
+    foundfile = true;
+      }
     }
 
     // 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 ();
+    // the main macro directory(s)
+    // if file is found in more than one main directory
+    // we'll load all copies
+    if (!foundfile) {
+      text_tarray::const_iterator dirhere = maindirs.begin();
+      text_tarray::const_iterator dirend = maindirs.end();
+      while (dirhere != dirend) {
+    filename = filename_cat (*dirhere, *arrhere);
+    if (file_exists (filename)) {
+      disp.loaddefaultmacros(filename);
+      foundfile = true;
+    }
+    dirhere ++;
+      }
     }
 
     // see if we found the file or not
-    if (filename.empty()) {
+    if (!foundfile) {
       logout << text_t2ascii 
          << "Error: the macro file \"" << *arrhere << "\" could not be found.\n";
       if (configinfo.collection.empty()) {
-    logout << text_t2ascii
-           << "It should be in " << gsdlmacrodir << ".\n\n";
+    text_t dirs;
+    joinchar (maindirs, ", ", dirs);
+    logout << text_t2ascii 
+           << "It should be in either of the following directories ("
+           << dirs << ").\n\n";
+
       } else {
     logout << text_t2ascii
@@ -991 +1047 @@
       disp.setlogout (savedlogout);
       return false;
-
-    } else { // found the file
-      disp.loaddefaultmacros(filename);
-    }
-
+    }
     arrhere++;
   }
@@ -1010 +1062 @@
 // 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*/) {
+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 (!configinfo.collection.empty()) args["c"] = configinfo.collection;
+
+  // if cross-collection is turned on make "cc" default to
+  // all available collections and "c" default to any 
+  // valid collection
+  if (args["ccs"] == "1") {
+    if (args["cc"].empty()) {
+      recptprotolistclass::iterator rprotolist_here = protocols.begin();
+      recptprotolistclass::iterator rprotolist_end = protocols.end();
+      bool first = true;
+      while (rprotolist_here != rprotolist_end) {
+    if ((*rprotolist_here).p != NULL) {
+      text_tarray collist;
+      comerror_t err;
+      (*rprotolist_here).p->get_collection_list (collist, err, logout);
+      if (err == noError) {
+        text_tarray::iterator collist_here = collist.begin();
+        text_tarray::iterator collist_end = collist.end();
+        while (collist_here != collist_end) {
+          if (!first) args["cc"].push_back (',');
+          else if (args["c"].empty()) args["c"] = *collist_here;
+          args["cc"] += *collist_here;
+          first = false;
+          collist_here ++;
+        }
+      }
+    }
+    rprotolist_here ++;
+      }
+    } else if (args["c"].empty()) {
+      text_t argcc = args["cc"];
+      decode_cgi_arg (argcc);
+      text_t::const_iterator it = argcc.begin();
+      args["c"] = substr (it, findchar (it, argcc.end(), ','));
+    }
+  }
 
   // argument "v" can only be 0 or 1. Use the default value

trunk/gsdl/src/recpt/receptionist.h

@@ -38 +38 @@
 #include "recptproto.h"
 #include "converter.h"
+#include "cfgread.h"
 
 // the MACROPRECEDENCE macro is used as a default. override
@@ -52 +53 @@
 struct recptconf {
   text_t gsdlhome;
+  text_t gdbmhome;   // will equal gsdlhome if not set
   text_t collection; // will equal "" in 'general' mode
   text_t collectdir; // will equal gsdlhome in 'general' mode
+  colinfo_tmap collectinfo;
   text_t httpprefix;
   text_t httpimg;
   text_t gwcgi;
-  text_tarray macrofiles;
+  text_tset macrofiles;
   text_t saveconf;
   bool usecookies;  // true if we want cookies set
@@ -166 +169 @@
   virtual bool log_cgi_args (cgiargsclass &args, ostream &logout);
 
+  text_t expandmacros (const text_t &astring, cgiargsclass &args, 
+               ostream &logout);
+
   // produce_cgi_page will call get_cgihead_info and 
   // produce_content in the appropriate way to output a cgi header and