Changeset 10018

Timestamp:

2005-06-08T09:42:42+12:00 (19 years ago)

Author:

mdewsnip

Message:

Replaced the old langaction with the new and much improved gtiaction. Removed all the unnecessary stuff related to this from the Makefile also.

Location:

trunk/gsdl/src/recpt

Files:

• Makefile.in (modified) (8 diffs)
• gsdl_modules_cfg.h (modified) (1 diff)
• gtiaction.cpp (added)
• gtiaction.h (added)
• langaction.cpp (deleted)
• langaction.h (deleted)
• langdb.cpp (deleted)
• langdb.h (deleted)
• librarymain.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/Makefile.in

@@ -49 +49 @@
 YAZDIR=../../packages/yaz
 
-USE_LANGACTION = @USE_LANGACTION@
-ifneq ($(USE_LANGACTION), 1)
-LANGACTION_DEFS=
-else
-LANGACTION_DEFS=-DUSE_LANGACTION
-endif
-
 
 USE_FASTCGI = @USE_FASTCGI@
 ifneq ($(USE_FASTCGI), 1)
-DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM @DEFS@ $(LANGACTION_DEFS)
+DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM @DEFS@
 INCLUDES = -I../../lib -I. -I../colservr -I../../packages/mg \
        -I../../packages/mg/lib -I../../packages/mg/src/text \
        -I../mgpp/lib -I../mgpp/text -I../..
 else 
-DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DUSE_FASTCGI @DEFS@ $(LANGACTION_DEFS)
+DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DUSE_FASTCGI @DEFS@
 INCLUDES = -I../../lib -I. -I../colservr -I../../packages/mg \
        -I../../packages/mg/lib -I../../packages/mg/src/text \
@@ -144 +137 @@
     $(MCOMPILE) $< -o $@
 
-ifeq ($(USE_LANGACTION), 1)
-LANG_HEADERS=langaction.h langdb.h
-else
-LANG_HEADERS=
-endif
 
 COMMONHEADERS = receptionist.h cgiwrapper.h cgiargs.h action.h browserclass.h \
@@ -159 +147 @@
         datelistbrowserclass.h invbrowserclass.h pagedbrowserclass.h \
         htmlbrowserclass.h phindbrowserclass.h historydb.h collectoraction.h \
-        phindaction.h summarise.h highlighttext.h $(LANG_HEADERS)
+        phindaction.h summarise.h highlighttext.h gtiaction.h
 
 RECEPTHEADERS = 
@@ -171 +159 @@
 HEADERS = $(COMMONHEADERS) $(RECPTHEADERS) $(LIBRARYHEADERS)
 
-ifeq ($(USE_LANGACTION), 1)
-LANG_SOURCES= langaction.cpp langdb.cpp
-else
-LANG_SOURCES=
-endif
 
 COMMONSOURCES = receptionist.cpp cgiwrapper.cpp cgiargs.cpp action.cpp browserclass.cpp \
@@ -187 +170 @@
         phindbrowserclass.cpp  historydb.cpp collectoraction.cpp argdb.cpp \
         browseactiontools.h formattools.cpp phindaction.cpp summarise.cpp \
-        highlighttext.cpp $(LANG_SOURCES)
+        highlighttext.cpp gtiaction.cpp
 
 
@@ -200 +183 @@
 LIBRARYSOURCES = nullproto.cpp librarymain.cpp $(Z_LIBSOURCES)
 
-SOURCES = $(COMMONSOURCES) $(LANG_SOURCES) $(RECPTSOURCES) $(LIBRARYSOURCES)
+SOURCES = $(COMMONSOURCES) $(RECPTSOURCES) $(LIBRARYSOURCES)
 
 
@@ -209 +192 @@
 endif
 
-ifeq ($(USE_LANGACTION), 1)
-LANG_OBJECTS= langaction.o langdb.o
-else
-LANG_OBJECTS=
-endif
 
 COMMONOBJECTS = receptionist.o cgiwrapper.o cgiargs.o action.o browserclass.o \
@@ -225 +203 @@
         pagedbrowserclass.o htmlbrowserclass.o phindbrowserclass.o \
         historydb.o $(Z_COMOBJS) collectoraction.o phindaction.o \
-        summarise.o highlighttext.o $(LANG_OBJECTS)
+        summarise.o highlighttext.o gtiaction.o
 
 RECPTOBJECTS = recptmain.o

trunk/gsdl/src/recpt/gsdl_modules_cfg.h

@@ -54 +54 @@
 #define GSDL_USE_COLLECTOR_ACTION
 #define GSDL_USE_EXTLINK_ACTION
-#undef  GSDL_USE_LANG_ACTION
+#undef  GSDL_USE_GTI_ACTION
 #define GSDL_USE_PHIND_ACTION
 #define GSDL_USE_PING_ACTION

trunk/gsdl/src/recpt/librarymain.cpp

@@ -79 +79 @@
 #endif
 
+#ifdef GSDL_USE_GTI_ACTION
+#include "gtiaction.h"
+#endif
+
 #include "tipaction.h"
 #include "collectoraction.h"
 #include "browseaction.h"
 #include "phindaction.h"
-#if defined(GSDL_USE_LANG_ACTION)
-#include "langaction.h"
-#endif
 
 #include "browserclass.h"
@@ -209 +210 @@
 #endif
 
-#ifdef GSDL_USE_LANG_ACTION
-  langaction *alangaction = new langaction();
-  alangaction->set_receptionist(&recpt);
-  recpt.add_action(alangaction);
+#ifdef GSDL_USE_GTI_ACTION
+  gtiaction *agtiaction = new gtiaction();
+  agtiaction->set_receptionist(&recpt);
+  recpt.add_action(agtiaction);
 #endif