Changeset 9032

Timestamp:

2005-02-14T17:23:32+13:00 (19 years ago)

Author:

davidb

Message:

Modification to calling collectset to be compatable with Stefan's Apache module
version of gsdl.

Location:

trunk/gsdl/src/recpt

Files:

• nullproto.cpp (modified) (1 diff)
• receptionist.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/nullproto.cpp

@@ -50 +50 @@
   
   if (cset != NULL) {
-    this->cset->add_collection (collection, recpt, gsdlhome, gdbmhome);
+    this->cset->add_collection (collection, gsdlhome);
   }
 }

trunk/gsdl/src/recpt/receptionist.cpp

@@ -1358 +1358 @@
   disp.openpage(pageparams, configinfo.macroprecedence);
 
+  text_t collection = args["c"];
+  if (!collection.empty()) {
+    read_collection_macrofiles(collection,logout);
+  }
+
   // define external macros for each action
   actionptrmap::iterator actionhere = actions.begin ();
@@ -1370 +1375 @@
   }
 
-  text_t collection = args["c"];
-  if (!collection.empty()) {
-    read_collection_macrofiles(collection,logout);
-  }
 
   // define internal macros for the current action