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

Timestamp:

1999-07-30T14:13:10+12:00 (25 years ago)

Author:

sjboddie

Message:

-added collectinfo argument to some functions
-made some function prototypes virtual

File:

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

trunk/gsdl/src/recpt/receptionist.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.20  1999/07/30 02:13:09  sjboddie
+   -added collectinfo argument to some functions
+   -made some function prototypes virtual
+
    Revision 1.19  1999/07/15 06:02:05  rjmcnab
    Moved the setting of argsinfo into the constructor. Added the configuration
@@ -264 +268 @@
       text_t filename = filename_cat (thecollectdir, "etc");
       filename = filename_cat (filename, "collect.cfg");
+
       if (!file_exists(filename)) thecollectdir = configinfo.gsdlhome;
     }
@@ -507 +512 @@
   if (a != NULL) {
     if (a->uses_display(args)) prepare_page (a, args, collectproto, (*outconverter), logout);
-    if (!a->do_action (args, collectproto, disp, (*outconverter), contentout, logout))
+    if (!a->do_action (args, collectinfo, collectproto, disp, 
+               (*outconverter), contentout, logout))
       return false;
 
@@ -643 +649 @@
 }
 
-// prepare_page sets up page parameters, sets display macros
-// and opens the page ready for output 
+// prepare_page sets up page parameters, sets display macros,
+// gets format information and opens the page ready for output 
 void receptionist::prepare_page (action *a, cgiargsclass &args, recptproto *collectproto,
                  outconvertclass &outconvert, ostream &logout) {
   // set up page parameters
   text_t pageparams;
+  text_t &collection = args["c"];
 
   bool first = true;
-  if (!args["c"].empty()) {
-    pageparams +=  "collection=" + args["c"]; first = false;}
+  if (!collection.empty()) {
+    pageparams +=  "collection=" + collection; first = false;}
   if (args.getintarg("u") == 1)
     if (first) {pageparams += "style=htmlonly"; first = false;}
@@ -666 +673 @@
     else pageparams += ",language=" + args["l"];
   
+  // get collection information 
+  collectinfo.clear();
+  if (!collection.empty()) {
+    comerror_t err;
+    collectproto->get_collectinfo (collection, collectinfo, err, logout);
+    if (err != noError) collectinfo.clear();
+  }
+
   // open the page
   disp.openpage(pageparams, MACROPRECEDENCE);
@@ -681 +696 @@
     assert ((*actionhere).second.a != NULL);
     if ((*actionhere).second.a != NULL) 
-      (*actionhere).second.a->define_external_macros (disp, args, collectproto, logout);
+      (*actionhere).second.a->define_external_macros (collectinfo, disp, args, collectproto, logout);
     actionhere++;
   }
 
-
   // define internal macros for the current action
-  a->define_internal_macros (disp, args, collectproto, logout);
+  a->define_internal_macros (collectinfo, disp, args, collectproto, logout);
 }