Changeset 10931

Timestamp:

2005-11-24T12:04:49+13:00 (18 years ago)

Author:

jrm21

Message:

instead of making all 'collectionmacros' read from the collect.cfg file
in the Global package, support Packagename:macroname arguments.

File:

• trunk/gsdl/src/recpt/receptionist.cpp (modified) (1 diff)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -1522 +1522 @@
     macros_map::const_iterator done_macro=cinfo.collection_macros.end();
     while (this_macro != done_macro) {
-
-      disp.setcollectionmacro("Global",           // package
-                  this_macro->first,          // macro name
+      text_t package = "Global";
+      text_t macroname = this_macro->first;
+      // if this macro name is AAA:bbb then extract the package name
+      text_t::const_iterator thischar, donechar;
+      thischar = macroname.begin();
+      donechar = macroname.end();
+      while (thischar < donechar) {
+        if (*thischar == ':') {
+          package = substr(macroname.begin(),thischar);
+          macroname = substr(thischar+1,donechar);
+          break;
+        }
+        ++thischar;
+      }
+
+      disp.setcollectionmacro(package,
+                  macroname,
                   this_macro->second.first,   // params
                   this_macro->second.second); // value