Changeset 16347

Timestamp:

2008-07-10T14:46:12+12:00 (15 years ago)

Author:

davidb

Message:

Tidying up of some of the use of filename_cat

File:

• gsdl/trunk/src/recpt/maincfg.cpp (modified) (3 diffs)

gsdl/trunk/src/recpt/maincfg.cpp

@@ -47 +47 @@
 
   text_t collecthome = filename_cat(gsdlhome,"collect");
+
+  cerr << "Setting collecthome to be " << collecthome << endl;
+
+
   return main_cfg_read(recpt,gsdlhome,collecthome,collection);
 }
@@ -62 +66 @@
   text_t key, filename;
   text_tarray cfgline;
-  filename = filename_cat (gsdlhome, "etc");
-  filename = filename_cat (filename, "main.cfg");
+  filename = filename_cat (gsdlhome, "etc", "main.cfg");
   if (!collection.empty() && file_exists(filename)) {
     rv = recpt.read_configfile(filename);
   } else {
-    filename_cat (filename, gsdlhome, "etc", "main.cfg");
     if (file_exists (filename)) {
       rv = recpt.read_configfile(filename);
@@ -76 +78 @@
   // (if this is for a particular collection), and then GSDLHOME/etc.
   if (!collection.empty()) {
-    filename = filename_cat (collecthome, collection);
-    filename = filename_cat (filename, "etc");
-    filename = filename_cat (filename, "collect.cfg");
+    filename = filename_cat (collecthome, collection, "etc", "collect.cfg");
     if (!file_exists (filename)) {
-      filename = filename_cat (gsdlhome, "etc");
-      filename = filename_cat (filename, "collect.cfg");
+      filename = filename_cat (gsdlhome, "etc", "collect.cfg");
       if (!file_exists (filename)) filename.clear();
     }