Changeset 8486

Timestamp:

2004-11-08T17:01:28+13:00 (19 years ago)

Author:

jrm21

Message:

use the new displayclass::setcollectionmacro() for any macros that the
collection passed to us (from the collect.cfg file), instead of
setdefaultmacro().

File:

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

trunk/gsdl/src/recpt/receptionist.cpp

@@ -1341 +1341 @@
     // that.  --kjdon
     //if (args[(*params_here).first] != (*params_here).second) {
-      if (!first) pageparams += ",";
-      first = false;
+      if (first)
+    first = false;
+      else
+    pageparams += ",";
+
       pageparams += (*params_here).first;
       pageparams += "=";
@@ -1408 +1411 @@
     macros_map::const_iterator done_macro=cinfo.collection_macros.end();
     while (this_macro != done_macro) {
-      /* this should be a collectionmacro instead of a defaultmacro
-         I think, but setcollectionmacro is protected... */
-      disp.setdefaultmacro("Global",this_macro->first, // macro name
-                   this_macro->second.first,   // params
-                   //g_EmptyText,             // filename...
-                   this_macro->second.second); // value
+
+      disp.setcollectionmacro("Global",           // package
+                  this_macro->first,          // macro name
+                  this_macro->second.first,   // params
+                  this_macro->second.second); // value
       ++this_macro;
     }