Changeset 963 for trunk/gsdl/src/recpt/recptconfig.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/recptconfig.cpp (modified) (4 diffs)

trunk/gsdl/src/recpt/recptconfig.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.6  2000/02/21 21:55:33  sjboddie
+   gsdlhome now comes from gsdlsite.cfg
+
    Revision 1.5  1999/09/07 04:56:59  sjboddie
    added GPL notice
@@ -67 +70 @@
 
 // reads site configuration file returning true on success
-bool site_cfg_read (receptionist &recpt, const text_t &gsdlhome,
-             const text_t &collection, int &maxrequests) {
+// also sets gsdlhome and maxrequests 
+// gsdlsite.cfg should be in same directory as library executable
+bool site_cfg_read (receptionist &recpt, text_t &gsdlhome, int &maxrequests) {
 
-  maxrequests = 10000; // a reasonable default
+  gsdlhome.clear();
 
-  // Look for site.cfg in GSDLHOME/collect/collection-name/etc directory 
-  // (if this is for a particular collection), and then GSDLHOME/etc.
-  text_t filename;
-  if (!collection.empty()) {
-    filename = filename_cat (gsdlhome, "collect");
-    filename = filename_cat (filename, collection);
-    filename = filename_cat (filename, "etc");
-    filename = filename_cat (filename, "site.cfg");
-    if (!file_exists (filename)) filename.clear();
-  }
-  if (filename.empty()) {
-    filename = filename_cat (gsdlhome, "etc");
-    filename = filename_cat (filename, "site.cfg");
-    if (!file_exists (filename)) return false;
-  }
-
-  // read in the site configuration file
+  // Look for gsdlsite.cfg in same directory that executable is in.
   text_tarray cfgline;
   text_t key;
-  char *cstr = filename.getcstr();
-  ifstream confin (cstr);
-  delete cstr;
+  ifstream confin ("gsdlsite.cfg");
 
   if (confin) {
@@ -100 +86 @@
     key = cfgline[0];
     cfgline.erase(cfgline.begin());
-
+    
     if (key == "maxrequests") {
       maxrequests = cfgline[0].getint();
       if (maxrequests < 1) maxrequests = 1;
     }
+
+    if (key == "gsdlhome")
+      gsdlhome = cfgline[0];
 
     // configure the receptionist
@@ -116 +105 @@
 }
 
+// this version just grabs gsdlhome, returns false if it can't find it
+bool site_cfg_read (text_t &gsdlhome) {
+
+  gsdlhome.clear();
+
+  // Look for gsdlsite.cfg in same directory that executable is in.
+  text_tarray cfgline;
+  text_t key;
+  ifstream confin ("gsdlsite.cfg");
+
+  if (confin) {
+    while (read_cfg_line(confin, cfgline) >= 0) {
+      if (cfgline.size () >= 2) {
+    if (cfgline[0] == "gsdlhome") {
+      gsdlhome = cfgline[1];
+      return true;
+    }
+      }
+    }
+    confin.close ();
+  }
+  return false;
+}
 
 // main_cfg_read reads both main.cfg and collect.cfg. It attempts