Changeset 15416

Timestamp:

2008-05-13T14:05:16+12:00 (16 years 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.

Location:

gsdl/trunk/src

Files:

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

gsdl/trunk/src/colservr/Makefile.in

@@ -156 +156 @@
 MG_MGPP_OBJECTS=collectset.o
 
-HEADERS = search.h querycache.h queryinfo.h collectserver.h collectset.h \
+HEADERS = comtypes.h search.h querycache.h queryinfo.h collectserver.h collectset.h \
           colservrconfig.h maptools.h filter.h source.h browsefilter.h \
           queryfilter.h mggdbmsource.h gdbmsource.h \
@@ -162 +162 @@
       $(MG_HEADERS) $(LC_HEADERS) $(CORBAHEADERS)
 
-SOURCES = search.cpp querycache.cpp queryinfo.cpp collectserver.cpp \
+SOURCES = comtypes.cpp search.cpp querycache.cpp queryinfo.cpp collectserver.cpp \
           colservrconfig.cpp maptools.cpp filter.cpp source.cpp \
           browsefilter.cpp queryfilter.cpp mggdbmsource.cpp gdbmsource.cpp \
@@ -168 +168 @@
       $(MG_SOURCES) $(LC_SOURCES) $(CORBASOURCES)
 
-OBJECTS = search.o querycache.o queryinfo.o collectserver.o \
+OBJECTS = comtypes.o search.o querycache.o queryinfo.o collectserver.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
 
-HEADERS = mgq.h search.h mgsearch.h querycache.h queryinfo.h collectserver.h \
+HEADERS = comtypes.h mgq.h search.h mgsearch.h querycache.h queryinfo.h collectserver.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
 
-SOURCES = mgq.c search.cpp mgsearch.cpp querycache.cpp queryinfo.cpp \
+SOURCES = comtypes.cpp mgq.c search.cpp mgsearch.cpp querycache.cpp queryinfo.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
 
-OBJECTS = mgq.obj search.obj mgsearch.obj querycache.obj queryinfo.obj \
+OBJECTS = comtypes.obj mgq.obj search.obj mgsearch.obj querycache.obj queryinfo.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)
 
-RECPTOBJECTS = ../../src/recpt/comtypes.o ../../src/recpt/OIDtools.o \
+RECPTOBJECTS = ../../src/recpt/OIDtools.o \
     ../../src/recpt/nullproto.o ../../src/recpt/recptproto.o \
     ../../src/recpt/htmlutils.o ../../src/recpt/infodbclass.o \
@@ -112 +112 @@
 
 
-COLSERVROBJECTS = ../../src/colservr/mgq.o \
+COLSERVROBJECTS = ../../src/colservr/comtypes.o \
+          ../../src/colservr/mgq.o \
           ../../src/colservr/search.o \
                   ../../src/colservr/mgsearch.o \

gsdl/trunk/src/oaiservr/win32.mak

@@ -114 +114 @@
 SOURCES = $(COMMONSOURCES) $(OAISOURCES)
 
-RECPTOBJECTS = "$(recptDir)\comtypes.obj" "$(recptDir)\OIDtools.obj" "$(recptDir)\nullproto.obj" "$(recptDir)\recptproto.obj" \
+RECPTOBJECTS = "$(recptDir)\OIDtools.obj" "$(recptDir)\nullproto.obj" "$(recptDir)\recptproto.obj" \
                "$(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 \
-        statusaction.h pageaction.h comtypes.h recptproto.h \
+        statusaction.h pageaction.h recptproto.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 \
-        statusaction.cpp pageaction.cpp comtypes.cpp  \
+        statusaction.cpp pageaction.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 \
-        statusaction.o pageaction.o comtypes.o \
+        statusaction.o pageaction.o \
         recptproto.o pingaction.o queryaction.o documentaction.o \
         extlinkaction.o browseaction.o htmlutils.o querytools.o browseactiontools.o \
@@ -240 +240 @@
 
 
-COLSERVROBJECTS = ../colservr/mgq.o \
+COLSERVROBJECTS = ../colservr/comtypes.o \
+          ../colservr/mgq.o \
           ../colservr/search.o \
                   ../colservr/mgsearch.o \
@@ -393 +394 @@
 test:
 
-Z3950_OBJS = comtypes.o recptproto.o infodbclass.o OIDtools.o \
+Z3950_OBJS = recptproto.o infodbclass.o OIDtools.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 \
-        statusaction.h pageaction.h comtypes.h recptproto.h pingaction.h \
+        statusaction.h pageaction.h recptproto.h pingaction.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 \
-        statusaction.cpp pageaction.cpp comtypes.cpp \
+        statusaction.cpp pageaction.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 \
-        statusaction.obj pageaction.obj comtypes.obj recptproto.obj \
+        statusaction.obj pageaction.obj recptproto.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" \
-    zparse.yy.obj comtypes.obj infodbclass.obj \
+    zparse.yy.obj infodbclass.obj \
     OIDtools.obj recptproto.obj \
     nullproto.obj