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

Timestamp:

1999-11-02T10:56:32+13:00 (25 years ago)

Author:

sjboddie

Message:

changes to arguments of many functions

File:

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

trunk/gsdl/src/recpt/receptionist.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.38  1999/11/01 21:49:34  sjboddie
+   changes to arguments of many functions
+
    Revision 1.37  1999/10/20 03:55:03  sjboddie
    yet another problem with calling browserclass
@@ -807 +810 @@
   action *a = actions.getaction (args["a"]);
   if (a != NULL) {
-    a->get_cgihead_info (args, response, response_data, logout);
+    a->get_cgihead_info (args, &protocols, response, response_data, logout);
 
   } else {
@@ -845 +848 @@
   outconverter->reset();
 
-  text_t &collection = args["c"];
-  recptproto *collectproto = NULL;
-  if (!collection.empty()) {
-    // decide on the protocol used for communicating with
-    // the collection server
-    collectproto = protocols.getrecptproto (collection, logout);
-
-    // get collection information 
-    collectinfo.clear();
-    if (!collection.empty()) {
-      comerror_t err;
-      collectproto->get_collectinfo (collection, collectinfo, err, logout);
-      if (err != noError) collectinfo.clear();
-    }
-
+  recptproto *collectproto = protocols.getrecptproto (args["c"], logout);
+  if (collectproto != NULL) {
     // get browsers to process OID
     text_t OID = args["d"];
@@ -882 +872 @@
       }
     }
-
+  
     // translate "d" and "cl" arguments if required
     translate_OIDs (args, collectproto, logout);
   }
-
+  
   // produce the page using the desired action
   action *a = actions.getaction (args["a"]);
   if (a != NULL) {
-    if (a->uses_display(args)) prepare_page (a, args, collectproto, (*outconverter), logout);
-    if (!a->do_action (args, collectinfo, collectproto, disp, 
-               (*outconverter), contentout, logout))
+    if (a->uses_display(args)) prepare_page (a, args, (*outconverter), logout);
+    if (!a->do_action (args, &protocols, &browsers, disp, (*outconverter), contentout, logout))
       return false;
 
@@ -1066 +1055 @@
 // prepare_page sets up page parameters, sets display macros
 // and opens the page ready for output 
-void receptionist::prepare_page (action *a, cgiargsclass &args, recptproto *collectproto,
-                 outconvertclass &outconvert, ostream &logout) {
+void receptionist::prepare_page (action *a, cgiargsclass &args, 
+                 outconvertclass &outconvert, 
+                 ostream &logout) {
   // set up page parameters
   text_t pageparams;
@@ -1098 +1088 @@
     assert ((*actionhere).second.a != NULL);
     if ((*actionhere).second.a != NULL) 
-      (*actionhere).second.a->define_external_macros (collectinfo, disp, args, collectproto, logout);
+      (*actionhere).second.a->define_external_macros (disp, args, &protocols, logout);
     actionhere++;
   }
 
   // define internal macros for the current action
-  a->define_internal_macros (collectinfo, disp, args, collectproto, logout);
+  a->define_internal_macros (disp, args, &protocols, logout);
   
   // define general macros. the defining of general macros is done here so that
   // the last possible version of the cgi arguments are used
-  define_general_macros (args, collectproto, outconvert, logout);
-}
-
-void receptionist::define_general_macros (cgiargsclass &args, recptproto *collectproto,
-                      outconvertclass &/*outconvert*/, ostream &logout) {
+  define_general_macros (args, outconvert, logout);
+}
+
+void receptionist::define_general_macros (cgiargsclass &args, outconvertclass &/*outconvert*/, 
+                      ostream &logout) {
 
   text_t &collection = args["c"];
@@ -1142 +1132 @@
 
   // set collection specific macros
-  if ((!collection.empty()) && (collectproto != NULL)) {
-    FilterResponse_t response;
-    text_tset metadata;
-    get_info ("collection", collection, metadata, false, 
-          collectproto, response, logout);
-
-    if (!response.docInfo[0].metadata.empty()) {
-      MetadataInfo_tmap::const_iterator here = response.docInfo[0].metadata.begin();
-      MetadataInfo_tmap::const_iterator end = response.docInfo[0].metadata.end();
-      while (here != end) {
-    if (((*here).first != "haschildren") && ((*here).first != "hasnext") &&
-        ((*here).first != "hasprevious")) {
-      disp.setmacro ((*here).first, "Global", (*here).second.values[0]);
+  if (!collection.empty()) {
+    recptproto *collectproto = protocols.getrecptproto (collection, logout);
+    if (collectproto != NULL) {
+      FilterResponse_t response;
+      text_tset metadata;
+      get_info ("collection", collection, metadata, false, 
+        collectproto, response, logout);
+      
+      if (!response.docInfo[0].metadata.empty()) {
+    MetadataInfo_tmap::const_iterator here = response.docInfo[0].metadata.begin();
+    MetadataInfo_tmap::const_iterator end = response.docInfo[0].metadata.end();
+    while (here != end) {
+      if (((*here).first != "haschildren") && ((*here).first != "hasnext") &&
+          ((*here).first != "hasprevious")) {
+        disp.setmacro ((*here).first, "Global", (*here).second.values[0]);
+      }
+      here ++;
     }
-    here ++;
       }
     }