Changeset 15402

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

Location:

gsdl/trunk

Files:

• lib/Makefile.in (modified) (1 diff)
• lib/gsdlsitecfg.cpp (added)
• lib/gsdlsitecfg.h (added)
• src/colservr/collectset.cpp (modified) (2 diffs)
• src/recpt/Makefile.in (modified) (4 diffs)
• src/recpt/cgiwrapper.cpp (modified) (2 diffs)
• src/recpt/librarymain.cpp (modified) (1 diff)
• src/recpt/maincfg.cpp (added)
• src/recpt/maincfg.h (added)
• src/recpt/recptconfig.cpp (deleted)
• src/recpt/recptconfig.h (deleted)

gsdl/trunk/lib/Makefile.in

@@ -89 +89 @@
 
 HEADERS = \
-  cfgread.h      fileutil.h     gsdlunicode.h  gsdltools.h text_t.h \
-  display.h      gsdlconf.h     gsdltimes.h    cnfgable.h  cnfgator.h \
-  phrases.h md5.h $(CORBAHEADERS)
+  cfgread.h        cnfgable.h       cnfgator.h     display.h \
+  fileutil.h       gsdlsitecfg.h    gsdltimes.h    gsdltools.h \
+  gsdlunicode.h    md5.h            phrases.h      text_t.h \
+  $(CORBAHEADERS)  gsdlconf.h
 
 
 SOURCES = \
-  cfgread.cpp      fileutil.cpp     text_t.cpp     cnfgable.cpp \
-  display.cpp      gsdlunicode.cpp  gsdltimes.cpp  gsdltools.cpp \
-  cnfgator.cpp     phrases.cpp  md5.cpp $(CORBASOURCES)
+  cfgread.cpp      cnfgable.cpp     cnfgator.cpp   display.cpp \
+  fileutil.cpp     gsdlsitecfg.cpp  gsdltimes.cpp  gsdltools.cpp \
+  gsdlunicode.cpp  md5.cpp          phrases.cpp    text_t.cpp \
+  $(CORBASOURCES)
 
 OBJECTS = \
-  cfgread.o        fileutil.o       text_t.o     cnfgable.o \
-  display.o        gsdlunicode.o    gsdltimes.o  gsdltools.o \
-  cnfgator.o       phrases.o    md5.o $(CORBAOBJECTS)
+  cfgread.o        cnfgable.o       cnfgator.o     display.o \
+  fileutil.o       gsdlsitecfg.o    gsdltimes.o    gsdltools.o \
+  gsdlunicode.o    md5.o            phrases.o      text_t.o \
+  $(CORBAOBJECTS)
 
 

gsdl/trunk/src/colservr/collectset.cpp

@@ -25 +25 @@
 
 
+#include "collectset.h"
 #include "collectserver.h"
+#include "colservrconfig.h"
+#include "gsdlsitecfg.h"
 #include "filter.h"
 #include "browsefilter.h"
@@ -39 +42 @@
 #include <assert.h>
 
-#include "colservrconfig.h"
-#include "recptconfig.h"
-#include "fileutil.h"
-#include "collectset.h"
 
 collectset::collectset (text_t &gsdlhome) {

gsdl/trunk/src/recpt/Makefile.in

@@ -158 +158 @@
 
 COMMONHEADERS = receptionist.h cgiwrapper.h cgiargs.h action.h browserclass.h \
-                converter.h recptconfig.h cgiutils.h OIDtools.h browsetoolsclass.h \
+                converter.h maincfg.h cgiutils.h OIDtools.h browsetoolsclass.h \
         statusaction.h pageaction.h comtypes.h recptproto.h \
         pingaction.h queryaction.h documentaction.h  \
@@ -180 +180 @@
 
 COMMONSOURCES = receptionist.cpp cgiwrapper.cpp cgiargs.cpp action.cpp browserclass.cpp \
-                converter.cpp recptconfig.cpp cgiutils.cpp OIDtools.cpp browsetoolsclass.cpp \
+                converter.cpp maincfg.cpp cgiutils.cpp OIDtools.cpp browsetoolsclass.cpp \
         statusaction.cpp pageaction.cpp comtypes.cpp  \
         recptproto.cpp pingaction.cpp queryaction.cpp documentaction.cpp \
@@ -213 +213 @@
 
 COMMONOBJECTS = receptionist.o cgiwrapper.o cgiargs.o action.o browserclass.o \
-                converter.o recptconfig.o cgiutils.o OIDtools.o browsetoolsclass.o \
+                converter.o maincfg.o cgiutils.o OIDtools.o browsetoolsclass.o \
         statusaction.o pageaction.o comtypes.o \
         recptproto.o pingaction.o queryaction.o documentaction.o \
@@ -393 +393 @@
 test:
 
-Z3950_OBJS = comtypes.o recptproto.o infodbclass.o OIDtools.o recptconfig.o \
+Z3950_OBJS = comtypes.o recptproto.o infodbclass.o OIDtools.o maincfg.o \
      $(COLSERVROBJECTS) \
     ../colservr/z3950parser.o ../colservr/z3950explain.o \

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

gsdl/trunk/src/recpt/librarymain.cpp

@@ -27 +27 @@
 #include "receptionist.h"
 #include "cgiwrapper.h"
-#include "recptconfig.h"
 #include "fileutil.h"
 #include "nullproto.h"