Changeset 24958
- Timestamp:
- 2012-01-20T16:22:35+13:00 (12 years ago)
- Location:
- main/trunk/greenstone2
- Files:
-
- 2 added
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/configure
r23802 r24958 312 312 ac_subdirs_all="$ac_subdirs_all build-src" 313 313 ac_subdirs_all="$ac_subdirs_all runtime-src" 314 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION USE_FASTCGI USE_LANGACTION USE_CORBA MICO_DIR ENABLE_JAVA USE_Z3950 USE_YAZ USE_WVWARE USE_JDBM USE_GDBM ENABLE_ACCENTFOLD USE_SQLITE USE_ APACHE_HTTPD ENABLE_JNI ENABLE_MG ENABLE_MGPP ENABLE_LUCENE LDFLAGS CFLAGS CC CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX AWK YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB COMPAT32BITFLAGS MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC gsdlos MODULEDIRS subdirs LTLIBOBJS'314 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION USE_FASTCGI USE_LANGACTION USE_CORBA MICO_DIR ENABLE_JAVA USE_Z3950 USE_YAZ USE_WVWARE USE_JDBM USE_GDBM ENABLE_ACCENTFOLD USE_SQLITE USE_RSS USE_APACHE_HTTPD ENABLE_JNI ENABLE_MG ENABLE_MGPP ENABLE_LUCENE LDFLAGS CFLAGS CC CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX AWK YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB COMPAT32BITFLAGS MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC gsdlos MODULEDIRS subdirs LTLIBOBJS' 315 315 ac_subst_files='' 316 316 … … 865 865 --disable-accentfold Disable Accent Folding for MGPP 866 866 --disable-sqlite Disable SQLite support 867 --disable-rss Disable RSS support 867 868 --enable-apache-httpd Enable Apache httpd support 868 869 --enable-jni Enable JNI compilation … … 1540 1541 1541 1542 1543 # Check whether --enable-rss or --disable-rss was given. 1544 if test "${enable_rss+set}" = set; then 1545 enableval="$enable_rss" 1546 USE_RSS=$enableval 1547 else 1548 USE_RSS=yes 1549 fi; 1550 if test $USE_RSS = "yes" -o $USE_RSS = "1" ; then 1551 USE_RSS=1 1552 cat >>confdefs.h <<\_ACEOF 1553 #define USE_RSS 1554 _ACEOF 1555 1556 else 1557 USE_RSS=0 1558 fi 1559 1560 1561 1542 1562 if test -d runtime-src; then 1543 1563 # Check whether --enable-apache-httpd or --disable-apache-httpd was given. … … 8066 8086 s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t 8067 8087 s,@USE_SQLITE@,$USE_SQLITE,;t t 8088 s,@USE_RSS@,$USE_RSS,;t t 8068 8089 s,@USE_APACHE_HTTPD@,$USE_APACHE_HTTPD,;t t 8069 8090 s,@ENABLE_JNI@,$ENABLE_JNI,;t t -
main/trunk/greenstone2/configure.in
r23801 r24958 147 147 fi 148 148 AC_SUBST(USE_SQLITE) 149 150 dnl 151 dnl Set use of RSS (enabled by default) 152 dnl 153 AC_ARG_ENABLE(rss, [ --disable-rss Disable RSS support], USE_RSS=$enableval, USE_RSS=yes) 154 if test $USE_RSS = "yes" -o $USE_RSS = "1" ; then 155 USE_RSS=1 156 AC_DEFINE(USE_RSS,[]) 157 else 158 USE_RSS=0 159 fi 160 AC_SUBST(USE_RSS) 161 149 162 150 163 dnl -
main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm
r24829 r24958 805 805 ##print STDERR "*** To set in db: \n\t$doc_db\n\t$oid\n\t$doc_db_text\n"; 806 806 807 if (($oid_files->{'index-status'} eq "I") || ($oid_files->{'index-status'} eq "R")) { 808 my $top_section = $doc_obj->get_top_section(); 809 810 my $dc_titles = $doc_obj->get_metadata($top_section,"dls.Title"); 811 my $dc_title = join("; ", @$dc_titles); 812 813 if ($oid_files->{'index-status'} eq "R") { 814 $dc_title .= " (Updated)"; 815 } 816 817 my $rss_filename = &util::filename_cat($output_dir,"rss-items.rdf"); 818 if (open(RSSOUT,">>$rss_filename")) { 819 print RSSOUT "<item>\n"; 820 print RSSOUT " <title>$dc_title</title>\n"; 821 print RSSOUT " <link>_httpdomain__httpcollection_/document/$oid</link>\n"; 822 print RSSOUT "</item>\n"; 823 close(RSSOUT); 824 } 825 else { 826 print STDERR "**** Failed to open $rss_filename\n!$\n"; 827 } 828 829 830 } 831 807 832 $oid_files->{'doc-file'} = [ $oid_files->{'doc-file'} ]; 808 833 $oid_files->{'index-status'} = [ $oid_files->{'index-status'} ]; -
main/trunk/greenstone2/runtime-src/configure
r24901 r24958 310 310 311 311 ac_subdirs_all="$ac_subdirs_all packages" 312 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION USE_FASTCGI USE_LANGACTION USE_CORBA MICO_DIR USE_Z3950 USE_YAZ ENABLE_JAVA USE_JDBM USE_GDBM ENABLE_ACCENTFOLD USE_SQLITE USE_ APACHE_HTTPD ENABLE_MG ENABLE_MGPP ENABLE_LUCENE LDFLAGS CFLAGS CC CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX JAVAC JAVACFLAGS JAVA uudecode AWK YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB COMPAT32BITFLAGS MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC gsdlos gsdlarch MODULEDIRS subdirs LTLIBOBJS'312 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION USE_FASTCGI USE_LANGACTION USE_CORBA MICO_DIR USE_Z3950 USE_YAZ ENABLE_JAVA USE_JDBM USE_GDBM ENABLE_ACCENTFOLD USE_SQLITE USE_RSS USE_APACHE_HTTPD ENABLE_MG ENABLE_MGPP ENABLE_LUCENE LDFLAGS CFLAGS CC CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX JAVAC JAVACFLAGS JAVA uudecode AWK YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB COMPAT32BITFLAGS MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC gsdlos gsdlarch MODULEDIRS subdirs LTLIBOBJS' 313 313 ac_subst_files='' 314 314 … … 862 862 --disable-accentfold Disable Accent Folding for MGPP 863 863 --disable-sqlite Disable SQLite support 864 --disable-rss Disable RSS support 864 865 --enable-apache-httpd Enable Apache httpd support 865 866 --disable-mg Disable MG compilation … … 1519 1520 1520 1521 1522 # Check whether --enable-rss or --disable-rss was given. 1523 if test "${enable_rss+set}" = set; then 1524 enableval="$enable_rss" 1525 USE_RSS=$enableval 1526 else 1527 USE_RSS=yes 1528 fi; 1529 if test $USE_RSS = "yes" -o $USE_RSS = "1" ; then 1530 USE_RSS=1 1531 cat >>confdefs.h <<\_ACEOF 1532 #define USE_RSS 1533 _ACEOF 1534 1535 else 1536 USE_RSS=0 1537 fi 1538 1539 1540 1521 1541 # Check whether --enable-apache-httpd or --disable-apache-httpd was given. 1522 1542 if test "${enable_apache_httpd+set}" = set; then … … 2991 3011 CLASS_TEST=Test.class 2992 3012 cat << \EOF > $JAVA_TEST 2993 /* #line 2993 "configure" */3013 /* #line 3013 "configure" */ 2994 3014 public class Test { 2995 3015 } … … 3168 3188 ac_cv_prog_uudecode_base64=yes 3169 3189 else 3170 echo "configure: 31 70: uudecode had trouble decoding base 64 file 'Test.uue'" >&53190 echo "configure: 3190: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 3171 3191 echo "configure: failed file was:" >&5 3172 3192 cat Test.uue >&5 … … 3292 3312 CLASS_TEST=Test.class 3293 3313 cat << \EOF > $JAVA_TEST 3294 /* #line 3 294 "configure" */3314 /* #line 3314 "configure" */ 3295 3315 public class Test { 3296 3316 } … … 3333 3353 TEST=Test 3334 3354 cat << \EOF > $JAVA_TEST 3335 /* [#]line 33 35 "configure" */3355 /* [#]line 3355 "configure" */ 3336 3356 public class Test { 3337 3357 public static void main (String args[]) { … … 8504 8524 s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t 8505 8525 s,@USE_SQLITE@,$USE_SQLITE,;t t 8526 s,@USE_RSS@,$USE_RSS,;t t 8506 8527 s,@USE_APACHE_HTTPD@,$USE_APACHE_HTTPD,;t t 8507 8528 s,@ENABLE_MG@,$ENABLE_MG,;t t -
main/trunk/greenstone2/runtime-src/configure.in
r24901 r24958 136 136 fi 137 137 AC_SUBST(USE_SQLITE) 138 139 dnl 140 dnl Set use of RSS (enabled by default) 141 dnl 142 AC_ARG_ENABLE(rss, [ --disable-rss Disable RSS support], USE_RSS=$enableval, USE_RSS=yes) 143 if test $USE_RSS = "yes" -o $USE_RSS = "1" ; then 144 USE_RSS=1 145 AC_DEFINE(USE_RSS,[]) 146 else 147 USE_RSS=0 148 fi 149 AC_SUBST(USE_RSS) 150 138 151 139 152 dnl -
main/trunk/greenstone2/runtime-src/src/recpt/Makefile.in
r24901 r24958 117 117 endif 118 118 119 USE_RSS = @USE_RSS@ 120 ifeq ($(USE_RSS), 1) 121 RSS_DEFINES = -DUSE_RSS 122 RSS_SOURCES = rssaction.cpp 123 RSS_OBJECTS = rssaction.o 124 else 125 RSS_DEFINES = 126 RSS_SOURCES = 127 RSS_OBJECTS = 128 endif 129 119 130 120 131 USE_Z3950 = @USE_Z3950@ … … 155 166 CXX = @CXX@ 156 167 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ 157 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H $(FASTCGI_DEFS) $( GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(Z3950_DEFS)168 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H $(FASTCGI_DEFS) $(RSS_DEFINES) $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(Z3950_DEFS) 158 169 INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib \ 159 170 -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \ … … 211 222 querytools.cpp \ 212 223 receptionist.cpp \ 224 $(RSS_SOURCES) \ 213 225 statusaction.cpp \ 214 226 summarise.cpp \ … … 258 270 querytools.o \ 259 271 receptionist.o \ 272 $(RSS_OBJECTS) \ 260 273 statusaction.o \ 261 274 summarise.o \ -
main/trunk/greenstone2/runtime-src/src/recpt/cgiwrapper.cpp
r23389 r24958 72 72 #endif 73 73 74 #if defined(USE_RSS) 75 #include "rssaction.h" 76 #endif 77 74 78 #include "tipaction.h" 75 79 #include "statusaction.h" … … 531 535 #endif 532 536 537 #if defined(USE_RSS) 538 rssaction *arssaction = new rssaction(); 539 recpt.add_action (arssaction); 540 #endif 541 533 542 queryaction *aqueryaction = new queryaction(); 534 543 aqueryaction->set_receptionist (&recpt); -
main/trunk/greenstone2/runtime-src/src/recpt/win32.mak
r24902 r24958 45 45 DLLDEBUG = 0 46 46 ENABLE_ACCENTFOLD = 1 47 USE_RSS = 1 47 48 USE_GDBM = 1 48 49 USE_JDBM = 1 … … 79 80 !ELSE 80 81 ACCENTFOLD_LIBS = 82 !ENDIF 83 84 !IF $(USE_RSS) 85 RSS_DEFINES = -DUSE_RSS 86 RSS_SOURCES = rssaction.cpp 87 RSS_OBJECTS = rssaction.obj 88 !ELSE 89 RSS_DEFINES = 90 RSS_SOURCES = 91 RSS_OBJECTS = 81 92 !ENDIF 82 93 … … 187 198 CC = cl 188 199 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 189 -DGSDL_NOCACHE$(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \200 -DGSDL_NOCACHE $(RSS_DEFINES) $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \ 190 201 $(Z3950_DEFS) $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 191 202 INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \ … … 205 216 !ENDIF 206 217 218 CXXFLAGS = $(CXXFLAGS) -DDOCHANDLE 207 219 208 220 COMPILE = $(CC) -nologo -c $(CXXFLAGS) $(DEFS) $(INCLUDES) … … 263 275 querytools.cpp \ 264 276 receptionist.cpp \ 277 $(RSS_SOURCES) \ 265 278 statusaction.cpp \ 266 279 $(SQL_SOURCES) \ … … 311 324 querytools.obj \ 312 325 receptionist.obj \ 326 $(RSS_OBJECTS) \ 313 327 statusaction.obj \ 314 328 $(SQL_OBJECTS) \ -
main/trunk/greenstone2/win32.mak
r22090 r24958 36 36 USE_GDBM = 1 37 37 USE_JDBM = 1 38 # USE_RSS is enabled by default for GS2. How about GS3? 39 USE_RSS = 1 38 40 # USE_SQLITE is enabled by default for GS2. Need to turn off explicitly for GS3 in build.xml 39 41 USE_SQLITE = 1 … … 82 84 !IF !$(USE_JDBM) 83 85 MAKECMD = $(MAKECMD) USE_JDBM=0 86 !ENDIF 87 !IF !$(USE_RSS) 88 MAKECMD = $(MAKECMD) USE_RSS=0 84 89 !ENDIF 85 90 !IF !$(USE_SQLITE)
Note:
See TracChangeset
for help on using the changeset viewer.