Changeset 3632 for trunk

Timestamp:

2002-12-20T11:56:51+13:00 (21 years ago)

Author:

sjboddie

Message:

Added langaction

Location:

trunk/gsdl

Files:

• bin/script/picklanguage.pl (added)
• bin/script/submit_translation.pl (added)
• bin/script/translator.pl (added)
• etc/main.cfg (modified) (1 diff)
• src/recpt/Makefile.in (modified) (9 diffs)
• src/recpt/langaction.cpp (added)
• src/recpt/langaction.h (added)
• src/recpt/langdb.cpp (added)
• src/recpt/langdb.h (added)
• src/recpt/librarymain.cpp (modified) (2 diffs)

trunk/gsdl/etc/main.cfg

@@ -74 +74 @@
                 spanish.dm spanish2.dm dutch.dm port.dm russian.dm russian2.dm \
                 italian.dm italian2.dm turkish.dm turkish2.dm \
-        home.dm collect.dm docs.dm hebrew.dm indo.dm bsummary.dm
+        home.dm collect.dm docs.dm hebrew.dm indo.dm bsummary.dm \
+                translang.dm
 
 # Define the interface languages and encodings supported by this receptionist

trunk/gsdl/src/recpt/Makefile.in

@@ -39 +39 @@
 endif
 
-
-
 AR = ar
 CC = @CC@
@@ -51 +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@
+DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM @DEFS@ $(LANGACTION_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@
+DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DUSE_FASTCGI @DEFS@ $(LANGACTION_DEFS)
 INCLUDES = -I../../lib -I. -I../colservr -I../../packages/mg \
        -I../../packages/mg/lib -I../../packages/mg/src/text \
@@ -128 +134 @@
 .mpp.o:
     $(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 \
@@ -138 +150 @@
         datelistbrowserclass.h invbrowserclass.h pagedbrowserclass.h \
         htmlbrowserclass.h phindbrowserclass.h historydb.h collectoraction.h \
-        phindaction.h summarise.h highlighttext.h
+        phindaction.h summarise.h highlighttext.h $(LANG_HEADERS)
 
 RECEPTHEADERS = 
@@ -150 +162 @@
 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 \
@@ -161 +178 @@
         phindbrowserclass.cpp  historydb.cpp collectoraction.cpp argdb.cpp \
         browseactiontools.h formattools.cpp phindaction.cpp summarise.cpp \
-        highlighttext.cpp
+        highlighttext.cpp $(LANG_SOURCES)
 
 
@@ -174 +191 @@
 LIBRARYSOURCES = nullproto.cpp librarymain.cpp $(Z_LIBSOURCES)
 
-SOURCES = $(COMMONSOURCES) $(RECPTSOURCES) $(LIBRARYSOURCES)
+SOURCES = $(COMMONSOURCES) $(LANG_SOURCES) $(RECPTSOURCES) $(LIBRARYSOURCES)
 
 
@@ -181 +198 @@
 else
 Z_COMOBJS=
+endif
+
+ifeq ($(USE_LANGACTION), 1)
+LANG_OBJECTS= langaction.o langdb.o
+else
+LANG_OBJECTS=
 endif
 
@@ -193 +216 @@
         pagedbrowserclass.o htmlbrowserclass.o phindbrowserclass.o \
         historydb.o $(Z_COMOBJS) collectoraction.o phindaction.o \
-        summarise.o highlighttext.o
+        summarise.o highlighttext.o $(LANG_OBJECTS)
 
 RECPTOBJECTS = recptmain.o

trunk/gsdl/src/recpt/librarymain.cpp

@@ -57 +57 @@
 #include "browseaction.h"
 #include "phindaction.h"
+#if defined(USE_LANGACTION)
+#include "langaction.h"
+#endif
 
 #include "browserclass.h"
@@ -155 +158 @@
   recpt.add_action(&aphindaction);
 
+#if defined(USE_LANGACTION)
+  langaction alangaction;
+  recpt.add_action(&alangaction);
+#endif
+
   // list of browsers
   vlistbrowserclass avlistbrowserclass;