Changeset 299

Timestamp:

1999-06-28T10:04:47+12:00 (25 years ago)

Author:

sjboddie

Message:

now read in build.cfg before collect.cfg so that the indexmaps
are available if required to decode defaultindex, defaultsubcollection,
and defaultlanguage

File:

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

trunk/gsdl/src/recpt/nullproto.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.8  1999/06/27 22:04:47  sjboddie
+   now read in build.cfg before collect.cfg so that the indexmaps
+   are available if required to decode defaultindex, defaultsubcollection,
+   and defaultlanguage
+
    Revision 1.7  1999/06/15 02:16:45  sjboddie
    small change to prevent collectdir configuration string from being passed
@@ -77 +82 @@
 
       // configure this collection server
+
+      // note that we read build.cfg before collect.cfg so that the indexmaps
+      // are available to decode defaultindex, defaultsubcollection, and
+      // defaultlanguage
+      if (!build_cfg_read (*((*here).second.c), configinfo.gsdlhome,
+               configinfo.collection)) {
+    outconvertclass text_t2ascii;
+    logout << text_t2ascii 
+           << "Error: couldn't read build.cfg file for collection \""
+           << configinfo.collection << "\", gsdlhome=\""
+           << configinfo.gsdlhome << "\"\n";
+    return false;
+      }
+
       if (!collect_cfg_read (*((*here).second.c), configinfo.gsdlhome,
                  configinfo.collection)) {
@@ -83 +102 @@
            << "Error: couldn't read collect.cfg file for collection \""
            << configinfo.collection << "\", gsdlhome=\"" 
-           << configinfo.gsdlhome << "\"\n";
-    return false;
-      }
-
-      if (!build_cfg_read (*((*here).second.c), configinfo.gsdlhome,
-               configinfo.collection)) {
-    outconvertclass text_t2ascii;
-    logout << text_t2ascii 
-           << "Error: couldn't read build.cfg file for collection \""
-           << configinfo.collection << "\", gsdlhome=\""
            << configinfo.gsdlhome << "\"\n";
     return false;