Changeset 11984

Timestamp:

2006-06-30T16:00:11+12:00 (18 years ago)

Author:

kjdon

Message:

searchtypes is now a format statement

File:

• trunk/gsdl/src/colservr/collectserver.cpp (modified) (2 diffs)

trunk/gsdl/src/colservr/collectserver.cpp

@@ -177 +177 @@
     else if (key == "receptionist") collectinfo.receptionist = value;
     else if (key == "buildtype") collectinfo.buildType = value;
+    // backwards compatibility - searchytpes is now a format statement
     else if (key == "searchtype") { // means buildtype is mgpp
       if (collectinfo.buildType.empty()) {
     collectinfo.buildType = "mgpp";
       }
-      collectinfo.searchTypes = cfgline;
+      joinchar(cfgline, ',', collectinfo.format["SearchTypes"]);
+      //collectinfo.searchTypes = cfgline;
     }
     else if (key == "separate_cjk") {
@@ -191 +193 @@
 
     // What have we set for our group list
-    else if (key == "auth_group")
-       {
-      // use the joinchar helper function from
-      // text_t.h, it takes in the whole cfgline
-      // array and a separator aka a comma in our
-      // case and returns a sting separated by a
-      // comma like this:
-      //
-      //   Rene,Kolla,Crystal,Stefan,Aly,Ian
-      
-      joinchar(cfgline,',',collectinfo.auth_group);
-      
-      //outconvertclass t;
-      //cerr << t << collectinfo.auth_group << "\n";
-       }
+    else if (key == "auth_group") joinchar(cfgline,',',collectinfo.auth_group);
 
     // store all the mappings for use when collection meta is read later