Changeset 15418 for gsdl/trunk/src/recpt

Timestamp:

2008-05-13T15:12:45+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Untangling colservr/recpt) Split recpt/OIDtools into two: lib/OIDtools.cpp/h contains the purely string-based functions (may be used by the colservr), and recpt/recptprototools.cpp/h contains the functions requiring a call to the colservr (get_info() etc.).

Location:

gsdl/trunk/src/recpt

Files:

• Makefile.in (modified) (4 diffs)
• OIDtools.cpp (deleted)
• OIDtools.h (deleted)
• browseaction.cpp (modified) (1 diff)
• browsetoolsclass.cpp (modified) (1 diff)
• documentaction.cpp (modified) (1 diff)
• extlinkaction.cpp (modified) (1 diff)
• formattools.cpp (modified) (1 diff)
• historydb.cpp (modified) (1 diff)
• hlistbrowserclass.cpp (modified) (1 diff)
• pageaction.cpp (modified) (1 diff)
• pagedbrowserclass.cpp (modified) (1 diff)
• receptionist.cpp (modified) (1 diff)
• recptprototools.cpp (added)
• recptprototools.h (added)

gsdl/trunk/src/recpt/Makefile.in

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

gsdl/trunk/src/recpt/browseaction.cpp

@@ -30 +30 @@
 #include "querytools.h"
 #include "browseactiontools.h"
-#include "OIDtools.h"
+#include "recptprototools.h"
 
 browseaction::browseaction(){

gsdl/trunk/src/recpt/browsetoolsclass.cpp

@@ -28 +28 @@
 
 #include "browsetoolsclass.h"
+#include "recptprototools.h"
 #include "OIDtools.h"
 #include "gsdlunicode.h"

gsdl/trunk/src/recpt/documentaction.cpp

@@ -27 +27 @@
 
 #include "documentaction.h"
+#include "recptprototools.h"
 #include "OIDtools.h"
 #include "querytools.h"

gsdl/trunk/src/recpt/extlinkaction.cpp

@@ -29 +29 @@
 #include <string.h>
 #include "extlinkaction.h"
-#include "OIDtools.h"
+#include "recptprototools.h"
 #include "cgiutils.h"
 

gsdl/trunk/src/recpt/formattools.cpp

@@ -26 +26 @@
 #include "formattools.h"
 #include "cgiutils.h"
+#include "recptprototools.h"
 #include "OIDtools.h"
 #include "summarise.h"

gsdl/trunk/src/recpt/historydb.cpp

@@ -28 +28 @@
 #include "cgiutils.h"
 #include "recptproto.h"
-#include "OIDtools.h"
+#include "recptprototools.h"
 
 #define MAX_RECORDS 20

gsdl/trunk/src/recpt/hlistbrowserclass.cpp

@@ -26 +26 @@
 #include "hlistbrowserclass.h"
 #include <assert.h>
-#include "OIDtools.h"
+#include "recptprototools.h"
 
 hlistbrowserclass::hlistbrowserclass () {

gsdl/trunk/src/recpt/pageaction.cpp

@@ -33 +33 @@
 
 
-#include "OIDtools.h"
 #include "pageaction.h"
 #include "receptionist.h"
+#include "recptprototools.h"
 #include "fileutil.h"
 #include "gsdltools.h"

gsdl/trunk/src/recpt/pagedbrowserclass.cpp

@@ -29 +29 @@
 #include "pagedbrowserclass.h"
 #include <assert.h>
+#include "recptprototools.h"
 #include "OIDtools.h"
 #include "gsdltools.h"

gsdl/trunk/src/recpt/receptionist.cpp

@@ -29 +29 @@
 
 #include "receptionist.h"
+#include "recptprototools.h"
 #include "fileutil.h"
 #include "cgiutils.h"