Changeset 418 for trunk/gsdl/src/recpt

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

Location:

trunk/gsdl/src/recpt

Files:

• receptionist.cpp (modified) (6 diffs)
• receptionist.h (modified) (7 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);
 }
 

trunk/gsdl/src/recpt/receptionist.h

@@ -48 +48 @@
   displayclass disp;
   convertinfoclass converters;
+  ColInfoResponse_t collectinfo;
   
   // prepare_page sets up page parameters, sets display macros
   // and opens the page ready for output 
-  void prepare_page (action *a, cgiargsclass &args, recptproto *collectproto,
-             outconvertclass &outconvert, ostream &logout);
-  void define_general_macros (cgiargsclass &args, outconvertclass &outconvert,
-                  ostream &logout);
+  virtual void prepare_page (action *a, cgiargsclass &args, recptproto *collectproto,
+                 outconvertclass &outconvert, ostream &logout);
+  virtual void define_general_macros (cgiargsclass &args, outconvertclass &outconvert,
+                      ostream &logout);
 
 public:
@@ -86 +87 @@
   // it contains. The configuration should take place after everything
   // has been added but before the initialisation.
-  void configure (const text_t &key, const text_tarray &cfgline);
-  void configure (const text_t &key, const text_t &value);
+  virtual void configure (const text_t &key, const text_tarray &cfgline);
+  virtual void configure (const text_t &key, const text_t &value);
   const recptconf &get_configinfo () {return configinfo;}
   cgiargsinfoclass *get_cgiargsinfo_ptr () {return &argsinfo;}
@@ -99 +100 @@
   // meaningless output), instead an error page should be
   // produced by the calling code.
-  bool init (ostream &logout);
+  virtual bool init (ostream &logout);
   
   // There are two ways to produce a page. You can either call parse_cgi_args,
@@ -110 +111 @@
   // This function should be called for each page request. It returns false
   // if there was a major problem with the cgi arguments.
-  bool parse_cgi_args (const text_t &argstr, cgiargsclass &args, ostream &logout);
+  virtual bool parse_cgi_args (const text_t &argstr, cgiargsclass &args, ostream &logout);
 
   // produce_cgi_page will call get_cgihead_info and 
@@ -116 +117 @@
   // the page content (if needed). If a page could not be created it
   // will return false
-  bool produce_cgi_page (cgiargsclass &args, ostream &contentout, 
-                     ostream &logout);
+  virtual bool produce_cgi_page (cgiargsclass &args, ostream &contentout, 
+                 ostream &logout);
 
   // get_cgihead_info determines the cgi header information for
@@ -124 +125 @@
   // contains content then reponse_data contains the content-type.
   // Note that images can now be produced by the receptionist.
-  void get_cgihead_info (cgiargsclass &args, response_t &response,
-             text_t &response_data, ostream &logout);
+  virtual void get_cgihead_info (cgiargsclass &args, response_t &response,
+                 text_t &response_data, ostream &logout);
 
   // produce the page content
-  bool produce_content (cgiargsclass &args, ostream &contentout,
-            ostream &logout);
+  virtual bool produce_content (cgiargsclass &args, ostream &contentout,
+                ostream &logout);
 
   // returns the compressed argument ("e") corresponding to the argument
@@ -139 +140 @@
   // error message will be written to logout and the method will
   // return false.
-  bool read_macrofiles (ostream &logout);
+  virtual bool read_macrofiles (ostream &logout);
   
   // check_mainargs will check all the main arguments. If a major