Changeset 16310 for gsdl/trunk/src/lib/gsdlsitecfg.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/lib/gsdlsitecfg.cpp (modified) (11 diffs)

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;