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

Timestamp:

2005-05-23T16:36:40+12:00 (19 years ago)

Author:

kjdon

Message:

getting collectionmeta from teh colinforesponse now, not using a get_info via the protocol. this means that collmeta will be read from the config file not from the database - it will not require rebuilding for changes to take effect.

File:

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

trunk/gsdl/src/recpt/receptionist.cpp

@@ -1396 +1396 @@
   disp.setmacro ("httpprefix", displayclass::defaultpackage, configinfo.httpprefix);
 
-  // get relevant info from the collection
-  if (!collection.empty()) {
-    ColInfoResponse_t cinfo;
-    comerror_t err;
-    recptproto *collectproto = protocols.getrecptproto (collection, logout);
-    if (collectproto != NULL) {
-      collectproto->get_collectinfo (collection, cinfo, err, logout);
-      text_t httpcollection;
-      if (!cinfo.httpdomain.empty()) httpcollection = "http://";
-      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) {
-
-      disp.setcollectionmacro("Global",           // package
-                  this_macro->first,          // macro name
-                  this_macro->second.first,   // params
-                  this_macro->second.second); // value
-      ++this_macro;
-    }
-      } // col macros
-    } // collectproto != NULL
-  }
 
   text_t compressedoptions = get_compressed_arg(args, logout);
@@ -1498 +1470 @@
         if (!lang.empty()) {
           if (args["l"]==lang) {
-        disp.setmacro (name, displayclass::defaultpackage, (*here).second.values[0]);
+        disp.setcollectionmacro(displayclass::defaultpackage, name, "", (*here).second.values[0]);
           }
         }
         else { // the default one
-          disp.setmacro ((*here).first, displayclass::defaultpackage, (*here).second.values[0]);
+          disp.setcollectionmacro(displayclass::defaultpackage, (*here).first,  "", (*here).second.values[0]);
         }
       }
@@ -1525 +1497 @@
     }
   }
+
+  if (!collection.empty()) {
+    ColInfoResponse_t cinfo;
+    comerror_t err;
+    recptproto *collectproto = protocols.getrecptproto (collection, logout);
+    if (collectproto != NULL) {
+      collectproto->get_collectinfo (collection, cinfo, err, logout);
+      text_t httpcollection;
+      if (!cinfo.httpdomain.empty()) httpcollection = "http://";
+      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) {
+
+      disp.setcollectionmacro("Global",           // package
+                  this_macro->first,          // macro name
+                  this_macro->second.first,   // params
+                  this_macro->second.second); // value
+      ++this_macro;
+    }
+      } // col macros
+    } // collectproto != NULL
+  }
+
 }