Changeset 14376 for gsdl/trunk/src/colservr/colservrconfig.cpp

Timestamp:

2007-08-20T15:14:53+12:00 (17 years ago)

Author:

mdewsnip

Message:

Changed to read custom collect.cfg file from "custom" collection sub-directory, to match changes to building code.

File:

• gsdl/trunk/src/colservr/colservrconfig.cpp (modified) (1 diff)

gsdl/trunk/src/colservr/colservrconfig.cpp

@@ -68 +68 @@
   text_t filename = filename_cat (gsdlhome, "collect");
   filename = filename_cat (filename, collection);
+  filename = filename_cat (filename, "custom");
+  filename = filename_cat (filename, collection);
   filename = filename_cat (filename, "etc");
-  filename = filename_cat (filename, "collect.cfg");
+  filename = filename_cat (filename, "custom.cfg");
+
   if (!file_exists (filename)) {
-    filename = filename_cat (gsdlhome, "etc");
+    filename = filename_cat (gsdlhome, "collect");
+    filename = filename_cat (filename, collection);
+    filename = filename_cat (filename, "etc");
     filename = filename_cat (filename, "collect.cfg");
-    if (!file_exists (filename)) return false;
+
+    if (!file_exists (filename)) {
+      filename = filename_cat (gsdlhome, "etc");
+      filename = filename_cat (filename, "collect.cfg");
+      if (!file_exists (filename)) return false;
+    }
   }