Changeset 532 for trunk/gsdl/src

Timestamp:

1999-09-07T12:09:31+12:00 (25 years ago)

Author:

sjboddie

Message:

now reads in both main.cfg and collect.cfg always

File:

• trunk/gsdl/src/recpt/recptconfig.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/recptconfig.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.4  1999/09/07 00:09:31  sjboddie
+   now reads in both main.cfg and collect.cfg always
+
    Revision 1.3  1999/02/21 22:33:57  rjmcnab
 
@@ -95 +98 @@
 
 
-// main_cfg_read reads either collect.cfg or main.cfg and returning 
-// true on success. It attempts to read collect.cfg first if a
-// collection is specified and then it tries to read in main.cfg
+// main_cfg_read reads both main.cfg and collect.cfg. It attempts
+// to read main.cfg first so values in collect.cfg override those
+// set earlier by main.cfg
 bool main_cfg_read (receptionist &recpt, const text_t &gsdlhome,
              const text_t &collection) {
-  // Look for site.cfg in GSDLHOME/collect/collection-name/etc directory 
+
+  // read in the main configuration file
+  bool rv = false;
+  text_t key, filename;
+  text_tarray cfgline;
+  filename = filename_cat (gsdlhome, "etc");
+  filename = filename_cat (filename, "main.cfg");
+  if (file_exists (filename)) {
+    char *cstr = filename.getcstr();
+    ifstream confin (cstr);
+    delete cstr;
+  
+    if (confin) {
+      while (read_cfg_line(confin, cfgline) >= 0) {
+    if (cfgline.size () >= 2) {
+      key = cfgline[0];
+      cfgline.erase(cfgline.begin());
+    
+      // configure the receptionist
+      recpt.configure (key, cfgline);
+    }
+      }
+      confin.close ();
+      rv = true;
+    }
+  }
+  
+  // Look for collect.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");
@@ -113 +142 @@
       if (!file_exists (filename)) filename.clear();
     }
-  }
-  if (filename.empty()) {
-    filename = filename_cat (gsdlhome, "etc");
-    filename = filename_cat (filename, "main.cfg");
-    if (!file_exists (filename)) return false;
-  }
 
-  // read in the main configuration file
-  text_t key;
-  text_tarray cfgline;
-  char *cstr = filename.getcstr();
-  ifstream confin (cstr);
-  delete cstr;
-
-  if (confin) {
-    while (read_cfg_line(confin, cfgline) >= 0) {
-      if (cfgline.size () >= 2) {
-    key = cfgline[0];
-    cfgline.erase(cfgline.begin());
-
-    // configure the receptionist
-    recpt.configure (key, cfgline);
+    if (!filename.empty()) {
+      char *cstr = filename.getcstr();
+      ifstream confin (cstr);
+      delete cstr;
+      
+      if (confin) {
+    while (read_cfg_line(confin, cfgline) >= 0) {
+      if (cfgline.size () >= 2) {
+        key = cfgline[0];
+        cfgline.erase(cfgline.begin());
+        
+        // configure the receptionist
+        recpt.configure (key, cfgline);
+      }
+    }
+    confin.close ();
+    rv = true;
       }
     }
-    confin.close ();
-    return true;
   }
-  return false;
+  return rv;
 }