Changeset 24958 for main/trunk/greenstone2/runtime-src/src

Timestamp:

2012-01-20T16:22:35+13:00 (12 years ago)

Author:

ak19

Message:

First commit to do with Greenstone's support for RSS. Committing Dr Bainbridge's code which was already working for windows. This has now been tested on Linux, where it can be got to work with changes to zextra.dm and base.dm and if the rss-items.rdf file generated by the update to BasePlugout is moved to the index folder). The next set of commits will make the way rssaction.cpp accesses the rss-items.rdf file independent of where the GS server is located, with changes to the protocol class.

Location:

main/trunk/greenstone2/runtime-src/src/recpt

Files:

• Makefile.in (modified) (4 diffs)
• cgiwrapper.cpp (modified) (2 diffs)
• rssaction.cpp (added)
• rssaction.h (added)
• win32.mak (modified) (6 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/Makefile.in

@@ -117 +117 @@
 endif
 
+USE_RSS = @USE_RSS@
+ifeq ($(USE_RSS), 1)
+RSS_DEFINES = -DUSE_RSS
+RSS_SOURCES = rssaction.cpp
+RSS_OBJECTS = rssaction.o
+else
+RSS_DEFINES =
+RSS_SOURCES =
+RSS_OBJECTS =
+endif
+
 
 USE_Z3950 = @USE_Z3950@
@@ -155 +166 @@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
-DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H $(FASTCGI_DEFS) $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(Z3950_DEFS)
+DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H $(FASTCGI_DEFS) $(RSS_DEFINES) $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(Z3950_DEFS)
 INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib \
         -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \
@@ -211 +222 @@
     querytools.cpp \
     receptionist.cpp \
+    $(RSS_SOURCES) \
     statusaction.cpp \
     summarise.cpp \
@@ -258 +270 @@
     querytools.o \
     receptionist.o \
+    $(RSS_OBJECTS) \
     statusaction.o \
     summarise.o \

main/trunk/greenstone2/runtime-src/src/recpt/cgiwrapper.cpp

@@ -72 +72 @@
 #endif
 
+#if defined(USE_RSS)
+#include "rssaction.h"
+#endif
+
 #include "tipaction.h"
 #include "statusaction.h"
@@ -531 +535 @@
 #endif
 
+#if defined(USE_RSS)
+  rssaction *arssaction = new rssaction();
+  recpt.add_action (arssaction);
+#endif
+
   queryaction *aqueryaction = new queryaction();
   aqueryaction->set_receptionist (&recpt);

main/trunk/greenstone2/runtime-src/src/recpt/win32.mak

@@ -45 +45 @@
 DLLDEBUG = 0
 ENABLE_ACCENTFOLD = 1
+USE_RSS = 1
 USE_GDBM = 1
 USE_JDBM = 1
@@ -79 +80 @@
 !ELSE
 ACCENTFOLD_LIBS = 
+!ENDIF
+
+!IF $(USE_RSS)
+RSS_DEFINES = -DUSE_RSS
+RSS_SOURCES = rssaction.cpp
+RSS_OBJECTS = rssaction.obj
+!ELSE
+RSS_DEFINES =
+RSS_SOURCES =
+RSS_OBJECTS =
 !ENDIF
 
@@ -187 +198 @@
 CC = cl
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
-        -DGSDL_NOCACHE $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \
+    -DGSDL_NOCACHE $(RSS_DEFINES) $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \
     $(Z3950_DEFS) $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS)
 INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
@@ -205 +216 @@
 !ENDIF
 
+CXXFLAGS = $(CXXFLAGS) -DDOCHANDLE
 
 COMPILE = $(CC) -nologo -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
@@ -263 +275 @@
     querytools.cpp \
     receptionist.cpp \
+    $(RSS_SOURCES) \
     statusaction.cpp \
     $(SQL_SOURCES) \
@@ -311 +324 @@
     querytools.obj \
     receptionist.obj \
+    $(RSS_OBJECTS) \
     statusaction.obj \
     $(SQL_OBJECTS) \