Changeset 8454

Timestamp:

2004-11-04T17:22:29+13:00 (19 years ago)

Author:

jrm21

Message:

read any collection-specific macros from the ColInfoResponse struct, and
call setmacro() on them. This adds them to the 'Global' package, overriding
any set by loading the macro files.

File:

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

trunk/gsdl/src/recpt/receptionist.cpp

@@ -1381 +1381 @@
   disp.setmacro ("httpprefix", displayclass::defaultpackage, configinfo.httpprefix);
 
+  // get relevant info from the collection
   if (!collection.empty()) {
     ColInfoResponse_t cinfo;
@@ -1389 +1390 @@
       text_t httpcollection;
       if (!cinfo.httpdomain.empty()) httpcollection = "http://";
-      httpcollection += cinfo.httpdomain + cinfo.httpprefix + "/collect/" + collection; 
-      disp.setmacro ("httpcollection", displayclass::defaultpackage, httpcollection); 
-    }
+      httpcollection += cinfo.httpdomain + cinfo.httpprefix + "/collect/"
+    + collection; 
+      disp.setmacro ("httpcollection", displayclass::defaultpackage,
+             httpcollection); 
+      // 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();
+    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
+      ++this_macro;
+    }
+      } // col macros
+    } // collectproto != NULL
   }