Changeset 1342 for branches/z3950-branch/gsdl/src/recpt/receptionist.cpp

Timestamp:

2000-08-03T14:49:41+12:00 (24 years ago)

Author:

johnmcp

Message:

Relatively stable z39.50 implementation now, merged with the mgpp source.
(Still needs a decent interface and query language though...)

File:

• branches/z3950-branch/gsdl/src/recpt/receptionist.cpp (modified) (10 diffs)

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

@@ -22 +22 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id$
- *
  *********************************************************************/
-
-/*
-   $Log$
-   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
-
-   Revision 1.46  2000/02/17 02:34:09  sjboddie
-   made compressedoptions macro dm_safe - added SCRIPT_NAME to log string
-
-   Revision 1.45  2000/02/03 01:48:52  sjboddie
-   fixed potential bug in ccscols stuff
-
-   Revision 1.44  2000/01/24 22:53:09  sjboddie
-   a few small changes to get fastcgi working properly here at Waikato -
-   hopefully changes will work everywhere ...
-
-   Revision 1.43  1999/12/06 01:14:16  sjboddie
-   added arabic encoding
-
-   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
-
-   Revision 1.40  1999/11/08 20:26:37  sjboddie
-   added multiplevalue option to cgiarginfo
-
-   Revision 1.39  1999/11/03 22:49:10  sjboddie
-   A location url may now contain macros
-
-   Revision 1.38  1999/11/01 21:49:34  sjboddie
-   changes to arguments of many functions
-
-   Revision 1.37  1999/10/20 03:55:03  sjboddie
-   yet another problem with calling browserclass
-   processOID functions correctly
-
-   Revision 1.36  1999/10/19 03:23:44  davidb
-   Collection building support through web pages
-   and internal and external link handling for collection documents
-
-   Revision 1.35  1999/10/18 20:07:05  sjboddie
-   tidied up a few things - moved processing of "hp" argument
-   to htmlbrowserclass
-
-   Revision 1.34  1999/10/14 23:00:52  sjboddie
-   finished changes to browsing support
-
-   Revision 1.33  1999/10/10 08:14:10  sjboddie
-   - metadata now returns mp rather than array
-   - redesigned browsing support (although it's not finished so
-   won't currently work ;-)
-
-   Revision 1.32  1999/09/21 11:28:45  sjboddie
-   tidied up file locking
-
-   Revision 1.31  1999/09/16 21:38:17  sjboddie
-   added some file locking stuff for logging. Windows still needs to
-   be done.
-
-   Revision 1.30  1999/09/07 04:56:58  sjboddie
-   added GPL notice
-
-   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
-   turn them on put
-
-   usecookies true
-   logcgiargs true
-
-   in your configuration file.
-
-   Revision 1.27  1999/09/02 00:27:21  rjmcnab
-   A few small things.
-
-   Revision 1.26  1999/08/25 04:43:06  sjboddie
-   made FilterRequest_t::docSet an array rather than a set
-
-   Revision 1.25  1999/08/20 00:59:01  sjboddie
-   -fixed up location redirection
-   -added some usage logging, also now set a GSDL_UID cookie. Logging
-   does NOT presently lock the log file while it's in use. That has yet
-   to be done.
-
-   Revision 1.24  1999/08/13 04:16:42  sjboddie
-   added some collection-level metadata stuff
-
-   Revision 1.23  1999/08/11 23:28:59  sjboddie
-   added support for html classifier (i.e. the hp argumant now must be
-   translated too).
-
-   Revision 1.22  1999/08/10 22:45:21  sjboddie
-   format option ShowTopPages is now called DocumentTopPages
-
-   Revision 1.21  1999/08/09 04:25:17  sjboddie
-   moved OID translation stuff from documentaction::define_external_macros
-   to receptionist
-
-   Revision 1.20  1999/07/30 02:13:09  sjboddie
-   -added collectinfo argument to some functions
-   -made some function prototypes virtual
-
-   Revision 1.19  1999/07/15 06:02:05  rjmcnab
-   Moved the setting of argsinfo into the constructor. Added the configuration
-   command argdefault (as used by the actions). Added code to output the
-   correct charset based on the page encoding so that the user does not need
-   to specify the encoding used for a particular page.
-
-   Revision 1.18  1999/07/11 01:05:20  rjmcnab
-   Stored origin of cgiarg with argument.
-
-   Revision 1.17  1999/07/10 22:18:26  rjmcnab
-   Added calls to define_external_cgiargs.
-
-   Revision 1.16  1999/06/27 21:49:03  sjboddie
-   fixed a couple of version conflicts - tidied up some small things
-
-   Revision 1.15  1999/06/26 01:14:32  rjmcnab
-   Made a couple of changes to handle different encodings.
-
-   Revision 1.14  1999/06/09 00:08:36  sjboddie
-   query string macro (_cgiargq_) is now made html safe before being set
-
-   Revision 1.13  1999/06/08 04:29:31  sjboddie
-   added argsinfo to the call to check_cgiargs to make it easy to set
-   args to their default if they're found to be screwed up
-
-   Revision 1.12  1999/04/30 01:59:42  sjboddie
-   lots of stuff - getting documentaction working (documentaction replaces
-   old browseaction)
-
-   Revision 1.11  1999/03/25 03:06:43  sjboddie
-
-   altered receptionist slightly so it now passes *collectproto to
-   define_internal_macros and define_external_macros - need it
-   for browseaction
-
-   Revision 1.10  1999/03/05 03:53:54  sjboddie
-
-   fixed some bugs
-
-   Revision 1.9  1999/02/28 20:00:16  rjmcnab
-
-
-   Fixed a few things.
-
-   Revision 1.8  1999/02/25 21:58:59  rjmcnab
-
-   Merged sources.
-
-   Revision 1.7  1999/02/21 22:33:55  rjmcnab
-
-   Lots of stuff :-)
-
-   Revision 1.6  1999/02/11 01:24:05  rjmcnab
-
-   Fixed a few compiler warnings.
-
-   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
-
-   Continued working on receptionist
-
-   Revision 1.3  1999/02/04 10:00:56  rjmcnab
-
-   Developed the idea of an "action" and having them define the cgi arguments
-   which they need and how those cgi arguments function.
-
-   Revision 1.2  1999/02/04 01:17:27  rjmcnab
-
-   Got it outputing something.
-
-
- */
-
 
 #include "receptionist.h"
@@ -239 +33 @@
 #include <time.h>
 #include <stdio.h>
+#if defined (GSDL_USE_IOS_H)
 #include <fstream.h>
+#else 
+#include <fstream>
+#endif
 
 #if defined (__WIN32_)
@@ -252 +50 @@
   collectdir.clear();
   httpprefix.clear();
-  httpimg.clear();
+  httpimg = "/images";
   gwcgi.clear();
   macrofiles.erase(macrofiles.begin(), macrofiles.end());
@@ -272 +70 @@
 }
 
-
+void collectioninfo_t::clear () {
+  gsdl_gsdlhome.clear();
+  gsdl_gdbmhome.clear();
+
+  info_loaded = false;
+  info.clear();
+}
 
 receptionist::receptionist () {
@@ -789 +593 @@
   utf8outconvertclass text_t2utf8;
   char *lfile = filename.getcstr();
+
   ofstream log (lfile, ios::app);
   
@@ -912 +717 @@
 bool receptionist::produce_content (cgiargsclass &args, ostream &contentout,
                     ostream &logout) {
-  
+
   // decide on the output conversion class
   text_t &arg_w = args["w"];
@@ -1019 +824 @@
   colinfo_tmap::iterator colend = configinfo.collectinfo.end();
   while (colhere != colend) {
-    gsdlmacrodir = filename_cat ((*colhere).second.gsdl_gsdlhome, "macros");
-    maindirs.insert (gsdlmacrodir);
+    if (!((*colhere).second.gsdl_gsdlhome).empty()) {
+      gsdlmacrodir = filename_cat ((*colhere).second.gsdl_gsdlhome, "macros");
+      maindirs.insert (gsdlmacrodir);
+    }
     colhere ++;
   }
@@ -1103 +910 @@
 
     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";
       }
     }
@@ -1245 +1063 @@
   decode_cgi_arg (compressedoptions);
   disp.setmacro ("decodedcompressedoptions", "Global", dm_safe(compressedoptions));
+
+#if defined (__WIN32__)
+  disp.setmacro ("win32", "Global", "1");
+#endif
 
   // set macron macros if encoding is utf8
@@ -1307 +1129 @@
   }
 }
+
+// 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);
+  }
+}