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

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