Changeset 7390

Timestamp:

2004-05-24T16:48:21+12:00 (20 years ago)

Author:

davidb

Message:

Functionality extended to support collection specific macro files. Most
of the changes are in 'display.cpp'. Here the main change is to -- at
the point a page is away to be produced -- look in the collection's
macro folder for any macro files. If any are found then they are loaded
in on to of existing macros definitions.

Location:

trunk/gsdl/src/recpt

Files:

• receptionist.cpp (modified) (3 diffs)
• receptionist.h (modified) (1 diff)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -1149 +1149 @@
   return true;
 }
+
+
+
+
+// Go through the list of macro files looking to see
+// if any exist in the collectoin specific area.  If they
+// do then read them in and add them to the set of existing
+// current macros
+
+void receptionist::read_collection_macrofiles (const text_t& collection, ostream &logout) 
+{
+  outconvertclass text_t2ascii;
+
+  disp.unloadcollectionmacros();
+
+  // redirect the error output to logout
+  ostream *savedlogout = disp.setlogout (&logout);
+
+  text_t colmacrodir 
+    = filename_cat (configinfo.gsdlhome,"collect",collection, "macros");
+
+  if (file_exists (colmacrodir)) {
+
+    text_tset::iterator arrhere = configinfo.macrofiles.begin();
+    text_tset::iterator arrend = configinfo.macrofiles.end();
+    text_t filename;
+    while (arrhere != arrend) {
+
+      filename = filename_cat (colmacrodir, *arrhere);
+      if (file_exists (filename)) {
+    disp.loadcollectionmacros(filename);
+      }
+      
+      arrhere++;
+    }
+  }
+
+  // reset logout to what it was
+  disp.setlogout (savedlogout);
+}
+
+
 
 
@@ -1311 +1353 @@
   }
 
+  text_t collection = args["c"];
+  if (!collection.empty()) {
+    read_collection_macrofiles(collection,logout);
+  }
+
   // define internal macros for the current action
   a->define_internal_macros (disp, args, &protocols, logout);
@@ -1330 +1377 @@
 
   if (!collection.empty()) {
-    // DB // ****
     ColInfoResponse_t cinfo;
     comerror_t err;

trunk/gsdl/src/recpt/receptionist.h

@@ -269 +269 @@
   virtual bool read_macrofiles (ostream &logout);
   
+  virtual void read_collection_macrofiles (const text_t& collection, ostream &logout);
+
   // check_mainargs will check all the main arguments. If a major
   // error is found it will return false and no cgi page should