Changeset 456 for trunk

Timestamp:

1999-08-13T16:16:43+12:00 (25 years ago)

Author:

sjboddie

Message:

added some collection-level metadata stuff

Location:

trunk/gsdl/src/recpt

Files:

• receptionist.cpp (modified) (7 diffs)
• receptionist.h (modified) (4 diffs)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.24  1999/08/13 04:16:42  sjboddie
+   added some collection-level metadata stuff
+
    Revision 1.23  1999/08/11 23:28:59  sjboddie
    added support for html classifier (i.e. the hp argumant now must be
@@ -520 +523 @@
   }
 
+  // get collection information 
+  collectinfo.clear();
+  if (!collection.empty()) {
+    comerror_t err;
+    collectproto->get_collectinfo (collection, collectinfo, err, logout);
+    if (err != noError) collectinfo.clear();
+  }
+
   // translate "d", "cl", and "hp" arguments if required
   translate_OIDs (args, collectproto, logout);
@@ -740 +751 @@
 }
 
-// prepare_page sets up page parameters, sets display macros,
-// gets format information and opens the page ready for output 
+// 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) {
@@ -763 +774 @@
     if (first) pageparams += ",language=" + args["l"];
     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
@@ -777 +780 @@
 
   // define general macros
-  define_general_macros (args, outconvert, logout);
+  define_general_macros (args, collectproto, outconvert, logout);
 
   
@@ -795 +798 @@
 }
 
-void receptionist::define_general_macros (cgiargsclass &args, outconvertclass &/*outconvert*/,
-                      ostream &logout) {
+void receptionist::define_general_macros (cgiargsclass &args, recptproto *collectproto,
+                      outconvertclass &/*outconvert*/, ostream &logout) {
+
+  text_t &collection = args["c"];
+
   disp.setmacro ("gwcgi", "Global", configinfo.gwcgi);
   disp.setmacro ("httpimg", "Global", configinfo.httpimg);
@@ -813 +819 @@
     argshere ++;
   }
-}
+
+  // set collection specific macros
+  if ((!collection.empty()) && (collectproto != NULL)) {
+    FilterResponse_t response;
+    text_tarray metadata;
+    //    metadata.push_back (".collectionimage");
+    
+    get_info ("collection", collection, metadata, false, 
+          collectproto, response, logout);
+
+    if (!response.docInfo[0].metadata.empty()) {
+      MetadataInfo_tarray::const_iterator here = response.docInfo[0].metadata.begin();
+      MetadataInfo_tarray::const_iterator end = response.docInfo[0].metadata.end();
+      while (here != end) {
+    if (((*here).name != "haschildren") && ((*here).name != "hasnext") &&
+        ((*here).name != "hasprevious")) {
+      disp.setmacro ((*here).name, "Global", (*here).values[0]);
+    }
+    here ++;
+      }
+    }
+  }
+}

trunk/gsdl/src/recpt/receptionist.h

@@ -57 +57 @@
   virtual void translate_OIDs (cgiargsclass &args, recptproto *collectproto, ostream &logout);
 
-  virtual void define_general_macros (cgiargsclass &args, outconvertclass &outconvert,
-                      ostream &logout);
+
+  virtual void define_general_macros (cgiargsclass &args, recptproto *collectproto,
+                      outconvertclass &outconvert, ostream &logout);
 
 public:
@@ -81 +82 @@
   // The converters remain the property of the calling code.
   void add_converter (const text_t &name, inconvertclass *inconverter,
-              rzwsoutconvertclass *outconverter) 
-    {converters.add_converter(name, inconverter, outconverter);}
+              rzwsoutconvertclass *outconverter) {
+    converters.add_converter(name, inconverter, outconverter);}
   convertinfoclass *get_convertinfo_ptr () {return &converters;}
-
-
+  
+  
   // configure should be called for each line in the
   // configuration files to configure the receptionist and everything
@@ -122 +123 @@
   virtual bool produce_cgi_page (cgiargsclass &args, ostream &contentout, 
                  ostream &logout);
-
+  
   // get_cgihead_info determines the cgi header information for
   // a set of cgi arguments. If response contains location then
@@ -130 +131 @@
   virtual void get_cgihead_info (cgiargsclass &args, response_t &response,
                  text_t &response_data, ostream &logout);
-
+  
   // produce the page content
   virtual bool produce_content (cgiargsclass &args, ostream &contentout,
                 ostream &logout);
-
+  
   // returns the compressed argument ("e") corresponding to the argument
   // list. This can be used to save preferences between sessions.
   text_t get_compressed_arg (cgiargsclass &args, ostream &logout);
-
+  
 protected:
   // will read in all the macro files. If one is not found an