Changeset 19728

Timestamp:

2009-06-03T13:40:12+12:00 (15 years ago)

Author:

ak19

Message:

Dr Bainbridge fixed a terrible bug that caused the server.exe to crash because the mgsearch object was being instantiated even when there were no mgcollections. The reason it was being instantiated was because collections were being added in in two different manners in cgiwrapper.cpp and in the second way, it did not test whether some of those collections were unbuilt (in which case the collection should not be added in). This meant that the code in collectset where the buildtype, which would default to mg when there was no buildtype specified for given collections, would remain at mg (since the collection is unbuilt and hence has no index/build.cfg file to specify a contrary buildtype). This then instantiated an mgsearch object where the members would not have valid values.

File:

• gsdl/trunk/runtime-src/src/w32server/cgiwrapper.cpp (modified) (1 diff)

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

@@ -465 +465 @@
       colend = these_collections.end();
       while (colhere != colend) {
-    collections.insert (*colhere);
-    collectioninfo_t tmp;
-    tmp.gsdl_gsdlhome = gsdl_gsdlhome;
-    tmp.gsdl_collecthome = gsdl_collecthome;
-    tmp.gsdl_dbhome = gsdl_dbhome;
-    translated_collectinfo[*colhere] = tmp;
+    
+    text_t build_cfg = filename_cat (gsdl_dbhome,"collect",
+                     *colhere, "index", "build.cfg");
+    if (file_exists (build_cfg)) {
+      collections.insert (*colhere);
+      
+      collectioninfo_t tmp;
+      tmp.gsdl_gsdlhome = gsdl_gsdlhome;
+      tmp.gsdl_collecthome = gsdl_collecthome;
+      tmp.gsdl_dbhome = gsdl_dbhome;
+      translated_collectinfo[*colhere] = tmp;
+    }
     ++colhere;
       }