Changeset 19259 for gsdl/trunk/runtime-src/src/recpt/receptionist.cpp

Timestamp:

2009-04-25T18:45:58+12:00 (15 years ago)

Author:

davidb

Message:

Revap of Greenstone as a module for Apache. Initial version coded by DL Consulting

File:

• gsdl/trunk/runtime-src/src/recpt/receptionist.cpp (modified) (4 diffs)

gsdl/trunk/runtime-src/src/recpt/receptionist.cpp

@@ -1448 +1448 @@
 }
 
+
 void receptionist::define_general_macros (cgiargsclass &args, outconvertclass &/*outconvert*/, 
                       ostream &logout) {
@@ -1457 +1458 @@
   disp.setmacro ("httpweb", displayclass::defaultpackage, configinfo.httpweb);
   disp.setmacro ("httpprefix", displayclass::defaultpackage, configinfo.httpprefix);
-
 
   text_t compressedoptions = get_compressed_arg(args, logout);
@@ -1559 +1559 @@
     }
   }
-
+  
   if (!collection.empty()) {
     ColInfoResponse_t cinfo;
@@ -1566 +1566 @@
     if (collectproto != NULL) {
       collectproto->get_collectinfo (collection, cinfo, err, logout);
+
+
+      // This part of the code used to use "cinfo.httpprefix" regardless
+      // of the value it contained.  Since
+      // this can come back with an empty (in the case of gsdl_mod), the
+      // URL produced was invalid.
+      //
+      // Changed to test for empty first, and use configinfo.httpprefix as
+      // a "backup"
+      // 
+      // Point to consider: since configinfo.httpprefix has been offically 
+      // set as "httpprefix" in macros, it seems to make more sense to use
+      // always use that version and not the cinfo version at all.
+
+      text_t httpprefix 
+    = (!cinfo.httpprefix.empty()) ? cinfo.httpprefix : configinfo.httpprefix;
+    
       text_t httpcollection;
       if (!cinfo.httpdomain.empty()) httpcollection = "http://";
-      httpcollection += cinfo.httpdomain + cinfo.httpprefix + "/collect/"
+      httpcollection += cinfo.httpdomain + httpprefix + "/collect/"
     + collection; 
       disp.setmacro ("httpcollection", displayclass::defaultpackage,
              httpcollection); 
+      
       // as of gsdl 2.53, collect.cfg can specify macros
       if (cinfo.collection_macros.size() > 0) {