Changeset 15402 for gsdl/trunk/src/recpt/cgiwrapper.cpp

Timestamp:

2008-05-13T12:04:17+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Untangling colservr/recpt) Split recpt/recptconfig into two: lib/gsdlsitecfg (reads gsdlsite.cfg file; used by both colservr and recpt) and recpt/maincfg (reads main.cfg file; used by recpt only).

File:

• gsdl/trunk/src/recpt/cgiwrapper.cpp (modified) (2 diffs)

gsdl/trunk/src/recpt/cgiwrapper.cpp

@@ -31 +31 @@
 #include "gsdlconf.h"
 #include "cgiwrapper.h"
-#include "recptconfig.h"
+#include "gsdlsitecfg.h"
+#include "maincfg.h"
 #include "fileutil.h"
 #include "cgiutils.h"
@@ -482 +483 @@
   // read in the configuration files.
   text_t gsdlhome;
-  if (!site_cfg_read (recpt, gsdlhome, maxrequests)) {
+  configurator gsdlconfigurator(&recpt);
+  if (!site_cfg_read (gsdlconfigurator, gsdlhome, maxrequests)) {
     // couldn't find the site configuration file
     page_errorsitecfg (errorpage, debug, 0);