Changeset 25251 for gs2-extensions/tdb-edit/trunk/src/enable_tdb.sh

Timestamp:

2012-03-23T12:22:19+13:00 (12 years ago)

Author:

jmt12

Message:

Adding several more changes needed when enabling or disabling tdb

File:

• gs2-extensions/tdb-edit/trunk/src/enable_tdb.sh (modified) (3 diffs)

gs2-extensions/tdb-edit/trunk/src/enable_tdb.sh

@@ -14 +14 @@
 echo ' - enabling TDB support in common function library'
 # - Symlink the source file into place
+ln -f -s $GSDLHOME/ext/tdb-edit/src/lib/tdbclass.h $GSDLHOME/common-src/src/lib/tdbclass.h
 ln -f -s $GSDLHOME/ext/tdb-edit/src/lib/tdbclass.cpp $GSDLHOME/common-src/src/lib/tdbclass.cpp
 # - Makefile.in
@@ -41 +42 @@
 fi
 
+# - collectserver.cpp
+# There are now sanity tests in collectserver to ensure appropriate indexer and
+# infodbtype are compiled into colservr. While not fatal to leave this as is,
+# it does cause vast amounts of error messages in (Apache) logs
+grep -q 'tdb' $GSDLHOME/runtime-src/src/colservr/collectserver.cpp
+if [ $? -eq 1 ]
+then
+  sed -i 's:// @EXTENSION HEADERS@:&\nif (infodbtype == "tdb") { } // TDB Do nothing:' $GSDLHOME/runtime-src/src/colservr/collectset.cpp
+fi
+
 echo ' - enabling TDB support in Greenstone receptionist'
 # - Makefile.in
@@ -57 +68 @@
 if [ $? -eq 1 ]
 then
+  sed -i 's:EXT_DEFINES =.*:& -DUSE_TDB:' $GSDLHOME/runtime-src/src/oaiservr/Makefile.in
+  sed -i 's:EXT_INCLUDES =.*:& -I$(GSDL_DIR)/ext/tdb-edit/linux/include -I$(GSDL_DIR)/ext/tdb-edit/darwin/include -I$(GSDL_DIR)/ext/tdb-edit/src/lib:' $GSDLHOME/runtime-src/src/oaiservr/Makefile.in
   sed -i 's:EXT_LDFLAGS =.*:& -L$(GSDL_DIR)/ext/tdb-edit/linux/lib -L$(GSDL_DIR)/ext/tdb-edit/darwin/lib:' $GSDLHOME/runtime-src/src/oaiservr/Makefile.in
   sed -i 's:EXT_LIBS =.*:& -ltdb:' $GSDLHOME/runtime-src/src/oaiservr/Makefile.in