Changeset 1279 for branches/New_Config_Format-branch/gsdl/src/recpt/receptionist.cpp

Timestamp:

2000-07-13T10:21:53+12:00 (24 years ago)

Author:

sjboddie

Message:

merged changes to trunk into New_Config_Format branch

File:

• branches/New_Config_Format-branch/gsdl/src/recpt/receptionist.cpp (modified) (11 diffs)

branches/New_Config_Format-branch/gsdl/src/recpt/receptionist.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.47.4.1  2000/07/12 22:21:44  sjboddie
+   merged changes to trunk into New_Config_Format branch
+
+   Revision 1.53  2000/07/05 21:49:34  sjboddie
+   Receptionist now caches collection information to avoid making multiple
+   get_collectinfo calls to collection server
+
+   Revision 1.52  2000/07/04 02:15:22  sjboddie
+   fixed bug causing segmentation fault when an invalid collection
+   was supplied as the "c" cgi argument
+
+   Revision 1.51  2000/05/28 09:15:34  sjboddie
+   a few small changes to get an initial release of the local library
+
+   Revision 1.50  2000/05/12 03:09:25  sjboddie
+   minor modifications to get web library compiling under VC++ 6.0
+
+   Revision 1.49  2000/05/04 05:18:46  sjboddie
+   attempting to get end-user collection building to work under windows
+
+   Revision 1.48  2000/04/14 02:52:06  sjboddie
+   tidied up error messaging and set up some debugging info to be output
+   when running library from command line
+
    Revision 1.47  2000/02/17 22:26:17  sjboddie
    set macros for displaying macrons in utf8
@@ -227 +251 @@
 #include "cgiutils.h"
 #include "htmlutils.h"
+#include "gsdltools.h"
 #include "OIDtools.h"
 #include <assert.h>
 #include <time.h>
 #include <stdio.h>
+#if defined (GSDL_USE_IOS_H)
 #include <fstream.h>
+#else 
+#include <fstream>
+#endif
 
 #if defined (__WIN32_)
@@ -244 +273 @@
   collectdir.clear();
   httpprefix.clear();
-  httpimg.clear();
+  httpimg = "/images";
   gwcgi.clear();
   macrofiles.erase(macrofiles.begin(), macrofiles.end());
@@ -264 +293 @@
 }
 
-
+void collectioninfo_t::clear () {
+  gsdl_gsdlhome.clear();
+  gsdl_gdbmhome.clear();
+
+  info_loaded = false;
+  info.clear();
+}
 
 receptionist::receptionist () {
@@ -781 +816 @@
   utf8outconvertclass text_t2utf8;
   char *lfile = filename.getcstr();
+
   ofstream log (lfile, ios::app);
   
@@ -904 +940 @@
 bool receptionist::produce_content (cgiargsclass &args, ostream &contentout,
                     ostream &logout) {
-  
+
   // decide on the output conversion class
   text_t &arg_w = args["w"];
@@ -1005 +1041 @@
   text_t colmacrodir = filename_cat (configinfo.collectdir, "macros");
 
-  text_tarray maindirs;
+  text_tset maindirs;
   text_t gsdlmacrodir = filename_cat (configinfo.gsdlhome, "macros");
-  maindirs.push_back (gsdlmacrodir);
+  maindirs.insert (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);
+    if (!((*colhere).second.gsdl_gsdlhome).empty()) {
+      gsdlmacrodir = filename_cat ((*colhere).second.gsdl_gsdlhome, "macros");
+      maindirs.insert (gsdlmacrodir);
+    }
     colhere ++;
   }
@@ -1037 +1075 @@
     // we'll load all copies
     if (!foundfile) {
-      text_tarray::const_iterator dirhere = maindirs.begin();
-      text_tarray::const_iterator dirend = maindirs.end();
+      text_tset::const_iterator dirhere = maindirs.begin();
+      text_tset::const_iterator dirend = maindirs.end();
       while (dirhere != dirend) {
     filename = filename_cat (*dirhere, *arrhere);
@@ -1095 +1133 @@
 
     text_t &arg_c = args["c"];
-    ColInfoResponse_t cinfo;
-    comerror_t err;
     recptproto *collectproto = protocols.getrecptproto (arg_c, logout);
-    collectproto->get_collectinfo (arg_c, cinfo, err, logout);
-
-    if (!cinfo.ccsCols.empty()) {
-      args["ccs"] = 1;
-      if (args["cc"].empty()) {
-    text_tarray::const_iterator col_here = cinfo.ccsCols.begin();
-    text_tarray::const_iterator col_end = cinfo.ccsCols.end();
-    bool first = true;
-    while (col_here != col_end) {
-      // make sure it's a valid collection
-      if (protocols.getrecptproto (*col_here, logout) != NULL) {
-        if (!first) args["cc"].push_back (',');
-        args["cc"] += *col_here;
-        first = false;
+    if (collectproto == NULL) {
+      // oops, this collection isn't valid
+      outconvertclass text_t2ascii;
+      logout << text_t2ascii << "ERROR: Invalid collection: " << arg_c << "\n";
+      args["c"].clear();
+
+    } else {
+
+      ColInfoResponse_t *cinfo = get_collectinfo_ptr (collectproto, arg_c, logout);
+
+      if (cinfo != NULL) {
+    if (!cinfo->ccsCols.empty()) {
+      args["ccs"] = 1;
+      if (args["cc"].empty()) {
+        text_tarray::const_iterator col_here = cinfo->ccsCols.begin();
+        text_tarray::const_iterator col_end = cinfo->ccsCols.end();
+        bool first = true;
+        while (col_here != col_end) {
+          // make sure it's a valid collection
+          if (protocols.getrecptproto (*col_here, logout) != NULL) {
+        if (!first) args["cc"].push_back (',');
+        args["cc"] += *col_here;
+        first = false;
+          }
+          col_here ++;
+        }
       }
-      col_here ++;
     }
+      } else {
+    logout << "ERROR (receptionist::check_mainargs): get_collectinfo_ptr returned NULL\n";
       }
     }
@@ -1226 +1275 @@
   text_t &collection = args["c"];
 
-  disp.setmacro ("gsdlhome", "Global", configinfo.gsdlhome);
+  disp.setmacro ("gsdlhome", "Global", dm_safe(configinfo.gsdlhome));
   disp.setmacro ("gwcgi", "Global", configinfo.gwcgi);
   disp.setmacro ("httpimg", "Global", configinfo.httpimg);
@@ -1299 +1348 @@
   }
 }
+
+// gets collection info from cache if found or 
+// calls collection server (and updates cache)
+// returns NULL if there's an error
+ColInfoResponse_t *receptionist::get_collectinfo_ptr (recptproto *collectproto, 
+                              const text_t &collection, 
+                              ostream &logout) {
+  
+  // check the cache
+  colinfo_tmap::iterator it = configinfo.collectinfo.find (collection);
+  if ((it != configinfo.collectinfo.end()) && ((*it).second.info_loaded)) {
+    // found it
+    return &((*it).second.info);
+  }
+
+  // not cached, get info from collection server
+  if (collectproto == NULL) {
+    logout << "ERROR: receptionist::get_collectinfo_ptr passed null collectproto\n";
+    return NULL;
+  }
+   
+  comerror_t err;
+  if (it == configinfo.collectinfo.end()) {
+    collectioninfo_t cinfo;
+    collectproto->get_collectinfo (collection, cinfo.info, err, logout);
+    if (err != noError) {
+      outconvertclass text_t2ascii;
+      logout << text_t2ascii << "ERROR (receptionist::getcollectinfo_ptr): \""
+         << get_comerror_string (err) << "\"while getting collectinfo\n";
+      return NULL;
+    }
+    cinfo.info_loaded = true;
+    configinfo.collectinfo[collection] = cinfo;
+    return &(configinfo.collectinfo[collection].info);
+  } else {
+    collectproto->get_collectinfo (collection, (*it).second.info, err, logout);
+    if (err != noError) {
+      outconvertclass text_t2ascii;
+      logout << text_t2ascii << "ERROR (receptionist::getcollectinfo_ptr): \""
+         << get_comerror_string (err) << "\"while getting collectinfo\n";
+      return NULL;
+    }
+    (*it).second.info_loaded = true;
+    return &((*it).second.info);
+  }
+}