Changeset 15418

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

Files:

• lib/Makefile.in (modified) (1 diff)
• lib/OIDtools.cpp (added)
• lib/OIDtools.h (added)
• lib/win32.mak (modified) (1 diff)
• src/oaiservr/Makefile.in (modified) (1 diff)
• src/oaiservr/win32.mak (modified) (1 diff)
• src/recpt/Makefile.in (modified) (4 diffs)
• src/recpt/OIDtools.cpp (deleted)
• src/recpt/OIDtools.h (deleted)
• src/recpt/browseaction.cpp (modified) (1 diff)
• src/recpt/browsetoolsclass.cpp (modified) (1 diff)
• src/recpt/documentaction.cpp (modified) (1 diff)
• src/recpt/extlinkaction.cpp (modified) (1 diff)
• src/recpt/formattools.cpp (modified) (1 diff)
• src/recpt/historydb.cpp (modified) (1 diff)
• src/recpt/hlistbrowserclass.cpp (modified) (1 diff)
• src/recpt/pageaction.cpp (modified) (1 diff)
• src/recpt/pagedbrowserclass.cpp (modified) (1 diff)
• src/recpt/receptionist.cpp (modified) (1 diff)
• src/recpt/recptprototools.cpp (added)
• src/recpt/recptprototools.h (added)

gsdl/trunk/lib/Makefile.in

@@ -91 +91 @@
   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
-
+  gsdlunicode.h    md5.h            OIDtools.h     phrases.h \
+  text_t.h         $(CORBAHEADERS)  gsdlconf.h
 
 SOURCES = \
   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)
+  gsdlunicode.cpp  md5.cpp          OIDtools.cpp   phrases.cpp \
+  text_t.cpp       $(CORBASOURCES)
 
 OBJECTS = \
   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)
+  gsdlunicode.o    md5.o            OIDtools.o     phrases.o \
+  text_t.o         $(CORBAOBJECTS)
 
 

gsdl/trunk/lib/win32.mak

@@ -71 +71 @@
     $(COMPILE) $< 
 
-HEADERS = cfgread.h fileutil.h gsdlunicode.h text_t.h display.h gsdlconf.h \
-      gsdlsitecfg.h gsdltimes.h gsdltools.h cnfgable.h cnfgator.h phrases.h md5.h
+HEADERS = \
+  cfgread.h        cnfgable.h       cnfgator.h     display.h \
+  fileutil.h       gsdlsitecfg.h    gsdltimes.h    gsdltools.h \
+  gsdlunicode.h    md5.h            OIDtools.h     phrases.h \
+  text_t.h         gsdlconf.h
 
-SOURCES = cfgread.cpp fileutil.cpp gsdlunicode.cpp text_t.cpp display.cpp \
-      gsdlsitecfg.cpp gsdltimes.cpp gsdltools.cpp cnfgable.cpp cnfgator.cpp phrases.cpp \
-    md5.cpp
+SOURCES = \
+  cfgread.cpp      cnfgable.cpp     cnfgator.cpp   display.cpp \
+  fileutil.cpp     gsdlsitecfg.cpp  gsdltimes.cpp  gsdltools.cpp \
+  gsdlunicode.cpp  md5.cpp          OIDtools.cpp   phrases.cpp \
+  text_t.cpp
 
-OBJECTS = cfgread.obj fileutil.obj gsdlunicode.obj text_t.obj display.obj \
-      gsdlsitecfg.obj gsdltimes.obj gsdltools.obj cnfgable.obj cnfgator.obj phrases.obj \
-    md5.obj
+OBJECTS = \
+  cfgread.obj      cnfgable.obj     cnfgator.obj   display.obj \
+  fileutil.obj     gsdlsitecfg.obj  gsdltimes.obj  gsdltools.obj \
+  gsdlunicode.obj  md5.obj          OIDtools.obj   phrases.obj \
+  text_t.obj
 
 all: gsdllib.lib

gsdl/trunk/src/oaiservr/Makefile.in

@@ -97 +97 @@
 SOURCES = $(COMMONSOURCES) $(OAISOURCES)
 
-RECPTOBJECTS = ../../src/recpt/OIDtools.o \
-    ../../src/recpt/nullproto.o ../../src/recpt/recptproto.o \
+RECPTOBJECTS = ../../src/recpt/nullproto.o ../../src/recpt/recptproto.o \
     ../../src/recpt/htmlutils.o ../../src/recpt/infodbclass.o \
     ../../src/recpt/cgiargs.o ../../src/recpt/cgiutils.o

gsdl/trunk/src/oaiservr/win32.mak

@@ -114 +114 @@
 SOURCES = $(COMMONSOURCES) $(OAISOURCES)
 
-RECPTOBJECTS = "$(recptDir)\OIDtools.obj" "$(recptDir)\nullproto.obj" "$(recptDir)\recptproto.obj" \
+RECPTOBJECTS = "$(recptDir)\nullproto.obj" "$(recptDir)\recptproto.obj" "$(recptDir)\recptprototools.obj" \
                "$(recptDir)\htmlutils.obj" "$(recptDir)\infodbclass.obj" "$(recptDir)\cgiargs.obj" \
                "$(recptDir)\cgiutils.obj"

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"