Changeset 19788

Timestamp:

2009-06-10T13:11:20+12:00 (15 years ago)

Author:

kjdon

Message:

moved the text for existence of build.cfg out of w32server/cgiwrapper and into colserver/collectset. This was preventing collect groups from being loaded up as they are not built. Now, unbuilt collections will not be loaded up for linux either

Location:

gsdl/trunk/runtime-src/src

Files:

• colservr/collectset.cpp (modified) (1 diff)
• w32server/cgiwrapper.cpp (modified) (2 diffs)

gsdl/trunk/runtime-src/src/colservr/collectset.cpp

@@ -241 +241 @@
 
   text_t build_cfg = filename_cat(collecthome, collection, "index", "build.cfg");
+  if (!file_exists (build_cfg)) {
+    // don't add in unbuilt collections
+    return;
+  }
   char *build_cfgc = build_cfg.getcstr();
   ifstream confin(build_cfgc);

gsdl/trunk/runtime-src/src/w32server/cgiwrapper.cpp

@@ -466 +466 @@
       while (colhere != colend) {
     
-    text_t build_cfg = filename_cat (gsdl_dbhome,"collect",
-                     *colhere, "index", "build.cfg");
-    if (file_exists (build_cfg)) {
+    //text_t build_cfg = filename_cat (gsdl_dbhome,"collect",
+    //           *colhere, "index", "build.cfg");
+      //if (file_exists (build_cfg)) {
       collections.insert (*colhere);
       
@@ -476 +476 @@
       tmp.gsdl_dbhome = gsdl_dbhome;
       translated_collectinfo[*colhere] = tmp;
-    }
+      //}
     ++colhere;
       }