Changeset 16310

Timestamp:

2008-07-09T13:12:15+12:00 (15 years ago)

Author:

davidb

Message:

Introduction of 'collecthome' which parallels 'gsdlhome' to allow the toplevel collect folder to be outside of the gsdlhome area

Location:

gsdl/trunk/src

Files:

• colservr/browsefilter.cpp (modified) (1 diff)
• colservr/collectserver.cpp (modified) (1 diff)
• colservr/collectserver.h (modified) (1 diff)
• colservr/collectset.h (modified) (3 diffs)
• colservr/colservrconfig.cpp (modified) (4 diffs)
• colservr/colservrconfig.h (modified) (1 diff)
• colservr/filter.cpp (modified) (4 diffs)
• colservr/filter.h (modified) (2 diffs)
• colservr/lucenesearch.cpp (modified) (2 diffs)
• colservr/mgqueryfilter.cpp (modified) (1 diff)
• colservr/queryfilter.cpp (modified) (1 diff)
• colservr/source.cpp (modified) (5 diffs)
• colservr/source.h (modified) (2 diffs)
• colservr/sqlbrowsefilter.cpp (modified) (1 diff)
• lib/gsdlsitecfg.cpp (modified) (11 diffs)
• lib/gsdlsitecfg.h (modified) (1 diff)
• oaiservr/oaimain.cpp (modified) (2 diffs)
• protocol/nullproto.cpp (modified) (2 diffs)
• protocol/nullproto.h (modified) (1 diff)
• protocol/recptproto.cpp (modified) (1 diff)
• protocol/recptproto.h (modified) (1 diff)
• recpt/action.cpp (modified) (2 diffs)
• recpt/action.h (modified) (1 diff)
• recpt/cgiwrapper.cpp (modified) (5 diffs)
• recpt/collectoraction.cpp (modified) (3 diffs)
• recpt/depositoraction.cpp (modified) (3 diffs)
• recpt/librarymain.cpp (modified) (2 diffs)
• recpt/maincfg.cpp (modified) (2 diffs)
• recpt/maincfg.h (modified) (1 diff)
• recpt/pageaction.cpp (modified) (1 diff)
• recpt/phindaction.cpp (modified) (1 diff)
• recpt/receptionist.cpp (modified) (7 diffs)
• recpt/receptionist.h (modified) (2 diffs)
• recpt/wizardaction.cpp (modified) (6 diffs)
• w32server/cgiwrapper.cpp (modified) (9 diffs)
• w32server/settings.cpp (modified) (8 diffs)
• w32server/settings.h (modified) (1 diff)

gsdl/trunk/src/colservr/browsefilter.cpp

@@ -85 +85 @@
     indexstem = collection;
   }
-  // get the filename for the database and make sure it exists
-  db_filename = filename_cat(dbhome, "collect", collection, "index", "text", indexstem);
-  db_filename += db_ptr->getfileextension();
+
+  db_filename = resolve_db_filename(indexstem,db_ptr->getfileextension());
   if (!file_exists(db_filename)) {
     logout << text_t2ascii

gsdl/trunk/src/colservr/collectserver.cpp

@@ -85 +85 @@
     else if (key == "gsdlhome") configinfo.gsdlhome = value;
     else if (key == "gdbmhome") configinfo.dbhome = value;
+    else if (key == "collecthome") configinfo.collecthome = value;
     else if (key == "collection") {
       configinfo.collection = value;
       collectinfo.shortInfo.name = value;
-    } else if (key == "collectdir") configinfo.collectdir = value;
+    } 
+    else if (key == "collectdir") configinfo.collectdir = value;
     else if (key == "host") collectinfo.shortInfo.host = value;
     else if (key == "port") collectinfo.shortInfo.port = value.getint();

gsdl/trunk/src/colservr/collectserver.h

@@ -59 +59 @@
 struct colservrconf {
   text_t gsdlhome;
+  text_t collecthome;
   text_t dbhome;
   text_t collection;

gsdl/trunk/src/colservr/collectset.h

@@ -26 +26 @@
 
  public:
-  collectset(text_t &gsdlhome);
+  collectset(text_t& gsdlhome, text_t& collecthome);
   // this constructor is used by the local library
   collectset() {}
@@ -39 +39 @@
 
   // Add/remove collections
-  void add_all_collections (const text_t &gsdlhome);
+  void add_all_collections (const text_t &gsdlhome, const text_t& collecthome);
   void remove_all_collections ();
  
@@ -46 +46 @@
 
   void add_collection (const text_t &collection, 
-               const text_t &gsdlhome);
+               const text_t &gsdlhome, 
+               const text_t& collecthome);
 
   void add_collection_group(const text_t& collection, 
-                const text_t& gsdlhome);
-  void add_all_collection_groups (const text_t& gsdlhome);
+                const text_t& gsdlhome, 
+                const text_t& collecthome);
+
+  void add_all_collection_groups (const text_t& gsdlhome, 
+                  const text_t& collecthome);
 
   // return the total number of servers in the set

gsdl/trunk/src/colservr/colservrconfig.cpp

@@ -44 +44 @@
 // collect_cfg_read reads collect.cfg returning true on success.
 bool collect_cfg_read (collectserver &cserver, const text_t &gsdlhome,
-               const text_t &collection) {
-  text_t filename = filename_cat (gsdlhome, "collect");
-  filename = filename_cat (filename, collection);
-  filename = filename_cat (filename, "custom");
-  filename = filename_cat (filename, collection);
-  filename = filename_cat (filename, "etc");
-  filename = filename_cat (filename, "custom.cfg");
+               const text_t& collecthome,
+               const text_t &collection) 
+{
+  text_t filename = filename_cat (collecthome, collection);
+  filename = filename_cat (filename, "custom",collection,"etc","custom.cfg");
 
   if (!file_exists (filename)) {
-    filename = filename_cat (gsdlhome, "collect");
-    filename = filename_cat (filename, collection);
-    filename = filename_cat (filename, "etc");
-    filename = filename_cat (filename, "collect.cfg");
+    filename = filename_cat (collecthome, collection, "etc", "collect.cfg");
 
     if (!file_exists (filename)) {
-      filename = filename_cat (gsdlhome, "etc");
-      filename = filename_cat (filename, "collect.cfg");
+      filename = filename_cat (gsdlhome, "etc", "collect.cfg");
       if (!file_exists (filename)) return false;
     }
@@ -66 +60 @@
 
   return cserver.read_configfile(filename);
-  /*
-  // read in the collection configuration file
-  text_t key;
-  text_tarray cfgline;
-  char *cstr = filename.getcstr();
-  ifstream confin (cstr);
-  delete []cstr;
-
-  if (confin) {
-    while (read_cfg_line(confin, cfgline) >= 0) {
-      if (cfgline.size () >= 2) {
-    key = cfgline[0];
-    cfgline.erase(cfgline.begin());
-
-    // configure the collection server
-    cserver.configure (key, cfgline);
-      }
-    }
-    confin.close ();
-    return true;
-  }
-  return false;
-  */
 }
 
@@ -94 +65 @@
 // build_cfg_read reads build.cfg and returns true on success.
 bool build_cfg_read (collectserver &cserver, const text_t &gsdlhome,
+             const text_t& collecthome,
              const text_t &collection) {
-  text_t filename = filename_cat (gsdlhome, "collect");
-  filename = filename_cat (filename, collection);
-  filename = filename_cat (filename, "index");
+  text_t filename = filename_cat (collecthome, collection,"index","build.cfg");
 
-  filename = filename_cat (filename, "build.cfg");
   if (!file_exists (filename)) {
-    filename = filename_cat (gsdlhome, "index");
-    filename = filename_cat (filename, "build.cfg");
+    filename = filename_cat (gsdlhome, "index", "build.cfg");
     if (!file_exists (filename)) return false;
   }
@@ -108 +76 @@
   return cserver.read_configfile(filename);
 
-  /*
-  // read in the build configuration file
-  text_t key;
-  text_tarray cfgline;
-  char *cstr = filename.getcstr();
-  ifstream confin (cstr);
-  delete []cstr;
-
-  if (confin) {
-    while (read_cfg_line(confin, cfgline) >= 0) {
-      if (cfgline.size () >= 2) {
-    key = cfgline[0];
-    cfgline.erase(cfgline.begin());
-
-    // configure the collection server
-    cserver.configure (key, cfgline);
-      }
-    }
-    confin.close ();
-    return true;
-  }
-  return false;
-  */
 }

gsdl/trunk/src/colservr/colservrconfig.h

@@ -36 +36 @@
 // collect_cfg_read reads collect.cfg returning true on success.
 bool collect_cfg_read (collectserver &cserver, const text_t &gsdlhome,
-               const text_t &collection);
+               const text_t& collecthome, const text_t &collection);
 
 // build_cfg_read reads build.cfg and returns true on success.
 bool build_cfg_read (collectserver &cserver, const text_t &gsdlhome,
-             const text_t &collection);
+             const text_t& collecthome, const text_t &collection);
 
 

gsdl/trunk/src/colservr/filter.cpp

@@ -27 +27 @@
 #include "fileutil.h"
 #include <assert.h>
+
+#include <iostream>
+using namespace std;
 
 
@@ -46 +49 @@
     else if (key == "collectdir") collectdir = value;
     else if (key == "gsdlhome") gsdlhome = value;
+    else if (key == "collecthome") collecthome = value;
     else if (key == "gdbmhome") dbhome = value;
     else if ((key == "filteroptdefault") && (cfgline.size() == 2)) {
@@ -56 +60 @@
   }
 }
+
+text_t filterclass::resolve_db_filename(const text_t& idx,
+                    const text_t& file_ext)
+{
+  text_t resolved_filename;
+
+  if (gsdlhome==dbhome) {
+    // dbhome has defaulted to gsdlhome which we take to means the 
+    // database has been specifically moved out of gsdlhome area.
+    // => it should be whereever collecthome is set to
+    resolved_filename = filename_cat(collecthome, collection, "index", "text", idx);
+  }
+  else {
+    // dbhome is explicitly set to something other than gsdlhome
+    // => use dbhome
+    resolved_filename = filename_cat(dbhome, "collect", collection, "index", "text", idx);
+  }
+
+  resolved_filename += file_ext;
+
+  return resolved_filename;
+}
+
 
 // init should be called after all the configuration is done but
@@ -70 +97 @@
   }
 
+  if (collecthome.empty()) collecthome = filename_cat(gsdlhome,"collect");
   if (dbhome.empty()) dbhome = gsdlhome;
   
   // get the collection directory name
   if (collectdir.empty()) {
-    collectdir = filename_cat (gsdlhome, "collect", collection);
+    collectdir = filename_cat (collecthome, collection);
   }
   

gsdl/trunk/src/colservr/filter.h

@@ -36 +36 @@
 protected:
   text_t gsdlhome;
+  text_t collecthome;
   text_t dbhome;
   text_t collection;
@@ -65 +66 @@
                FilterResponse_t &response,
                comerror_t &err, ostream &logout);
+
+ protected:
+  text_t resolve_db_filename(const text_t& idx,const text_t& file_ext);
+
+
 };
 

gsdl/trunk/src/colservr/lucenesearch.cpp

@@ -84 +84 @@
 }
 
+
 bool lucenesearchclass::search(const queryparamclass &queryparams, 
                    queryresultsclass &queryresult) {
@@ -147 +148 @@
     }
 
-  cerr << "Lucene command: " << cmd << endl;
- 
   text_t xml_text = "";
 

gsdl/trunk/src/colservr/mgqueryfilter.cpp

@@ -195 +195 @@
   err = noError;
   textsearchptr->setcollectdir (collectdir);
+
   multiresults.clear();
   

gsdl/trunk/src/colservr/queryfilter.cpp

@@ -413 +413 @@
     indexstem = collection;
   }
-  db_filename = filename_cat(dbhome, "collect", collection, "index", "text", indexstem);
-  db_filename += db_ptr->getfileextension();
+  db_filename = resolve_db_filename(indexstem,db_ptr->getfileextension());
   if (!file_exists(db_filename)) {
     logout << text_t2ascii

gsdl/trunk/src/colservr/source.cpp

@@ -52 +52 @@
     else if (key == "collectdir") collectdir = value;
     else if (key == "gsdlhome") gsdlhome = value;
+    else if (key == "collecthome") collecthome = value;
     else if (key == "gdbmhome") dbhome = value;
   }
@@ -77 +78 @@
 }
 
+text_t sourceclass::resolve_db_filename(const text_t& idx,
+                    const text_t& file_ext)
+{
+  // This is an exact copy of the method (of the same name) in filterclass
+  // Makes sense to merge them, in which either gsdlhome, collecthome,
+  // dbhome, and collection need to also be passed in as parameters,
+  // or else there is some notion of a shared base class that both
+  // filter and source inherit from
+
+  // NB: there is an even greater opportunity to share more code in this
+  // function if sql_db_ptr/db_ptr and db_filename and sql_db_filename
+  // are also drawn from one object
+
+  text_t resolved_filename;
+
+  if (gsdlhome==dbhome) {
+    // dbhome has defaulted to gsdlhome which we take to means the 
+    // database has been specifically moved out of gsdlhome area.
+    // => it should be whereever collecthome is set to
+
+    resolved_filename = filename_cat(collecthome, collection, "index", "text", idx);
+  }
+  else {
+    // dbhome is explicitly set to something other than gsdlhome
+    // => use dbhome
+    resolved_filename = filename_cat(dbhome, "collect", collection, "index", "text", idx);
+  }
+
+  resolved_filename += file_ext;
+
+  return resolved_filename;
+}
+
+
+
 // init should be called after all the configuration is done but
 // before any other methods are called
@@ -83 +119 @@
   outconvertclass text_t2ascii;
   
+  if (collecthome.empty()) collecthome = filename_cat(gsdlhome,"collect");
   if (dbhome.empty()) dbhome = gsdlhome;
 
@@ -114 +151 @@
   // get the collection directory name
   if (collectdir.empty()) {
-    collectdir = filename_cat (gsdlhome, "collect", collection);
+    collectdir = filename_cat (collecthome, collection);
   }
 
@@ -128 +165 @@
     indexstem = collection;
   }
-  db_filename = filename_cat(dbhome, "collect", collection, "index", "text", indexstem);
-  db_filename += db_ptr->getfileextension();
+  db_filename = resolve_db_filename(indexstem, db_ptr->getfileextension());
   if (!file_exists(db_filename)) {
     logout << text_t2ascii

gsdl/trunk/src/colservr/source.h

@@ -41 +41 @@
 
   text_t gsdlhome;
+  text_t collecthome;
   text_t dbhome;
   text_t collection;
@@ -96 +97 @@
 
   virtual bool is_searchable(bool &issearchable, comerror_t &err, ostream &logout);
+
+ protected:
+  text_t resolve_db_filename(const text_t& idx,
+                 const text_t& file_ext);
+
 };
 

gsdl/trunk/src/colservr/sqlbrowsefilter.cpp

@@ -69 +69 @@
 
   // get the filename for the database and make sure it exists
-  sql_db_filename = filename_cat(dbhome, "collect", collection, "index", "text", indexstem);
-  sql_db_filename += sql_db_ptr->getfileextension();
+  sql_db_filename = resolve_db_filename(indexstem,sql_db_ptr->getfileextension());
   if (!file_exists(sql_db_filename))
   {

gsdl/trunk/src/lib/gsdlsitecfg.cpp

@@ -24 +24 @@
  *********************************************************************/
 
-
+#include "fileutil.h"
 #include "gsdlsitecfg.h"
 
@@ -42 +42 @@
 private:
   text_t *gsdlhome;
+  text_t *collecthome;
   text_t *httpdomain;
   text_t *httpprefix;
@@ -49 +50 @@
   int    *maxrequests;
 public:
-  __site_configuration (text_t *_gsdlhome, int *_maxrequests) {
+  __site_configuration (text_t *_gsdlhome, text_t* _collecthome, int *_maxrequests) {
     gsdlhome = _gsdlhome;
+    collecthome = _collecthome;
     httpdomain = NULL;
     httpprefix = NULL;
@@ -59 +61 @@
   }
 
-  __site_configuration (text_t *_gsdlhome, text_t *_httpdomain,
-                        text_t *_httpprefix) {
+  __site_configuration (text_t *_gsdlhome, text_t* _collecthome, 
+            text_t *_httpdomain, text_t *_httpprefix) {
     gsdlhome    = _gsdlhome;
+    collecthome  = _collecthome;
     httpdomain = _httpdomain;
     httpprefix = _httpprefix;
@@ -70 +73 @@
   }
 
-  __site_configuration (text_t *_gsdlhome, text_t *_httpdomain,
+  __site_configuration (text_t *_gsdlhome, text_t* _collecthome, 
+            text_t *_httpdomain,
             text_t *_httpprefix, text_t *_collection) {
     gsdlhome    = _gsdlhome;
+    collecthome  = _collecthome;
     httpdomain = _httpdomain;
     httpprefix = _httpprefix;
@@ -83 +88 @@
   __site_configuration (text_t *_httpprefix, text_tset *_actions, text_tset *_browsers) {
     gsdlhome    = NULL;
+    collecthome  = NULL;
     httpdomain = NULL;
     httpprefix = _httpprefix;
@@ -94 +100 @@
     if (gsdlhome != NULL && key == "gsdlhome") {
       *gsdlhome = cfgline[0];
+
+      if ((collecthome != NULL) && (collecthome->empty())) {
+    // defaults to <gsdlhome>/collect
+    *collecthome = filename_cat(*gsdlhome,"collect");
+      }
+    }
+
+    if (collecthome != NULL && key == "collecthome") {
+      if (!collecthome->empty()) {
+    // if it has been previously set to default, free and then reassign
+    collecthome->clear();
+      }
+      *collecthome = cfgline[0];
     }
 
@@ -141 +160 @@
 // also sets gsdlhome and maxrequests 
 // gsdlsite.cfg should be in same directory as library executable
-bool site_cfg_read (configurator gsdlconfigurator, text_t &gsdlhome, int &maxrequests)
+bool site_cfg_read (configurator gsdlconfigurator, text_t &gsdlhome, 
+            text_t& collecthome, int &maxrequests)
 {
-  __site_configuration sitecfg(&gsdlhome, &maxrequests);
+  __site_configuration sitecfg(&gsdlhome, &collecthome, &maxrequests);
   gsdlconfigurator.add_configurable(&sitecfg);
 
-  // blank the gsdl home text
+  // blank the gsdlhome and collecthome text
   gsdlhome.clear();
+  collecthome.clear();
 
   if (gsdlconfigurator.configure("gsdlsite.cfg"))
@@ -158 +179 @@
 
 
-// this version grabs gsdlhome, httpdomain and httpprefix, 
+// this version grabs gsdlhome, collecthome, httpdomain and httpprefix, 
 // returns false if it can't find all of them
-bool site_cfg_read (text_t &gsdlhome, text_t &httpdomain, 
+bool site_cfg_read (text_t &gsdlhome, text_t& collecthome, text_t &httpdomain, 
             text_t &httpprefix)
 {
   // get gsdlhome etc
-  __site_configuration sitecfg(&gsdlhome, &httpdomain, &httpprefix);
+  __site_configuration sitecfg(&gsdlhome, &collecthome, &httpdomain, &httpprefix);
   configurator gsdlconfigurator(&sitecfg);
 
   gsdlhome.clear();
+  collecthome.clear();
   httpdomain.clear();
   httpprefix.clear();
@@ -180 +202 @@
 
 
-// this version grabs gsdlhome, httpdomain, httpprefix, collection, 
+// this version grabs gsdlhome, collecthome, httpdomain, httpprefix, collection, 
 // returns false if it can't find gsdlhome, httpdomain and httpprefix
-bool site_cfg_read (text_t &gsdlhome, text_t &httpdomain, 
+bool site_cfg_read (text_t &gsdlhome, text_t& collecthome, text_t &httpdomain, 
             text_t &httpprefix, text_t &collection)
 {
   // get gsdlhome etc
-  __site_configuration sitecfg(&gsdlhome, &httpdomain, &httpprefix, &collection);
+  __site_configuration sitecfg(&gsdlhome, &collecthome, &httpdomain, &httpprefix, &collection);
   configurator gsdlconfigurator(&sitecfg);
     
   gsdlhome.clear();
+  collecthome.clear();
   httpdomain.clear();
   httpprefix.clear();
@@ -195 +218 @@
     
   if (gsdlconfigurator.configure("gsdlsite.cfg") &&
-      !gsdlhome.empty() && !httpdomain.empty() && !httpprefix.empty())
+      !gsdlhome.empty() && !collecthome.empty() 
+      && !httpdomain.empty() && !httpprefix.empty())
   {
     return true;

gsdl/trunk/src/lib/gsdlsitecfg.h

@@ -34 +34 @@
 
 // reads gsdlsite.cfg file returning true on success
-bool site_cfg_read (configurator gsdlconfigurator, text_t &gsdlhome, int &maxrequests);
-bool site_cfg_read (text_t &gsdlhome, text_t &httpdomain, text_t &httpprefix);
-bool site_cfg_read (text_t &gsdlhome, text_t &httpdomain, text_t &httpprefix, text_t &collection);
+bool site_cfg_read (configurator gsdlconfigurator, text_t &gsdlhome, 
+            text_t& collecthome, int &maxrequests);
+bool site_cfg_read (text_t &gsdlhome, text_t& collecthome, text_t &httpdomain, text_t &httpprefix);
+bool site_cfg_read (text_t &gsdlhome, text_t& collecthome, text_t &httpdomain, text_t &httpprefix, text_t &collection);
 
 

gsdl/trunk/src/oaiservr/oaimain.cpp

@@ -103 +103 @@
   collectset   *cservers;
   text_t        gsdlhome;
+  text_t        collecthome;
   text_t        gsdlcollect = "";
   oaiargs       args;
@@ -122 +123 @@
   delete []cstr;
   
-  cservers = new collectset(gsdlhome);
+  cservers = new collectset(gsdlhome,collecthome);
 
   // set up the null protocol

gsdl/trunk/src/protocol/nullproto.cpp

@@ -45 +45 @@
 // collectset has been added to the protocol with set_collectset()
 void nullproto::add_collection (const text_t &collection, void *recpt, 
-                const text_t &gsdlhome, const text_t &dbhome) {      
+                const text_t &gsdlhome, const text_t& collecthome,
+                const text_t &dbhome) 
+{      
   
   if (cset != NULL) {
-    this->cset->add_collection (collection, gsdlhome);
+    this->cset->add_collection (collection, gsdlhome, collecthome);
   }
 }
@@ -70 +72 @@
   // the protocol should not configure the collection set; it should be
   // done direct to the collection server set
-  if (key == "gsdlhome" || key == "gdbmhome") {
+  if (key == "gsdlhome" || key == "gdbmhome"
+      || key == "collecthome" || key == "collectdir") {
     cset->configure(key, cfgline);
   }

gsdl/trunk/src/protocol/nullproto.h

@@ -44 +44 @@
   // add_collectserver
   virtual void add_collection (const text_t &collection, void *recpt, 
-                   const text_t &gsdlhome, const text_t &dbhome);
+                   const text_t &gsdlhome, const text_t& collecthome,
+                   const text_t &dbhome);
 
   void set_collectset(collectset *set) { this->cset = set; }

gsdl/trunk/src/protocol/recptproto.cpp

@@ -30 +30 @@
 // add collection server to protocol
 void recptproto::add_collection (const text_t &/*collection*/, void * /*recpt*/, 
-                 const text_t &/*gsdlhome*/, const text_t &/*dbhome*/) {
+                 const text_t &/*gsdlhome*/, const text_t& /*collecthome */, 
+                 const text_t &/*dbhome*/) 
+{
 }
 

gsdl/trunk/src/protocol/recptproto.h

@@ -56 +56 @@
   // add collection server to protocol
   virtual void add_collection (const text_t &collection, void *recpt, 
-                   const text_t &gsdlhome, const text_t &dbhome);
+                   const text_t &gsdlhome, const text_t& collecthome,
+                   const text_t &dbhome);
 
   virtual void remove_collection (const text_t &collection, ostream &logout);

gsdl/trunk/src/recpt/action.cpp

@@ -24 +24 @@
  *********************************************************************/
 
+#include "fileutil.h"
+
 #include "action.h"
 #include <assert.h>
@@ -44 +46 @@
   if (key == "gsdlhome") {
     gsdlhome = cfgline[0];
+    if (collecthome.empty()) collecthome = filename_cat(gsdlhome,"collect");
     if (dbhome.empty()) dbhome = cfgline[0];
   }
+  if (key == "collecthome") {collecthome = cfgline[0];}
   if (key == "gdbmhome") {dbhome = cfgline[0];}
 }

gsdl/trunk/src/recpt/action.h

@@ -48 +48 @@
   cgiargsinfoclass argsinfo;
   text_t gsdlhome;
+  text_t collecthome;
   text_t dbhome;
 

gsdl/trunk/src/recpt/cgiwrapper.cpp

@@ -129 +129 @@
 static void page_errorcollect (const text_t &gsdlhome, text_t &errorpage, bool debug) {
 
-  text_t collectdir = filename_cat (gsdlhome, "collect");
+  text_t collecthome = filename_cat (gsdlhome, "collect");
 
   text_t errortext = "No valid collections were found: Check that your collect directory\n";
-  errortext += "(" + collectdir + ") is readable and contains at least one valid collection.\n";
+  errortext += "(" + collecthome + ") is readable and contains at least one valid collection.\n";
   errortext += "Note that modelcol is NOT a valid collection.\n";
   errortext += "If the path to your collect directory is wrong edit the 'gsdlhome' field\n";
@@ -301 +301 @@
   bool colspec = false;
   if (configinfo.collection.empty()) {
-    cout << "Receptionist is running in \"general\" (i.e. not \"collection\n"
+    cout << "Receptionist is running in \"general\" (i.e. not \"collection "
      << "specific\") mode.\n";
   } else {
@@ -311 +311 @@
   }
   
-  cout << text_t2ascii << "gsdlhome=" << configinfo.gsdlhome << "\n";
+  cout << text_t2ascii << "  gsdlhome=" << configinfo.gsdlhome << "\n";
+  if (!configinfo.collecthome.empty())
+    cout << text_t2ascii << "  collecthome=" << configinfo.collecthome << "\n";
   if (!configinfo.dbhome.empty())
-    cout << text_t2ascii << "dbhome=" << configinfo.dbhome << "\n";
-  cout << text_t2ascii << "httpprefix=" << configinfo.httpprefix << "\n";
-  cout << text_t2ascii << "httpimg=" << configinfo.httpimg << "\n";
-  cout << text_t2ascii << "gwcgi=" << configinfo.gwcgi << "\n"
+    cout << text_t2ascii << "  dbhome=" << configinfo.dbhome << "\n";
+  cout << text_t2ascii << "  httpprefix=" << configinfo.httpprefix << "\n";
+  cout << text_t2ascii << "  httpimg=" << configinfo.httpimg << "\n";
+  cout << text_t2ascii << "  gwcgi=" << configinfo.gwcgi << "\n\n"
        << "  Note that unless gwcgi has been set from a configuration\n"
        << "  file it is dependent on environment variables set by your\n"
@@ -483 +485 @@
   // read in the configuration files.
   text_t gsdlhome;
+  text_t collecthome;
   configurator gsdlconfigurator(&recpt);
-  if (!site_cfg_read (gsdlconfigurator, gsdlhome, maxrequests)) {
+  if (!site_cfg_read (gsdlconfigurator, gsdlhome, collecthome, maxrequests)) {
     // couldn't find the site configuration file
     page_errorsitecfg (errorpage, debug, 0);
@@ -493 +496 @@
     // gsdlhome not a valid directory
     page_errorsitecfg (errorpage, debug, 1);
-  } else if (!main_cfg_read (recpt, gsdlhome, collection)) {
+  } else if (!main_cfg_read (recpt, gsdlhome, collecthome, collection)) {
     // couldn't find the main configuration file
     page_errormaincfg (gsdlhome, collection, debug, errorpage);

gsdl/trunk/src/recpt/collectoraction.cpp

@@ -381 +381 @@
     // etc directory to the new collection.
     if (args["bc1clone"] == "1") {
-      text_t clone_etc = filename_cat(gsdlhome, "collect", args["bc1clonecol"], "etc");
+      text_t clone_etc = filename_cat(collecthome, args["bc1clonecol"], "etc");
       text_t new_etc = filename_cat(get_collectdir(args), args["bc1dirname"], "etc");
       text_tarray files;
@@ -454 +454 @@
     // cloning was turned on
 
-    text_t cfgfile_clone = filename_cat(gsdlhome, "collect", args["bc1clonecol"], "etc", "collect.cfg");
+    text_t cfgfile_clone = filename_cat(collecthome, args["bc1clonecol"], "etc", "collect.cfg");
     if (file_exists (cfgfile_clone)) {
       // if .org file doesn't exist already create it
@@ -1170 +1170 @@
       // delete it
       text_t colmaintainer;
-      text_t cfgfile = filename_cat(gsdlhome, "collect", collection, "etc", "collect.cfg");
+      text_t cfgfile = filename_cat(collecthome, collection, "etc", "collect.cfg");
       char *cfgfilec = cfgfile.getcstr();
       ifstream cfg_in (cfgfilec);

gsdl/trunk/src/recpt/depositoraction.cpp

@@ -612 +612 @@
     } else {
     
-      text_t col_dirname = filename_cat(gsdlhome,"collect",args[macro_prefix+"dirname"]);
+      text_t col_dirname = filename_cat(collecthome,args[macro_prefix+"dirname"]);
       text_t import_dirname = filename_cat(col_dirname,"import");
       if(!directory_exists(import_dirname)) {
@@ -756 +756 @@
 
     //create metadata.xml file
-    text_t metadata_path = filename_cat(gsdlhome,"collect", args[macro_prefix+"dirname"], "import", timestamp_str, "metadata.xml");
+    text_t metadata_path = filename_cat(collecthome, args[macro_prefix+"dirname"], "import", timestamp_str, "metadata.xml");
     text_t my_path = filename_cat(gsdlhome,"tmp", "metadata.xml");
 
@@ -792 +792 @@
 
     //create manifest.xml file
-    text_t manifest_path = filename_cat(gsdlhome,"collect", args[macro_prefix+"dirname"], "manifest.xml");
+    text_t manifest_path = filename_cat(collecthome, args[macro_prefix+"dirname"], "manifest.xml");
 
     char* manifest_cstr = manifest_path.getcstr();

gsdl/trunk/src/recpt/librarymain.cpp

@@ -70 +70 @@
 #endif
   text_t       gsdlhome;
-
-  cservers = new collectset(gsdlhome);
+  text_t       collecthome;
+
+  cservers = new collectset(gsdlhome,collecthome);
 
   // configure the receptionist server list
@@ -82 +83 @@
     colinfo.push_back(*collection_iterator);
     colinfo.push_back(gsdlhome);
+    colinfo.push_back(collecthome);
     colinfo.push_back(gsdlhome);
     recpt.configure("collectinfo", colinfo);

gsdl/trunk/src/recpt/maincfg.cpp

@@ -40 +40 @@
 
 
+bool main_cfg_read (receptionist &recpt, const text_t &gsdlhome,
+            const text_t &collection) 
+{
+
+  cerr << "Warning: Using version of main_cfg_read() that does not support 'collecthome'" << endl;
+
+  text_t collecthome = filename_cat(gsdlhome,"collect");
+  return main_cfg_read(recpt,gsdlhome,collecthome,collection);
+}
+
+
 // main_cfg_read reads both main.cfg and collect.cfg. It attempts
 // to read main.cfg first so values in collect.cfg override those
 // set earlier by main.cfg
 bool main_cfg_read (receptionist &recpt, const text_t &gsdlhome,
-             const text_t &collection) {
+            const text_t& collecthome, const text_t &collection) {
 
   // read in the main configuration file
@@ -62 +73 @@
   }
 
-  // Look for collect.cfg in GSDLHOME/collect/collection-name/etc directory 
+  // Look for collect.cfg in <collecthome>/collection-name/etc directory 
   // (if this is for a particular collection), and then GSDLHOME/etc.
   if (!collection.empty()) {
-    filename = filename_cat (gsdlhome, "collect");
-    filename = filename_cat (filename, collection);
+    filename = filename_cat (collecthome, collection);
     filename = filename_cat (filename, "etc");
     filename = filename_cat (filename, "collect.cfg");

gsdl/trunk/src/recpt/maincfg.h

@@ -40 +40 @@
 // collection is specified and then it tries to read in main.cfg
 bool main_cfg_read (receptionist &recpt, const text_t &gsdlhome,
+            const text_t& collecthome, const text_t &collection);
+
+bool main_cfg_read (receptionist &recpt, const text_t &gsdlhome,
             const text_t &collection);
 

gsdl/trunk/src/recpt/pageaction.cpp

@@ -979 +979 @@
 
     set_macro_to_file_contents (disp, "importlog", "bsummary",
-                filename_cat(gsdlhome, "collect", arg_c, "etc", "import.log"));
+                filename_cat(collecthome, arg_c, "etc", "import.log"));
     set_macro_to_file_contents (disp, "faillog", "bsummary",
-                filename_cat(gsdlhome, "collect", arg_c, "etc", "fail.log"));
+                filename_cat(collecthome, arg_c, "etc", "fail.log"));
     set_macro_to_file_contents (disp, "buildlog", "bsummary",
-                filename_cat(gsdlhome, "collect", arg_c, "etc", "build.log"));
+                filename_cat(collecthome, arg_c, "etc", "build.log"));
   }
 }

gsdl/trunk/src/recpt/phindaction.cpp

@@ -168 +168 @@
   unsigned long ef, lf, df;
   
-  text_t basepath = filename_cat(gsdlhome, "collect", args["c"], 
+  text_t basepath = filename_cat(collecthome, args["c"], 
                  "index", "phind" + args["pc"]);
 

gsdl/trunk/src/recpt/receptionist.cpp

@@ -52 +52 @@
 void recptconf::clear () {
   gsdlhome.clear();
+  collecthome.clear();
   dbhome.clear();
   collectinfo.erase(collectinfo.begin(), collectinfo.end());
@@ -222 +223 @@
       if (configinfo.dbhome.empty()) configinfo.dbhome = cfgline[0];
     }
+    else if (key == "collecthome") configinfo.collecthome = cfgline[0];
     else if (key == "gdbmhome") configinfo.dbhome = cfgline[0];
     else if (key == "collection") {
@@ -231 +233 @@
       }
       
-    } else if (key == "collectdir") configinfo.collectdir = cfgline[0];
+    }
+    else if (key == "collectdir") configinfo.collectdir = cfgline[0];
     else if (key == "httpprefix") configinfo.httpprefix = cfgline[0];
     else if (key == "httpimg") configinfo.httpimg = cfgline[0];
@@ -269 +272 @@
     else if (key == "macroprecedence") configinfo.macroprecedence = cfgline[0];
     else if (key == "collectinfo") {
-      if (cfgline.size() >= 3) {
+      if (cfgline.size() == 3) {
+    // for backwards compatability with older collections that only use
+    // gsdlhome and dbhome
     collectioninfo_t cinfo;
     cinfo.gsdl_gsdlhome = cfgline[1];
+    cinfo.gsdl_collecthome = filename_cat(cfgline[1],"collect");
     cinfo.gsdl_dbhome = cfgline[2];
+    configinfo.collectinfo[cfgline[0]] = cinfo;
+      }
+      else if (cfgline.size() >= 4) {
+    collectioninfo_t cinfo;
+    cinfo.gsdl_gsdlhome = cfgline[1];
+    cinfo.gsdl_collecthome = cfgline[2];
+    cinfo.gsdl_dbhome = cfgline[3];
     configinfo.collectinfo[cfgline[0]] = cinfo;
       }
@@ -427 +440 @@
 
   // first configure collectdir
-  text_t thecollectdir = configinfo.gsdlhome;
   if (!configinfo.collection.empty()) {
+
     // collection specific mode
+
+    text_t collectdir = configinfo.gsdlhome;
+
     if (!configinfo.collectdir.empty()) {
       // has already been configured
-      thecollectdir = configinfo.collectdir;
+      collectdir = configinfo.collectdir;
     } else {
+
       // decide where collectdir is by searching for collect.cfg
       // look in $GSDLHOME/collect/collection-name/etc/collect.cfg and
       // then $GSDLHOME/etc/collect.cfg
-      thecollectdir = filename_cat (configinfo.gsdlhome, "collect");
-      thecollectdir = filename_cat (thecollectdir, configinfo.collection);
-      text_t filename = filename_cat (thecollectdir, "etc");
+      collectdir = filename_cat (configinfo.gsdlhome, "collect");
+      collectdir = filename_cat (collectdir, configinfo.collection);
+      text_t filename = filename_cat (collectdir, "etc");
       filename = filename_cat (filename, "collect.cfg");
-
-      if (!file_exists(filename)) thecollectdir = configinfo.gsdlhome;
-    }
-  }
-  configure("collectdir", thecollectdir);
+      
+      if (!file_exists(filename)) collectdir = configinfo.gsdlhome;
+    }
+
+    configure("collectdir", collectdir);
+
+  }
+  else {
+
+    text_t collecthome;
+    if (configinfo.collecthome.empty()) {
+      collecthome = filename_cat(configinfo.gsdlhome,"collect");
+    }
+    else {
+      collecthome = configinfo.collecthome;
+    }
+
+    configure("collecthome", collecthome);
+
+    // for backwards compatability collectdir set to gsdlhome
+    // (possible it could now be removed)
+    configure("collectdir", configinfo.gsdlhome); 
+  } 
+
 
   // read in the macro files
@@ -824 +860 @@
     collectname=args["c"];
     if (collectname != "") {
-      text_t collectdir=filename_cat(configinfo.gsdlhome,"collect");
-      collectdir=filename_cat(collectdir,collectname);
+
+      text_t collecthome;
+      if (!configinfo.collecthome.empty()) {
+    collecthome = configinfo.collecthome;
+      }    
+      else {
+    collecthome=filename_cat(configinfo.gsdlhome,"collect");
+      }
+      text_t collectdir=filename_cat(collecthome,collectname);
+      
       text_t buildcfg=filename_cat(collectdir,"index");
       buildcfg=filename_cat(buildcfg,"build.cfg");
@@ -1186 +1230 @@
 
   text_t colmacrodir 
-    = filename_cat (configinfo.gsdlhome,"collect",collection, "macros");
+    = filename_cat (configinfo.collecthome,collection, "macros");
 
   if (directory_exists (colmacrodir)) {

gsdl/trunk/src/recpt/receptionist.h

@@ -55 +55 @@
 
   text_t gsdl_gsdlhome;
+  text_t gsdl_collecthome;
   text_t gsdl_dbhome;
 
@@ -77 +78 @@
 struct recptconf {
    text_t gsdlhome;
+   text_t collecthome;
    text_t dbhome;   // will equal gsdlhome if not set
    text_t collection; // will equal "" in 'general' mode

gsdl/trunk/src/recpt/wizardaction.cpp

@@ -201 +201 @@
 // collect.cfg file is writable
 bool wizardaction::collection_protected (const text_t &collection) {
-  text_t cfgfile = filename_cat(gsdlhome, "collect", collection, "etc", "collect.cfg");
+  text_t cfgfile = filename_cat(collecthome, collection, "etc", "collect.cfg");
   if (file_writable(cfgfile)) return false;
   return true;
@@ -310 +310 @@
 
   // check to see if shortname is unique
-  text_t fulldirname = filename_cat (gsdlhome, "collect", shortname);
+  text_t fulldirname = filename_cat (collecthome, shortname);
   if (directory_exists (fulldirname)) {
     int version = 0;
@@ -319 +319 @@
       newname.push_back ('v');
       newname.appendint (version);
-      fulldirname = filename_cat (gsdlhome, "collect", newname);
+      fulldirname = filename_cat (collecthome, newname);
     } while (directory_exists (fulldirname));
 
@@ -468 +468 @@
 
   text_t cfgfile_content;
-  text_t cfgfile_name = filename_cat (gsdlhome, "collect", collection, "etc", "collect.cfg");
+  text_t cfgfile_name = filename_cat (collecthome, collection, "etc", "collect.cfg");
   text_t pluginstr, pluginname;
 
@@ -654 +654 @@
   if ((args[macro_prefix+"econf"] == 1) || (args[macro_prefix+"esrce"] == 1)) {
     // we're adding to a collection in place
-    return filename_cat(gsdlhome, "collect");  
+    return collecthome;
   }
   else {
@@ -673 +673 @@
       if ((*rprotolist_here).p->get_protocol_name (err) == "nullproto") {
     // create collection server and add it to nullproto
-    (*rprotolist_here).p->add_collection (collection, recpt, gsdlhome, gsdlhome);
+    (*rprotolist_here).p->add_collection (collection, recpt, gsdlhome, collecthome, dbhome);
     // make sure gsdlhome is configured
     text_tarray tmp;

gsdl/trunk/src/w32server/cgiwrapper.cpp

@@ -392 +392 @@
     // that we can find the relevant directories
     if (!checkdir (gsdl_gsdlhome + "\\")) return 0;
+    if (!checkdir (gsdl_collecthome + "\\")) return 0;
     if (!checkdir (gsdl_gsdlhome + "\\macros\\")) return 0;
   }    
@@ -409 +410 @@
     collectioninfo_t tmp;
     tmp.gsdl_gsdlhome = gsdl_gsdlhome;
+    tmp.gsdl_collecthome = gsdl_collecthome;
     tmp.gsdl_dbhome = gsdl_dbhome;
     translated_collectinfo[collection] = tmp;
@@ -424 +426 @@
       if (dbhomes.find ((*this_info).second.gsdl_dbhome) == dbhomes.end()) {
     these_collections.erase (these_collections.begin(), these_collections.end());
-    read_dir (filename_cat ((*this_info).second.gsdl_gsdlhome, "collect"), these_collections);
+    read_dir (filename_cat ((*this_info).second.gsdl_collecthome), these_collections);
     colhere = these_collections.begin();
     colend = these_collections.end();
@@ -433 +435 @@
         // file is installed here -- it's real gdbm will therefore be 
         // somewhere else).
-        text_t build_cfg = filename_cat ((*this_info).second.gsdl_gsdlhome, "collect",
+        text_t build_cfg = filename_cat ((*this_info).second.gsdl_collecthome,
                          *colhere, "index", "build.cfg");
         if (file_exists (build_cfg)) {
@@ -462 +464 @@
     collectioninfo_t tmp;
     tmp.gsdl_gsdlhome = gsdl_gsdlhome;
+    tmp.gsdl_collecthome = gsdl_collecthome;
     tmp.gsdl_dbhome = gsdl_dbhome;
     translated_collectinfo[*colhere] = tmp;
@@ -483 +486 @@
     // create collection server and add to null protocol
     text_t this_gsdlhome = gsdl_gsdlhome;
+    text_t this_collecthome = gsdl_collecthome;
     text_t this_dbhome = gsdl_dbhome;
     colinfo_tmap::const_iterator it = translated_collectinfo.find (*thiscol);
     assert (it != translated_collectinfo.end());
     this_gsdlhome = (*it).second.gsdl_gsdlhome;
+    this_collecthome = (*it).second.gsdl_collecthome;
     this_dbhome = (*it).second.gsdl_dbhome;
 
@@ -623 +628 @@
   // set defaults
   recpt.configure ("gsdlhome", gsdl_gsdlhome);
+  recpt.configure ("collecthome", gsdl_collecthome);
   recpt.configure ("gdbmhome", gsdl_dbhome);
   recpt.configure ("collection", collection);
@@ -637 +643 @@
     tmpconf.push_back ((*this_info).first);
     tmpconf.push_back ((*this_info).second.gsdl_gsdlhome);
+    tmpconf.push_back ((*this_info).second.gsdl_collecthome);
     tmpconf.push_back ((*this_info).second.gsdl_dbhome);
     recpt.configure ("collectinfo", tmpconf);
@@ -646 +653 @@
   // collections being used together in this way should be 
   // careful not to have main.cfg files that might 
-  // screw with each other.
+  // interfere with each other.
   text_tset::const_iterator thome = dbhomes.begin();
   text_tset::const_iterator ehome = dbhomes.end();

gsdl/trunk/src/w32server/settings.cpp

@@ -47 +47 @@
 text_t gsdl_enterlib;
 text_t gsdl_gsdlhome;
+text_t gsdl_collecthome;
 text_t gsdl_dbhome;
 text_t gsdl_collections;
@@ -300 +301 @@
     write_ini_line(fout, "enterlib", gsdl_enterlib);
     write_ini_line(fout, "gsdlhome", gsdl_gsdlhome);
+    write_ini_line(fout, "collecthome", gsdl_collecthome);
     write_ini_line(fout, "gdbmhome", gsdl_dbhome);
     
@@ -321 +323 @@
       if (!(*here).second.gsdl_gsdlhome.empty()) 
     write_ini_line(fout, "gsdlhome", (*here).second.gsdl_gsdlhome);
+      if (!(*here).second.gsdl_collecthome.empty()) 
+    write_ini_line(fout, "collecthome", (*here).second.gsdl_collecthome);
       if (!(*here).second.gsdl_dbhome.empty()) 
     write_ini_line(fout, "gdbmhome", (*here).second.gsdl_dbhome);
@@ -385 +389 @@
   gsdl_enterlib = "/gsdl";
   gsdl_gsdlhome = data_location;
+  gsdl_collecthome = filename_cat(data_location,"collect");
   gsdl_dbhome = data_location;
   
@@ -474 +479 @@
       } else if (key == "collections") {
         gsdl_collections = value;
-
+      } 
       // gsdlhome must occur in file before dbhome      
-      } else if (key == "gsdlhome") {
+      else if (key == "gsdlhome") {
         gsdl_gsdlhome = value;
-        gsdl_dbhome = value;
-      
-      } else if (key == "gdbmhome") {
+        gsdl_collecthome = filename_cat(value,"collect");
+        gsdl_dbhome = value;      
+      } 
+      else if (key == "collecthome") {
+        gsdl_collecthome = value;
+      } 
+      else if (key == "gdbmhome") {
         gsdl_dbhome = value;
       }
@@ -488 +497 @@
       if (key == "gsdlhome") {
         gsdl_collectinfo[section].gsdl_gsdlhome = value;
+        gsdl_collectinfo[section].gsdl_collecthome = filename_cat(value,"collecct");
         gsdl_collectinfo[section].gsdl_dbhome = value;
-      } else if (key == "gdbmhome") {
+      } 
+      else if (key == "collecthome") {
+        gsdl_collectinfo[section].gsdl_collecthome = value;
+      }
+      else if (key == "gdbmhome") {
         gsdl_collectinfo[section].gsdl_dbhome = value;
       }
@@ -502 +516 @@
   // extra slashes at the end
   remove_end_slashes (gsdl_gsdlhome);
+  remove_end_slashes (gsdl_collecthome);
   remove_end_slashes (gsdl_dbhome);
   colinfo_tmap::iterator here = gsdl_collectinfo.begin();
@@ -507 +522 @@
   while (here != end) {
     remove_end_slashes ((*here).second.gsdl_gsdlhome);
+    remove_end_slashes ((*here).second.gsdl_collecthome);
     remove_end_slashes ((*here).second.gsdl_dbhome);
     ++here;

gsdl/trunk/src/w32server/settings.h

@@ -48 +48 @@
 extern text_t gsdl_enterlib;
 extern text_t gsdl_gsdlhome;
+extern text_t gsdl_collecthome;
 extern text_t gsdl_dbhome;
 extern text_t gsdl_collections;