Changeset 963 for trunk/gsdl/src/recpt/librarymain.cpp

Timestamp:

2000-02-22T11:01:02+13:00 (24 years ago)

Author:

sjboddie

Message:

gsdlhome now comes from gsdlsite.cfg

File:

• trunk/gsdl/src/recpt/librarymain.cpp (modified) (6 diffs)

trunk/gsdl/src/recpt/librarymain.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.23  2000/02/21 21:59:37  sjboddie
+   gsdlhome now comes from gsdlsite.cfg
+
    Revision 1.22  2000/02/17 02:35:48  sjboddie
    tidied up a bit
@@ -138 +141 @@
 #include "htmlbrowserclass.h"
 
-#include "gsdlhome.h"
+#include "recptconfig.h"
 
 int main () {
   receptionist recpt;
   nullproto nproto;
-
   text_tarray collections;
-  if (!read_dir (GSDL_GSDLHOME "/collect", collections)) exit (1);
+
+  // get gsdlhome (if we fail the error will be picked up later -- in
+  // cgiwrapper)
+  text_t gsdlhome;
+  if (site_cfg_read (gsdlhome)) {
+    text_t collectdir = filename_cat (gsdlhome, "collect");
+    if (!read_dir (collectdir, collections)) exit (1);
+  }
 
   text_tarray::const_iterator thiscol = collections.begin();
   text_tarray::const_iterator endcol = collections.end();
-
+  
   while (thiscol != endcol) {
-
+    
     // ignore the modelcol
-    if (*thiscol == "modelcol") {
-      thiscol ++;
-      continue;
-    }
-
+    if (*thiscol == "modelcol") {thiscol ++; continue;}
+    
     // this memory is created but never destroyed
     // we're also not doing any error checking to make sure we didn't
@@ -168 +174 @@
     filterclass *filter = new filterclass ();
     cserver->add_filter (filter);
-    
+      
     // add a browse filter
     browsefilterclass *browsefilter = new browsefilterclass();
@@ -179 +185 @@
     queryfilter->set_mgsearchptr (mgsearch);
     cserver->add_filter (queryfilter);
-
+    
     // add a mg and gdbm source
     mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass ();
@@ -196 +202 @@
   // add the protocol to the receptionist
   recpt.add_protocol (&nproto);
-
+  
   // add other converters
   utf8inconvertclass utf8inconvert;
@@ -202 +208 @@
   recpt.add_converter ("u", &utf8inconvert, &utf8outconvert);
 
-  mapinconvertclass gbinconvert;
-  gbinconvert.setmapfile (GSDL_GSDLHOME, "gbku", 0x25a1);
-  mapoutconvertclass gboutconvert;
-  gboutconvert.setmapfile (GSDL_GSDLHOME, "ugbk", 0xa1f5);
-  recpt.add_converter ("g", &gbinconvert, &gboutconvert);
+  if (!gsdlhome.empty()) {
+    mapinconvertclass gbinconvert;
+    gbinconvert.setmapfile (gsdlhome, "gbku", 0x25a1);
+    mapoutconvertclass gboutconvert;
+    gboutconvert.setmapfile (gsdlhome, "ugbk", 0xa1f5);
+    recpt.add_converter ("g", &gbinconvert, &gboutconvert);
+  }
 
   // the list of actions. Note: these actions will become invalid