Changeset 8453

Timestamp:

2004-11-04T17:21:06+13:00 (19 years ago)

Author:

jrm21

Message:

accept the 'collectionmacro' keyword for configure() from collect.cfg
and store any/all macros into the ColInfoResponse_t struct.

File:

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

trunk/gsdl/src/colservr/collectserver.cpp

@@ -85 +85 @@
     else if (key == "numwords") collectinfo.numWords = value.getint();
     else if (key == "numbytes") collectinfo.numBytes = value.getint();
-    else if (key == "collectionmeta" && cfgline.size() == 2)
-      collectinfo.collectionmeta[cfgline[0]] = cfgline[1];
-    else if (key == "collectionmeta" && cfgline.size() == 3 && collectinfo.collectionmeta[cfgline[0]].empty() )
-      collectinfo.collectionmeta[cfgline[0]] = cfgline[2];
-    else if (key == "format" && cfgline.size() == 2)
+    else if (key == "collectionmeta") {
+      if (cfgline.size() == 2)
+    collectinfo.collectionmeta[cfgline[0]] = cfgline[1];
+      else if (cfgline.size() == 3 &&
+           collectinfo.collectionmeta[cfgline[0]].empty() )
+    collectinfo.collectionmeta[cfgline[0]] = cfgline[2];
+    } else if (key == "collectionmacro") {
+      if (cfgline.size() == 2) // no params for this macro
+    collectinfo.collection_macros
+      .insert( make_pair(cfgline[0], make_pair(g_EmptyText,cfgline[1])) );
+      else if (cfgline.size() == 3) {// has params
+    // strip [ ] brackets from params
+    text_t::const_iterator first=cfgline[1].begin()+1;
+    text_t::const_iterator last=cfgline[1].end()-1;
+    text_t nobrackets=substr(first, last);
+    collectinfo.collection_macros
+      .insert( make_pair(cfgline[0], make_pair(nobrackets,cfgline[2])) );
+      }
+    } else if (key == "format" && cfgline.size() == 2)
       collectinfo.format[cfgline[0]] = cfgline[1];
     else if (key == "building" && cfgline.size() == 2)