Changeset 16310 for gsdl/trunk/src/recpt/receptionist.cpp

Timestamp:

2008-07-09T13:12:15+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/recpt/receptionist.cpp (modified) (7 diffs)

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)) {