Changeset 1279 for branches/New_Config_Format-branch/gsdl/src/recpt/receptionist.h

Timestamp:

2000-07-13T10:21:53+12:00 (24 years ago)

Author:

sjboddie

Message:

merged changes to trunk into New_Config_Format branch

File:

• branches/New_Config_Format-branch/gsdl/src/recpt/receptionist.h (modified) (5 diffs)

branches/New_Config_Format-branch/gsdl/src/recpt/receptionist.h

@@ -34 +34 @@
 #include "cgiargs.h"
 #include "display.h"
-#include "action.h"
 #include "browserclass.h"
 #include "recptproto.h"
 #include "converter.h"
 #include "cfgread.h"
+#include "action.h"
 
 // the MACROPRECEDENCE macro is used as a default. override
@@ -51 +51 @@
 
 
+struct collectioninfo_t {
+  void clear ();
+  collectioninfo_t () {clear();}
+
+  text_t gsdl_gsdlhome;
+  text_t gsdl_gdbmhome;
+
+  bool info_loaded;
+  ColInfoResponse_t info;
+};
+
+typedef map<text_t, collectioninfo_t, lttext_t> colinfo_tmap;
+
+
 struct recptconf {
   text_t gsdlhome;
@@ -58 +72 @@
   colinfo_tmap collectinfo;
   text_t httpprefix;
-  text_t httpimg;
+  text_t httpimg;    // will equal /images if not set
   text_t gwcgi;
   text_tset macrofiles;
@@ -71 +85 @@
   recptconf () {clear();}
 };
-
 
 class receptionist {
@@ -196 +209 @@
   // list. This can be used to save preferences between sessions.
   text_t get_compressed_arg (cgiargsclass &args, ostream &logout);
+
+  // gets collection info from cache if found or 
+  // calls collection server (and updates cache)
+  // returns NULL if there's an error
+  ColInfoResponse_t *get_collectinfo_ptr (recptproto *collectproto, 
+                      const text_t &collection, 
+                      ostream &logout);
+
   
 protected: