Changeset 963

Timestamp:

2000-02-22T11:01:02+13:00 (24 years ago)

Author:

sjboddie

Message:

gsdlhome now comes from gsdlsite.cfg

Location:

trunk/gsdl/src/recpt

Files:

• buildaction.cpp (modified) (10 diffs)
• cgiwrapper.cpp (modified) (18 diffs)
• historydb.cpp (modified) (8 diffs)
• historydb.h (modified) (2 diffs)
• librarymain.cpp (modified) (6 diffs)
• recptconfig.cpp (modified) (4 diffs)
• recptconfig.h (modified) (2 diffs)

trunk/gsdl/src/recpt/buildaction.cpp

@@ -30 +30 @@
 #include "htmlutils.h"
 #include "buildaction.h"
-#include "gsdlhome.h"
 
 ///////////////
@@ -103 +102 @@
     logout << "The page action does not contain information\n"
            << "about any receptionists. The method set_receptionist\n"
-           <<   "was probably not called from the module which instantiated\n"
-           <<   "this page action.\n";
+           << "was probably not called from the module which instantiated\n"
+           << "this page action.\n";
     return;
   }
@@ -111 +110 @@
   if (rprotolist == NULL) return;
   
-  const recptconf &rcinfo = recpt->get_configinfo ();
-
   // build up javascript and HTML code useful in web forms
   text_t first_dirname = "";
@@ -193 +190 @@
         // check to see if the "collection" is writable
         text_t cfg_fname 
-          = filename_cat(GSDL_GSDLHOME,"collect",*collist_here,"etc","collect.cfg");
+          = filename_cat(gsdlhome, "collect", *collist_here, "etc", "collect.cfg");
         if (!file_writable(cfg_fname))
           {
@@ -276 +273 @@
   // set macro cfgperm based on whether config file can be read or no
   text_t dirname = (args["bc1dirname"] == "") ? first_dirname : args["bc1dirname"];
-  text_t cfg_fname = filename_cat(rcinfo.gsdlhome,"collect",dirname,"etc","collect.cfg");
+  text_t cfg_fname = filename_cat(gsdlhome, "collect", dirname, "etc", "collect.cfg");
   text_t cfgperm = (file_writable(cfg_fname)) ? "read/write" : "readonly";
   disp.setmacro("cfgperm","build",cfgperm);
@@ -288 +285 @@
       // read in collect.cfg      
       text_t cfg_fname 
-    = filename_cat(GSDL_GSDLHOME,"collect",dirname,"etc","collect.cfg");
+    = filename_cat(gsdlhome, "collect", dirname, "etc", "collect.cfg");
       ifstream cfg_ifs (cfg_fname.getcstr(), ios::in | ios::nocreate);
       if (cfg_ifs) 
@@ -323 +320 @@
 
       // read in collect.bld
-      text_t bld_fname = filename_cat(rcinfo.gsdlhome,"log",dirname+".bld");
+      text_t bld_fname = filename_cat(gsdlhome, "log", dirname+ ".bld");
       ifstream bld_ifs (bld_fname.getcstr(), ios::in | ios::nocreate);
       if (bld_ifs) 
@@ -356 +353 @@
                  ostream &logout) {
 
+  // make sure we know about a receptionist
+  if (recpt == NULL) {
+    logout << "The page action does not contain information\n"
+           << "about any receptionists. The method set_receptionist\n"
+           << "was probably not called from the module which instantiated\n"
+           << "this page action.\n";
+    return false;
+  }
 
   if (args["bca"] == "newcol") {
@@ -419 +424 @@
                    outconvertclass &outconvert, ostream &textout, 
                    ostream &logout) {
+
+
 
 
@@ -448 +455 @@
   
       textout << outconvert << disp << headmess << content << "_build:framefooter_\n";
-
-      text_t cmd = filename_cat(GSDL_GSDLHOME,"cgi-bin","webpage_buildcol.pl");
+      text_t cmd = filename_cat(gsdlhome, "cgi-bin", "webpage_buildcol.pl");
       cmd += " gsdlhome=\""+args["gsdlhome"]+"\" httpbuild=\""+args["httpbuild"]+"\"";
       cmd += " bc1copydata=\""+args["bc1copydata"]+"\"";

trunk/gsdl/src/recpt/cgiwrapper.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.22  2000/02/21 21:56:46  sjboddie
+   gsdlhome now comes from gsdlsite.cfg
+
    Revision 1.21  2000/01/25 22:45:59  sjboddie
    few changes to get fastcgi to work properly
@@ -120 +123 @@
 #include "cgiwrapper.h"
 #include "recptconfig.h"
+#include "fileutil.h"
 #include <stdlib.h>
 #include <assert.h>
-
-
-// get GSDL_GSDLHOME
-#include "gsdlhome.h"
-
 
 #if defined(GSDL_USE_OBJECTSPACE)
@@ -193 +192 @@
 
 
-static void page_errorsitecfg (const text_t &gsdlhome, const text_t &collection,
-                   text_t &errorpage) {
+static void page_errorsitecfg (text_t &errorpage, int mode) {
   errorpage += "Content-type: text/html\n\n";
 
@@ -203 +201 @@
   errorpage += "<body>\n";
   errorpage += "<h2>Oops!</h2>\n";
-  errorpage += "The site.cfg configuration file could not be found. This file\n";
-  errorpage += "should contain configuration information relating to this\n";
-  errorpage += "site's setup. ";
-  if (collection.empty()) {
-    errorpage += "As this cgi script is not being run in collection specific mode,\n";
-    errorpage += "the file should reside at ";
-    errorpage += gsdlhome;
-    errorpage += "/etc/site.cfg.\n";
-  } else {
-    errorpage += "As this cgi script is being run in collection specific mode,\n";
-    errorpage += "the file can reside in ";
-    errorpage += gsdlhome;
-    errorpage += "/collect/";
-    errorpage += collection;
-    errorpage += "/etc/site.cfg or ";
-    errorpage += gsdlhome;
-    errorpage += "/etc/site.cfg.\n";
+  if (mode == 0) {
+    errorpage += "The gsdlsite.cfg configuration file could not be found. This file\n";
+    errorpage += "should contain configuration information relating to this\n";
+    errorpage += "site's setup.\n";
+    errorpage += "gsdlsite.cfg should reside in the same directory as this executable\n";
+  } else if (mode == 1) {
+    errorpage += "The gsdlsite.cfg configuration file does not contain a valid gsdlhome\n";
+    errorpage += "entry.\n";
+    errorpage += "gsdlsite.cfg resides in the same directory as this executable\n";
   }
   errorpage += "</body>\n";
@@ -237 +227 @@
   errorpage += "<h2>Oops!</h2>\n";
   if (collection.empty()) {
+    text_t main_cfg_file = filename_cat (gsdlhome, "etc", "main.cfg");
     errorpage += "The main.cfg configuration file could not be found. This file\n";
     errorpage += "should contain configuration information relating to the\n";
     errorpage += "setup of the interface. As this cgi script is not being run\n";
     errorpage += "in collection specific mode the file should reside at\n";
-    errorpage += gsdlhome;
-    errorpage += "/etc/main.cfg.\n";
+    errorpage += main_cfg_file + ".\n";
   } else {
-    errorpage += "Neither the collect.cfg or main.cfg configuration files could\n";
+    text_t collect_cfg_file = filename_cat (gsdlhome, "collect", collection, "etc", "collect.cfg");
+    text_t main_collect_cfg_file = filename_cat (gsdlhome, "etc", "collect.cfg");
+    text_t main_cfg_file = filename_cat (gsdlhome, "etc", "main.cfg");
+    errorpage += "Either the collect.cfg or main.cfg configuration file could\n";
     errorpage += "not be found. This file should contain configuration information\n";
     errorpage += "relating to the setup of the interface. As this cgi script is\n";
     errorpage += "being run in collection specific mode the file should reside\n";
     errorpage += "at either ";
-    errorpage += gsdlhome;
-    errorpage += "/collect/";
-    errorpage += collection;
-    errorpage += "/etc/collect.cfg, ";
-    errorpage += gsdlhome;
-    errorpage += "/etc/collect.cfg or ";
-    errorpage += gsdlhome;
-    errorpage += "/etc/main.cfg.\n";
+    errorpage += collect_cfg_file + ",\n";
+    errorpage += main_collect_cfg_file + " or " + main_cfg_file + ".\n";
   }
   errorpage += "</body>\n";
@@ -263 +250 @@
 
 
-static void page_errorinit (const text_t &/*gsdlhome*/, text_t &errorpage) {
+static void page_errorinit (const text_t &gsdlhome, text_t &errorpage) {
   errorpage += "Content-type: text/html\n\n";
 
@@ -276 +263 @@
   errorpage += "correctly.\n";
 
-  ifstream initin (GSDL_GSDLHOME "/etc/initout.txt");
+  text_t init_file = filename_cat (gsdlhome, "etc", "initout.txt");
+  char *ifile = init_file.getcstr();
+  ifstream initin (ifile);
+  delete ifile;
   if (initin) {
-    errorpage += "The initialisation error log, " GSDL_GSDLHOME "/etc/initout.txt, contains the\n";
+    errorpage += "The initialisation error log, " + init_file + ", contains the\n";
     errorpage += "following information:\n\n";
     errorpage += "<pre>\n";
@@ -294 +284 @@
 
   } else {
-    errorpage += "Please consult " GSDL_GSDLHOME "/etc/initout.txt for more information.\n";
+    errorpage += "Please consult " + init_file + " for more information.\n";
   }
 
@@ -301 +291 @@
 }
 
-static void page_errorparseargs (const text_t &/*gsdlhome*/, text_t &errorpage) {
+static void page_errorparseargs (const text_t &gsdlhome, text_t &errorpage) {
   errorpage += "Content-type: text/html\n\n";
 
@@ -312 +302 @@
   errorpage += "An error occurred during the parsing of the cgi arguments.\n";
 
-  ifstream errin (GSDL_GSDLHOME "/etc/errout.txt");
+  text_t error_file = filename_cat (gsdlhome, "etc", "errout.txt");
+  char *efile = error_file.getcstr();
+  ifstream errin (efile);
+  delete efile;
   if (errin) {
-    errorpage += "The error log, " GSDL_GSDLHOME "/etc/errout.txt, contains the\n";
+    errorpage += "The error log, " + error_file + ", contains the\n";
     errorpage += "following information:\n\n";
     errorpage += "<pre>\n";
@@ -328 +321 @@
 
   } else {
-    errorpage += "Please consult " GSDL_GSDLHOME "/etc/errout.txt for more information.\n";
+    errorpage += "Please consult " + error_file + " for more information.\n";
   }
 
@@ -335 +328 @@
 }
 
-static void page_errorcgipage (const text_t &/*gsdlhome*/, text_t &errorpage) {
+static void page_errorcgipage (const text_t &gsdlhome, text_t &errorpage) {
   errorpage += "Content-type: text/html\n\n";
 
@@ -346 +339 @@
   errorpage += "An error occurred during the construction of the cgi page.\n";
 
-  ifstream errin (GSDL_GSDLHOME "/etc/errout.txt");
+
+  text_t error_file = filename_cat (gsdlhome, "etc", "errout.txt");
+  char *efile = error_file.getcstr();
+  ifstream errin (efile);
+  delete efile;
   if (errin) {
-    errorpage += "The error log, " GSDL_GSDLHOME "/etc/errout.txt, contains the\n";
+    errorpage += "The error log, " + error_file + ", contains the\n";
     errorpage += "following information:\n\n";
     errorpage += "<pre>\n";
@@ -362 +359 @@
 
   } else {
-    errorpage += "Please consult " GSDL_GSDLHOME "/etc/errout.txt for more information.\n";
+    errorpage += "Please consult " + error_file + " for more information.\n";
   }
 
@@ -386 +383 @@
   // set defaults
   int maxrequests = 10000;
-  recpt.configure ("gsdlhome", GSDL_GSDLHOME);
   recpt.configure ("collection", collection);
   recpt.configure ("httpimg", "/gsdl/images");
@@ -394 +390 @@
 
   // read in the configuration files.
-  if (!site_cfg_read (recpt, GSDL_GSDLHOME, collection, maxrequests)) {
+  text_t gsdlhome;
+  if (!site_cfg_read (recpt, gsdlhome, maxrequests)) {
     // couldn't find the site configuration file
-    page_errorsitecfg (GSDL_GSDLHOME, collection, errorpage);
-  } else if (!main_cfg_read (recpt, GSDL_GSDLHOME, collection)) {
+    page_errorsitecfg (errorpage, 0);
+  } else if (gsdlhome.empty()) {
+    // no gsdlhome in gsdlsite.cfg
+    page_errorsitecfg (errorpage, 1);
+  } else if (!main_cfg_read (recpt, gsdlhome, collection)) {
     // couldn't find the main configuration file
-    page_errormaincfg (GSDL_GSDLHOME, collection, errorpage);
+    page_errormaincfg (gsdlhome, collection, errorpage);
   }
 
   // initialise the library software
   if (errorpage.empty()) {
-    ofstream initout (GSDL_GSDLHOME "/etc/initout.txt");
+    text_t init_file = filename_cat (gsdlhome, "etc", "initout.txt");
+    char *iout = init_file.getcstr();
+    ofstream initout (iout);
+    delete iout;
     if (!recpt.init(initout)) {
       // an error occurred during the initialisation
       initout.close();
-      page_errorinit(GSDL_GSDLHOME, errorpage);
+      page_errorinit(gsdlhome, errorpage);
     }
     initout.close();
@@ -523 +526 @@
 
     if (errorpage.empty()) {
-      ofstream errout (GSDL_GSDLHOME "/etc/errout.txt");
+      text_t error_file = filename_cat (gsdlhome, "etc", "errout.txt");
+      char *eout = error_file.getcstr();
+      ofstream errout (eout);
+      delete eout;
       cerr = errout;
     
@@ -530 +536 @@
       if (!recpt.parse_cgi_args (argstr, args, errout, fastcgienv)) {
     errout.close ();
-    page_errorparseargs(GSDL_GSDLHOME, errorpage);
+    page_errorparseargs(gsdlhome, errorpage);
       } else {
     if (!recpt.produce_cgi_page (args, pageout, errout, fastcgienv)) {
       errout.close ();
-      page_errorcgipage(GSDL_GSDLHOME, errorpage);
+      page_errorcgipage(gsdlhome, errorpage);
     } else {
       errout.close ();

trunk/gsdl/src/recpt/historydb.cpp

@@ -28 +28 @@
 /*
   $Log$
+  Revision 1.3  2000/02/21 22:01:02  sjboddie
+  gsdlhome now comes from gsdlsite.cfg
+
   Revision 1.2  2000/02/17 02:40:21  sjboddie
   tidied up a bit - fixed a bug (gdbm file wasn't always being closed properly)
@@ -35 +38 @@
 
 #include "historydb.h"
-#include "gsdlhome.h"
 #include "fileutil.h"
 #include "cgiutils.h"
@@ -44 +46 @@
 // returns true on success (in which case historyinfo will contain
 // the information for this history)
-bool get_history_info (const text_t &userid, text_tarray &historyinfo, ostream &logout) {
-
-  text_t historyfile = filename_cat(GSDL_GSDLHOME, "etc", "history.db");
+bool get_history_info (const text_t &userid, text_tarray &historyinfo, 
+               const text_t &gsdlhome, ostream &logout) {
+
+  text_t historyfile = filename_cat(gsdlhome, "etc", "history.db");
   
   bool result = false;
@@ -74 +77 @@
 
 // returns true on success
-bool set_history_info (const text_t &userid, const text_t &history) {
-
-  text_t historyfile = filename_cat(GSDL_GSDLHOME, "etc", "history.db");
+bool set_history_info (const text_t &userid, const text_t &history, const text_t &gsdlhome) {
+
+  text_t historyfile = filename_cat(gsdlhome, "etc", "history.db");
   
   bool result = false;
@@ -126 +129 @@
 
 // deletes all a users history
-bool delete_all_history_info (const text_t &userid) {
-
-  text_t historyfile = filename_cat(GSDL_GSDLHOME, "etc", "history.db");
+bool delete_all_history_info (const text_t &userid, const text_t &gsdlhome) {
+
+  text_t historyfile = filename_cat(gsdlhome, "etc", "history.db");
   
   // open the history database  
@@ -142 +145 @@
 
 //deletes only the selected records
-bool delete_history_info(const text_t &userid, const text_t &deletemode, const text_t &selection) {
-
-  text_t historyfile = filename_cat(GSDL_GSDLHOME, "etc", "history.db");
+bool delete_history_info (const text_t &userid, const text_t &deletemode, 
+              const text_t &selection, const text_t &gsdlhome) {
+
+  text_t historyfile = filename_cat(gsdlhome, "etc", "history.db");
   bool result;
   // open the history database  
@@ -305 +309 @@
 // replaces a reference to a previous query with the search
 // string from that query
-bool combine_query(text_t &userid, text_t &query) 
+bool combine_query(text_t &userid, text_t &query, const text_t &gsdlhome) 
 {
   text_t::iterator begin = query.begin();
@@ -314 +318 @@
  
   text_t queryresult = "";
-  text_t historyfile = filename_cat(GSDL_GSDLHOME, "etc", "history.db");
+  text_t historyfile = filename_cat(gsdlhome, "etc", "history.db");
   text_t historyresult;
   // open the history database  

trunk/gsdl/src/recpt/historydb.h

@@ -51 +51 @@
 // returns true on success (in which case historyinfo will contain
 // the information for this history)
-bool get_history_info ( const text_t &userid, text_tarray &historyinfo, ostream &logout);
+bool get_history_info (const text_t &userid, text_tarray &historyinfo, 
+               const text_t &gsdlhome, ostream &logout);
 
 // returns true on success
-bool set_history_info (const text_t &userid, const text_t &historyinfo);
+bool set_history_info (const text_t &userid, const text_t &historyinfo, 
+               const text_t &gsdlhome);
 
-bool delete_all_history_info (const text_t &userid);
+bool delete_all_history_info (const text_t &userid, const text_t &gsdlhome);
 
 // deletes only the entries specified
 bool delete_history_info(const text_t &userid, const text_t &deletemode,
-             const text_t &selection);
+             const text_t &selection, const text_t &gsdlhome);
 
 // takes a text_t with x-y, and retrieves the x and y params
@@ -72 +74 @@
 // second version looks it up inthe records map (used in
 // delete history -are doing a lotof #x replacing at once.
-bool combine_query(text_t &userid, text_t &query);
+bool combine_query(text_t &userid, text_t &query, const text_t &gsdlhome);
 bool combine_query(text_t &userid, HistRecordmap  &records);
 

trunk/gsdl/src/recpt/librarymain.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.23  2000/02/21 21:59:37  sjboddie
+   gsdlhome now comes from gsdlsite.cfg
+
    Revision 1.22  2000/02/17 02:35:48  sjboddie
    tidied up a bit
@@ -138 +141 @@
 #include "htmlbrowserclass.h"
 
-#include "gsdlhome.h"
+#include "recptconfig.h"
 
 int main () {
   receptionist recpt;
   nullproto nproto;
-
   text_tarray collections;
-  if (!read_dir (GSDL_GSDLHOME "/collect", collections)) exit (1);
+
+  // get gsdlhome (if we fail the error will be picked up later -- in
+  // cgiwrapper)
+  text_t gsdlhome;
+  if (site_cfg_read (gsdlhome)) {
+    text_t collectdir = filename_cat (gsdlhome, "collect");
+    if (!read_dir (collectdir, collections)) exit (1);
+  }
 
   text_tarray::const_iterator thiscol = collections.begin();
   text_tarray::const_iterator endcol = collections.end();
-
+  
   while (thiscol != endcol) {
-
+    
     // ignore the modelcol
-    if (*thiscol == "modelcol") {
-      thiscol ++;
-      continue;
-    }
-
+    if (*thiscol == "modelcol") {thiscol ++; continue;}
+    
     // this memory is created but never destroyed
     // we're also not doing any error checking to make sure we didn't
@@ -168 +174 @@
     filterclass *filter = new filterclass ();
     cserver->add_filter (filter);
-    
+      
     // add a browse filter
     browsefilterclass *browsefilter = new browsefilterclass();
@@ -179 +185 @@
     queryfilter->set_mgsearchptr (mgsearch);
     cserver->add_filter (queryfilter);
-
+    
     // add a mg and gdbm source
     mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass ();
@@ -196 +202 @@
   // add the protocol to the receptionist
   recpt.add_protocol (&nproto);
-
+  
   // add other converters
   utf8inconvertclass utf8inconvert;
@@ -202 +208 @@
   recpt.add_converter ("u", &utf8inconvert, &utf8outconvert);
 
-  mapinconvertclass gbinconvert;
-  gbinconvert.setmapfile (GSDL_GSDLHOME, "gbku", 0x25a1);
-  mapoutconvertclass gboutconvert;
-  gboutconvert.setmapfile (GSDL_GSDLHOME, "ugbk", 0xa1f5);
-  recpt.add_converter ("g", &gbinconvert, &gboutconvert);
+  if (!gsdlhome.empty()) {
+    mapinconvertclass gbinconvert;
+    gbinconvert.setmapfile (gsdlhome, "gbku", 0x25a1);
+    mapoutconvertclass gboutconvert;
+    gboutconvert.setmapfile (gsdlhome, "ugbk", 0xa1f5);
+    recpt.add_converter ("g", &gbinconvert, &gboutconvert);
+  }
 
   // the list of actions. Note: these actions will become invalid

trunk/gsdl/src/recpt/recptconfig.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.6  2000/02/21 21:55:33  sjboddie
+   gsdlhome now comes from gsdlsite.cfg
+
    Revision 1.5  1999/09/07 04:56:59  sjboddie
    added GPL notice
@@ -67 +70 @@
 
 // reads site configuration file returning true on success
-bool site_cfg_read (receptionist &recpt, const text_t &gsdlhome,
-             const text_t &collection, int &maxrequests) {
+// also sets gsdlhome and maxrequests 
+// gsdlsite.cfg should be in same directory as library executable
+bool site_cfg_read (receptionist &recpt, text_t &gsdlhome, int &maxrequests) {
 
-  maxrequests = 10000; // a reasonable default
+  gsdlhome.clear();
 
-  // Look for site.cfg in GSDLHOME/collect/collection-name/etc directory 
-  // (if this is for a particular collection), and then GSDLHOME/etc.
-  text_t filename;
-  if (!collection.empty()) {
-    filename = filename_cat (gsdlhome, "collect");
-    filename = filename_cat (filename, collection);
-    filename = filename_cat (filename, "etc");
-    filename = filename_cat (filename, "site.cfg");
-    if (!file_exists (filename)) filename.clear();
-  }
-  if (filename.empty()) {
-    filename = filename_cat (gsdlhome, "etc");
-    filename = filename_cat (filename, "site.cfg");
-    if (!file_exists (filename)) return false;
-  }
-
-  // read in the site configuration file
+  // Look for gsdlsite.cfg in same directory that executable is in.
   text_tarray cfgline;
   text_t key;
-  char *cstr = filename.getcstr();
-  ifstream confin (cstr);
-  delete cstr;
+  ifstream confin ("gsdlsite.cfg");
 
   if (confin) {
@@ -100 +86 @@
     key = cfgline[0];
     cfgline.erase(cfgline.begin());
-
+    
     if (key == "maxrequests") {
       maxrequests = cfgline[0].getint();
       if (maxrequests < 1) maxrequests = 1;
     }
+
+    if (key == "gsdlhome")
+      gsdlhome = cfgline[0];
 
     // configure the receptionist
@@ -116 +105 @@
 }
 
+// this version just grabs gsdlhome, returns false if it can't find it
+bool site_cfg_read (text_t &gsdlhome) {
+
+  gsdlhome.clear();
+
+  // Look for gsdlsite.cfg in same directory that executable is in.
+  text_tarray cfgline;
+  text_t key;
+  ifstream confin ("gsdlsite.cfg");
+
+  if (confin) {
+    while (read_cfg_line(confin, cfgline) >= 0) {
+      if (cfgline.size () >= 2) {
+    if (cfgline[0] == "gsdlhome") {
+      gsdlhome = cfgline[1];
+      return true;
+    }
+      }
+    }
+    confin.close ();
+  }
+  return false;
+}
 
 // main_cfg_read reads both main.cfg and collect.cfg. It attempts

trunk/gsdl/src/recpt/recptconfig.h

@@ -37 +37 @@
 
 // reads site configuration file returning true on success
-bool site_cfg_read (receptionist &recpt, const text_t &gsdlhome,
-             const text_t &collection, int &maxrequests);
+bool site_cfg_read (receptionist &recpt, text_t &gsdlhome, int &maxrequests);
+bool site_cfg_read (text_t &gsdlhome);
 
 // main_cfg_read reads either collect.cfg or main.cfg and returning 
@@ -44 +44 @@
 // collection is specified and then it tries to read in main.cfg
 bool main_cfg_read (receptionist &recpt, const text_t &gsdlhome,
-             const text_t &collection);
+            const text_t &collection);