Changeset 16312

Timestamp:

2008-07-09T13:19:53+12:00 (16 years ago)

Author:

davidb

Message:

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

File:

• gsdl/trunk/src/colservr/collectset.cpp (modified) (17 diffs)

gsdl/trunk/src/colservr/collectset.cpp

@@ -47 +47 @@
 #endif
 
-
-collectset::collectset (text_t &gsdlhome) {
+collectset::collectset (text_t& gsdlhome, text_t& collecthome) 
+{
+  // gsdlhome and collecthome will be set as a result of calling this function
+  // collecthome will default to "<gsdlhome>/collect" if not explicitly
+  // specified in config file
 
   text_tarray collections;
-  text_t      collectdir;
 
   // get gsdlhome (if we fail the error will be picked up later -- in
   // cgiwrapper)
 
-  if (site_cfg_read (gsdlhome, httpdomain, httpprefix)) {
+  if (site_cfg_read (gsdlhome, collecthome, httpdomain, httpprefix)) {
     if (!gsdlhome.empty() && directory_exists(gsdlhome)) {
-      collectdir = filename_cat (gsdlhome, "collect");
-      if (read_dir (collectdir, collections)) {
+      if (read_dir (collecthome, collections)) {
     
     text_tarray::const_iterator thiscol = collections.begin();
@@ -71 +72 @@
       }
 
-      this->add_collection (*thiscol, gsdlhome);
+      this->add_collection (*thiscol, gsdlhome, collecthome);
 
       ++thiscol;
     }
 
-    this->add_all_collection_groups(gsdlhome);
+    this->add_all_collection_groups(gsdlhome, collecthome);
       }
     }
@@ -112 +113 @@
       bool failed_build_cfg = false;
       if (!build_cfg_read (*((*here).second.c), configinfo.gsdlhome,
-               configinfo.collection)) {
+               configinfo.collecthome, configinfo.collection)) {
     failed_build_cfg = true;
 
     outconvertclass text_t2ascii;
     logout << text_t2ascii 
-           << "Warning: couldn't read build.cfg file for collection \"" //****
-           << configinfo.collection << "\", gsdlhome=\""
-           << configinfo.gsdlhome << "\"\n";
+           << "Warning: couldn't read build.cfg file for collection \"" 
+           << configinfo.collection << "\""
+           << "  gsdlhome=\"" << configinfo.gsdlhome << "\"\n"
+           << "  collecthome=\"" << configinfo.collecthome << "\"\n";
       }
 
       bool failed_collect_cfg = false;
       if (!collect_cfg_read (*((*here).second.c), configinfo.gsdlhome,
-                 configinfo.collection)) {
+                 configinfo.collecthome, configinfo.collection)) {
     failed_collect_cfg = true;
     outconvertclass text_t2ascii;
     logout << text_t2ascii 
            << "Warning: couldn't read collect.cfg file for collection \""
-           << configinfo.collection << "\", gsdlhome=\"" 
-           << configinfo.gsdlhome << "\"\n";
+           << configinfo.collection << "\""
+           << "  gsdlhome=\"" << configinfo.gsdlhome << "\"\n"
+           << "  collecthome=\"" << configinfo.collecthome << "\"\n";
       }
 
@@ -163 +166 @@
 
 
-void collectset::add_all_collections(const text_t &gsdlhome) {
-
+void collectset::add_all_collections(const text_t &gsdlhome, 
+                     const text_t& collecthome) 
+{
   text_tarray collections;
-  text_t collectdir = filename_cat(gsdlhome, "collect");
-  if (read_dir(collectdir, collections)) {
+
+  if (read_dir(collecthome, collections)) {
 
     text_tarray::const_iterator thiscol = collections.begin();
@@ -181 +185 @@
     
       // create collection server for this collection
-      this->add_collection (*thiscol, gsdlhome);
+      this->add_collection (*thiscol, gsdlhome, collecthome);
     
       ++thiscol;
     }
 
-    this->add_all_collection_groups(gsdlhome);
+    this->add_all_collection_groups(gsdlhome,collecthome);
   }
 }
@@ -192 +196 @@
 // add_collection sets up the collectionserver and calls
 // add_collectserver
-void collectset::add_collection (const text_t &collection, 
-                 const text_t &gsdlhome) {
+void collectset::add_collection (const text_t& collection, 
+                 const text_t& gsdlhome,
+                 const text_t& collecthome) 
+{
 
   this->remove_collection(collection);
@@ -203 +209 @@
   text_tarray cfgline;
   text_t key;
-  text_t build_cfg = filename_cat(gsdlhome, "collect", collection, "index", "build.cfg");
+
+  text_t build_cfg = filename_cat(collecthome, collection, "index", "build.cfg");
   char *build_cfgc = build_cfg.getcstr();
   ifstream confin(build_cfgc);
@@ -289 +296 @@
   else if (buildtype == "lucene") {
     lucenesearch = new lucenesearchclass();
-    lucenesearch->set_gsdlhome(gsdlhome);
+    lucenesearch->set_gsdlhome(gsdlhome); 
 
     // add a query filter
@@ -308 +315 @@
   cserver->configure ("collection", collection);
   cserver->configure ("gsdlhome", gsdlhome);
-
+  cserver->configure ("collecthome", collecthome); 
   cservers.addcollectserver (cserver);
 }
@@ -333 +340 @@
 
 void collectset::add_collection_group(const text_t& collection, 
-                      const text_t& gsdlhome)
+                      const text_t& gsdlhome,
+                      const text_t& collecthome)
 {
   text_tarray group;
-  text_t collect_group_dir = filename_cat (gsdlhome, "collect", collection);
+
+  text_t collect_group_dir = filename_cat (collecthome, collection);
 
   // need to read collect.cfg for 'collectgroup' as class hasn't been initialised through 'init' yet
@@ -342 +351 @@
   text_tarray cfgline;
   text_t key;
-  text_t build_cfg = filename_cat(gsdlhome, "collect", collection, "etc", "collect.cfg");
+  text_t build_cfg = filename_cat(collect_group_dir, "etc", "collect.cfg");
   char *collect_cfgc = build_cfg.getcstr();
   ifstream confin(collect_cfgc);
@@ -375 +384 @@
     }
     
-    this->add_collection (collection + "/" + *thiscol, gsdlhome);
+    text_t group_col = filename_cat(collection,*thiscol);
+    this->add_collection (group_col, gsdlhome, collecthome);
     
     ++thiscol;
@@ -383 +393 @@
 }
 
-void collectset::add_all_collection_groups (const text_t& gsdlhome) 
+void collectset::add_all_collection_groups (const text_t& gsdlhome,
+                        const text_t& collecthome) 
 
 {
@@ -391 +402 @@
   while (here != end) {
     text_t collection = (*here).second.c->get_collection_name();
-    this->add_collection_group(collection,gsdlhome);
+    this->add_collection_group(collection,gsdlhome,collecthome);
 
     ++here;
@@ -443 +454 @@
 void collectset::configure(const text_t &key, const text_tarray &cfgline)
 {
-  if (key == "collection" || key == "collectdir") return;
+  if ((key == "collection") || (key == "collectdir")) return;
 
   collectservermapclass::iterator here = cservers.begin();
@@ -453 +464 @@
       if (key == "collectinfo") {
     if ((*here).first == cfgline[0]) {
-      (*here).second.c->configure ("gsdlhome", cfgline[1]);
-      (*here).second.c->configure ("gdbmhome", cfgline[2]);
+      if (cfgline.size()==3) {
+        (*here).second.c->configure ("gsdlhome", cfgline[1]);
+        (*here).second.c->configure ("gdbmhome", cfgline[2]);
+      }
+      else {
+        (*here).second.c->configure ("gsdlhome", cfgline[1]);
+        (*here).second.c->configure ("collecthome", cfgline[2]);
+        (*here).second.c->configure ("gdbmhome", cfgline[3]);
+      }
     }
       } else {
@@ -479 +497 @@
   }
 }
+