Changeset 15416

Timestamp:

2008-05-13 14:05:16 (2 months ago)

Author:

mdewsnip

Message:

(Untangling colservr/recpt) Moved comtypes out of recpt and into colservr, since this defines the types used to communicate with the colservr.

Files:

• gsdl/trunk/src/colservr/Makefile.in (modified) (3 diffs)
• gsdl/trunk/src/colservr/comtypes.cpp (added)
• gsdl/trunk/src/colservr/comtypes.h (added)
• gsdl/trunk/src/colservr/win32.mak (modified) (3 diffs)
• gsdl/trunk/src/oaiservr/Makefile.in (modified) (2 diffs)
• gsdl/trunk/src/oaiservr/win32.mak (modified) (1 diff)
• gsdl/trunk/src/recpt/Makefile.in (modified) (5 diffs)
• gsdl/trunk/src/recpt/comtypes.cpp (deleted)
• gsdl/trunk/src/recpt/comtypes.h (deleted)
• gsdl/trunk/src/recpt/win32.mak (modified) (4 diffs)

gsdl/trunk/src/colservr/Makefile.in

@@ -156 +156 @@
-MG_MGPP_OBJECTS=collectset.o
-
-
+comtypes.h 
-          colservrconfig.h maptools.h filter.h source.h browsefilter.h \
-          queryfilter.h mggdbmsource.h gdbmsource.h \
@@ -162 +162 @@
-          $(MG_HEADERS) $(LC_HEADERS) $(CORBAHEADERS)
-
-
+comtypes.cpp 
-          colservrconfig.cpp maptools.cpp filter.cpp source.cpp \
-          browsefilter.cpp queryfilter.cpp mggdbmsource.cpp gdbmsource.cpp \
@@ -168 +168 @@
-          $(MG_SOURCES) $(LC_SOURCES) $(CORBASOURCES)
-
-
+comtypes.o 
-          colservrconfig.o maptools.o filter.o source.o browsefilter.o \
-          queryfilter.o mggdbmsource.o gdbmsource.o \

gsdl/trunk/src/colservr/win32.mak

@@ -92 +92 @@
-!ENDIF
-
-
+comtypes.h 
-          colservrconfig.h maptools.h filter.h source.h browsefilter.h \
-          queryfilter.h mgqueryfilter.h mggdbmsource.h phrasesearch.h \
@@ -99 +99 @@
-          expat_resultset.h expat_document.h gdbmsource.h
-
-
+comtypes.cpp 
-          collectserver.cpp colservrconfig.cpp maptools.cpp filter.cpp \
-          source.cpp browsefilter.cpp queryfilter.cpp mgqueryfilter.cpp \
@@ -107 +107 @@
-          expat_resultset.cpp expat_document.cpp gdbmsource.cpp
-
-
+comtypes.obj 
-          collectserver.obj colservrconfig.obj maptools.obj filter.obj \
-          source.obj browsefilter.obj queryfilter.obj mgqueryfilter.obj \

gsdl/trunk/src/oaiservr/Makefile.in

@@ -97 +97 @@
-SOURCES = $(COMMONSOURCES) $(OAISOURCES)
-
-comtypes.o ../../src/recpt/
+
-        ../../src/recpt/nullproto.o ../../src/recpt/recptproto.o \
-        ../../src/recpt/htmlutils.o ../../src/recpt/infodbclass.o \
@@ -112 +112 @@
-
-
-
+
+
-                  ../../src/colservr/search.o \
-                  ../../src/colservr/mgsearch.o \

gsdl/trunk/src/oaiservr/win32.mak

@@ -114 +114 @@
-SOURCES = $(COMMONSOURCES) $(OAISOURCES)
-
-comtypes.obj" "$(recptDir)\
+
-               "$(recptDir)\htmlutils.obj" "$(recptDir)\infodbclass.obj" "$(recptDir)\cgiargs.obj" \
-               "$(recptDir)\cgiutils.obj"

gsdl/trunk/src/recpt/Makefile.in

@@ -159 +159 @@
-COMMONHEADERS = receptionist.h cgiwrapper.h cgiargs.h action.h browserclass.h \
-                converter.h maincfg.h cgiutils.h OIDtools.h browsetoolsclass.h \
-comtypes.h 
+
-                pingaction.h queryaction.h documentaction.h  \
-                extlinkaction.h browseaction.h htmlutils.h argdb.h \
@@ -181 +181 @@
-COMMONSOURCES = receptionist.cpp cgiwrapper.cpp cgiargs.cpp action.cpp browserclass.cpp \
-                converter.cpp maincfg.cpp cgiutils.cpp OIDtools.cpp browsetoolsclass.cpp \
-comtypes.cpp  
+
-                recptproto.cpp pingaction.cpp queryaction.cpp documentaction.cpp \
-                extlinkaction.cpp browseaction.h htmlutils.cpp querytools.cpp \
@@ -214 +214 @@
-COMMONOBJECTS = receptionist.o cgiwrapper.o cgiargs.o action.o browserclass.o \
-                converter.o maincfg.o cgiutils.o OIDtools.o browsetoolsclass.o \
-comtypes.o 
+
-                recptproto.o pingaction.o queryaction.o documentaction.o \
-                extlinkaction.o browseaction.o htmlutils.o querytools.o browseactiontools.o \
@@ -240 +240 @@
-
-
-
+
+
-                  ../colservr/search.o \
-                  ../colservr/mgsearch.o \
@@ -393 +394 @@
-test:
-
-comtypes.o 
+
-         $(COLSERVROBJECTS) \
-    ../colservr/z3950parser.o ../colservr/z3950explain.o \

gsdl/trunk/src/recpt/win32.mak

@@ -118 +118 @@
-COMMONHEADERS = receptionist.h cgiargs.h action.h browserclass.h \
-                converter.h maincfg.h cgiutils.h OIDtools.h browsetoolsclass.h \
-comtypes.h 
+
-                queryaction.h documentaction.h extlinkaction.h htmlutils.h \
-                querytools.h formattools.h tipaction.h authenaction.h infodbclass.h \
@@ -134 +134 @@
-COMMONSOURCES = receptionist.cpp cgiargs.cpp action.cpp browserclass.cpp \
-                converter.cpp maincfg.cpp cgiutils.cpp OIDtools.cpp browsetoolsclass.cpp \
-comtypes.cpp 
+
-                recptproto.cpp pingaction.cpp queryaction.cpp documentaction.cpp \
-                extlinkaction.cpp htmlutils.cpp querytools.cpp formattools.cpp \
@@ -152 +152 @@
-COMMONOBJECTS = receptionist.obj cgiargs.obj action.obj browserclass.obj \
-                converter.obj maincfg.obj cgiutils.obj OIDtools.obj browsetoolsclass.obj \
-comtypes.obj 
+
-                pingaction.obj queryaction.obj documentaction.obj extlinkaction.obj \
-                htmlutils.obj querytools.obj formattools.obj tipaction.obj \
@@ -215 +215 @@
-        "$(YAZDIR)\lib\yaz.lib" \
-        "$(GSDLHOME)\packages\d2m\libd2m.lib" \
-comtypes.obj 
+
-        OIDtools.obj recptproto.obj \
-        nullproto.obj