Changeset 1308

Timestamp:

2000-07-26T16:59:46+12:00 (24 years ago)

Author:

sjboddie

Message:

fixed a minor bug that was causing problems for end-user collection
building

Location:

trunk/gsdl/src/recpt

Files:

• cgiwrapper.cpp (modified) (1 diff)
• nullproto.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/cgiwrapper.cpp

@@ -637 +637 @@
       ofstream errout (eout, ios::app);
       delete eout;
+      // note that the following line appears to cause a runtime 
+      // error using debug versions of VC++ 6.0 (on windows)
       cerr = errout;
     

trunk/gsdl/src/recpt/nullproto.cpp

@@ -65 +65 @@
     if ((*here).second.c != NULL) {
       const colservrconf &configinfo = (*here).second.c->get_configinfo ();
+      bool failed = false;
 
       // configure this collection server
@@ -78 +79 @@
            << configinfo.collection << "\", gsdlhome=\""
            << configinfo.gsdlhome << "\"\n";
-    //  return false; //****
-    here ++;
-    continue;
+    failed = true; 
       }
 
@@ -90 +89 @@
            << configinfo.collection << "\", gsdlhome=\"" 
            << configinfo.gsdlhome << "\"\n";
-    //  return false; //****
-    here ++;
-    continue;
+    failed = true;
       }
 
-      if (!(*here).second.c->init (logout)) return false;
+      // don't bother initializing if one of the config files
+      // wasn't read correctly
+      if (!failed) {
+    if (!(*here).second.c->init (logout)) return false;
+      }
     }
     here++;