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

gsdl/trunk/src/recpt/cgiwrapper.cpp

@@ -129 +129 @@
 static void page_errorcollect (const text_t &gsdlhome, text_t &errorpage, bool debug) {
 
-  text_t collectdir = filename_cat (gsdlhome, "collect");
+  text_t collecthome = filename_cat (gsdlhome, "collect");
 
   text_t errortext = "No valid collections were found: Check that your collect directory\n";
-  errortext += "(" + collectdir + ") is readable and contains at least one valid collection.\n";
+  errortext += "(" + collecthome + ") is readable and contains at least one valid collection.\n";
   errortext += "Note that modelcol is NOT a valid collection.\n";
   errortext += "If the path to your collect directory is wrong edit the 'gsdlhome' field\n";
@@ -301 +301 @@
   bool colspec = false;
   if (configinfo.collection.empty()) {
-    cout << "Receptionist is running in \"general\" (i.e. not \"collection\n"
+    cout << "Receptionist is running in \"general\" (i.e. not \"collection "
      << "specific\") mode.\n";
   } else {
@@ -311 +311 @@
   }
   
-  cout << text_t2ascii << "gsdlhome=" << configinfo.gsdlhome << "\n";
+  cout << text_t2ascii << "  gsdlhome=" << configinfo.gsdlhome << "\n";
+  if (!configinfo.collecthome.empty())
+    cout << text_t2ascii << "  collecthome=" << configinfo.collecthome << "\n";
   if (!configinfo.dbhome.empty())
-    cout << text_t2ascii << "dbhome=" << configinfo.dbhome << "\n";
-  cout << text_t2ascii << "httpprefix=" << configinfo.httpprefix << "\n";
-  cout << text_t2ascii << "httpimg=" << configinfo.httpimg << "\n";
-  cout << text_t2ascii << "gwcgi=" << configinfo.gwcgi << "\n"
+    cout << text_t2ascii << "  dbhome=" << configinfo.dbhome << "\n";
+  cout << text_t2ascii << "  httpprefix=" << configinfo.httpprefix << "\n";
+  cout << text_t2ascii << "  httpimg=" << configinfo.httpimg << "\n";
+  cout << text_t2ascii << "  gwcgi=" << configinfo.gwcgi << "\n\n"
        << "  Note that unless gwcgi has been set from a configuration\n"
        << "  file it is dependent on environment variables set by your\n"
@@ -483 +485 @@
   // read in the configuration files.
   text_t gsdlhome;
+  text_t collecthome;
   configurator gsdlconfigurator(&recpt);
-  if (!site_cfg_read (gsdlconfigurator, gsdlhome, maxrequests)) {
+  if (!site_cfg_read (gsdlconfigurator, gsdlhome, collecthome, maxrequests)) {
     // couldn't find the site configuration file
     page_errorsitecfg (errorpage, debug, 0);
@@ -493 +496 @@
     // gsdlhome not a valid directory
     page_errorsitecfg (errorpage, debug, 1);
-  } else if (!main_cfg_read (recpt, gsdlhome, collection)) {
+  } else if (!main_cfg_read (recpt, gsdlhome, collecthome, collection)) {
     // couldn't find the main configuration file
     page_errormaincfg (gsdlhome, collection, debug, errorpage);