Changeset 11964 for trunk/gsdl/src/recpt/receptionist.cpp

Timestamp:

2006-06-22T14:37:57+12:00 (18 years ago)

Author:

kjdon

Message:

changed the collection_macros data type to be collectionmeta_map, so get macro_name -> params -> value. This way we can set the value with no params to be the first value we come across, and if we find a genuine no-params value later on, it will overwrite it. collection macros and collection meta no loonger written to the gdbm database

File:

• trunk/gsdl/src/recpt/receptionist.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -1519 +1519 @@
       // as of gsdl 2.53, collect.cfg can specify macros
       if (cinfo.collection_macros.size() > 0) {
-    macros_map::const_iterator this_macro=cinfo.collection_macros.begin();
-    macros_map::const_iterator done_macro=cinfo.collection_macros.end();
+    collectionmeta_map::const_iterator this_macro=cinfo.collection_macros.begin();
+    collectionmeta_map::const_iterator done_macro=cinfo.collection_macros.end();
     while (this_macro != done_macro) {
       text_t package = "Global";
@@ -1537 +1537 @@
       }
 
-      disp.setcollectionmacro(package,
-                  macroname,
-                  this_macro->second.first,   // params
-                  this_macro->second.second); // value
+      text_tmap params_map = this_macro->second;
+      text_tmap::const_iterator this_param = params_map.begin();
+      text_tmap::const_iterator done_param = params_map.end();
+      while (this_param != done_param) {
+        disp.setcollectionmacro(package,
+                    macroname,
+                    this_param->first,
+                    this_param->second);
+        ++this_param;
+      }
+      
       ++this_macro;
     }