Changeset 16310 for gsdl/trunk/src/recpt/wizardaction.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/wizardaction.cpp (modified) (6 diffs)

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;