Changeset 19259 for gsdl

Timestamp:

2009-04-25T18:45:58+12:00 (15 years ago)

Author:

davidb

Message:

Revap of Greenstone as a module for Apache. Initial version coded by DL Consulting

Location:

gsdl/trunk/runtime-src/src/recpt

Files:

• Makefile.in (modified) (8 diffs)
• mod_gsdl.cpp (added)
• receptionist.cpp (modified) (4 diffs)

gsdl/trunk/runtime-src/src/recpt/Makefile.in

@@ -28 +28 @@
 COMMON_DIR = $(GSDL_DIR)/common-src
 RUNTIME_DIR = $(GSDL_DIR)/runtime-src
+
+GSDLOS = @gsdlos@
 
 INDEXERS_DIR = $(COMMON_DIR)/indexers
@@ -71 +73 @@
 Z3950_INCLUDES = 
 Z3950_LIBS = 
+endif
+
+USE_APACHE_HTTPD=@USE_APACHE_HTTPD@
+ifeq ($(USE_APACHE_HTTPD), 1)
+APACHE_OBJS = string_pool.o mod_gsdl.o
+
+APXS=$(GSDL_DIR)/apache-httpd/$(GSDLOS)/bin/apxs
+APXS_CFLAGS=`$(APXS) -q CFLAGS`   
+APXS_CFLAGS_SHLIB=`$(APXS) -q CFLAGS_SHLIB`   
+APXS_INCLUDEDIR=`$(APXS) -q INCLUDEDIR`   
+APXS_LIBEXECDIR=`$(APXS) -q LIBEXECDIR`
+APXS_LDFLAGS_SHLIB=`$(APXS) -q LDFLAGS_SHLIB`
+APXS_SYSCONFDIR=`$(APXS) -q SYSCONFDIR`
+APXS_LIBS_SHLIB=`$(APXS) -q LIBS_SHLIB`
+APACHE_MODULE = mod_gsdl.so
+else
+APACHE_OBJS =
+APACHE_MODULE = mod_gsdl.so
 endif
 
@@ -95 +115 @@
 
 
-.SUFFIXES:
-.SUFFIXES: .cpp .o
-.cpp.o:
-    $(CXXCOMPILE) $< 
-
-
 SOURCES = \
     action.cpp \
@@ -113 +127 @@
     cgiwrapper.cpp \
     collectoraction.cpp \
+    configaction.cpp \
         converter.cpp \
     datelistbrowserclass.cpp \
@@ -157 +172 @@
     cgiwrapper.o \
     collectoraction.o \
+    configaction.o \
         converter.o \
     datelistbrowserclass.o \
@@ -187 +203 @@
     usersaction.o \
     vlistbrowserclass.o \
-    wizardaction.o
+    wizardaction.o 
 
 LIBRARY = gsdlrecpt.a
@@ -208 +224 @@
 
 # Default target: make both gsdlrecpt.a and the library executable
-all: $(LIBRARY) $(EXECUTABLE)
+all: $(LIBRARY) $(EXECUTABLE) $(APACHE_MODULE)
 
 gsdlrecpt.a: $(OBJECTS)
@@ -218 +234 @@
     $(CXXLINK) $(EXECUTABLE_OBJECTS) $(LIBS)
 
+mod_gsdl.o: mod_gsdl.cpp
+    $(CXX) -c  $(CXXFLAGS) $(DEFS) $(INCLUDES) -D_APACHE_MOD=2 -fPIC -I$(APXS_INCLUDEDIR) -I. -iquote $(APXS_CFLAGS) $(APXS_CFLAGS_SHLIB) -Wall -o $@ $< 
+
+mod_gsdl.so: $(APACHE_OBJS) $(LIBRARY)
+    $(CXX) -fPIC -shared -o $@ $(APACHE_OBJS) $(APXS_LIBS_SHLIB) $(LIBRARY) $(GSDL_LIBS) $(LIBS)
+
+
+.SUFFIXES:
+.SUFFIXES: .cpp .o
+.cpp.o:
+    $(CXXCOMPILE) $< 
+
+
 install: $(EXECUTABLE)
     $(INSTALL) -m 755 -s $(EXECUTABLE) $(GSDL_DIR)/cgi-bin
+    $(GSDL_DIR)/apache-httpd/$(GSDLOS)/bin/apxs  -i -n gsdl mod_gsdl.so
 
 clean:
-    rm -f $(OBJECTS) $(LIBRARY) $(EXECUTABLE)
+    rm -f $(OBJECTS) $(LIBRARY) $(EXECUTABLE) $(APACHE_MODULE) $(APACHE_OBJS)
 
 distclean:

gsdl/trunk/runtime-src/src/recpt/receptionist.cpp

@@ -1448 +1448 @@
 }
 
+
 void receptionist::define_general_macros (cgiargsclass &args, outconvertclass &/*outconvert*/, 
                       ostream &logout) {
@@ -1457 +1458 @@
   disp.setmacro ("httpweb", displayclass::defaultpackage, configinfo.httpweb);
   disp.setmacro ("httpprefix", displayclass::defaultpackage, configinfo.httpprefix);
-
 
   text_t compressedoptions = get_compressed_arg(args, logout);
@@ -1559 +1559 @@
     }
   }
-
+  
   if (!collection.empty()) {
     ColInfoResponse_t cinfo;
@@ -1566 +1566 @@
     if (collectproto != NULL) {
       collectproto->get_collectinfo (collection, cinfo, err, logout);
+
+
+      // This part of the code used to use "cinfo.httpprefix" regardless
+      // of the value it contained.  Since
+      // this can come back with an empty (in the case of gsdl_mod), the
+      // URL produced was invalid.
+      //
+      // Changed to test for empty first, and use configinfo.httpprefix as
+      // a "backup"
+      // 
+      // Point to consider: since configinfo.httpprefix has been offically 
+      // set as "httpprefix" in macros, it seems to make more sense to use
+      // always use that version and not the cinfo version at all.
+
+      text_t httpprefix 
+    = (!cinfo.httpprefix.empty()) ? cinfo.httpprefix : configinfo.httpprefix;
+    
       text_t httpcollection;
       if (!cinfo.httpdomain.empty()) httpcollection = "http://";
-      httpcollection += cinfo.httpdomain + cinfo.httpprefix + "/collect/"
+      httpcollection += cinfo.httpdomain + httpprefix + "/collect/"
     + collection; 
       disp.setmacro ("httpcollection", displayclass::defaultpackage,
              httpcollection); 
+      
       // as of gsdl 2.53, collect.cfg can specify macros
       if (cinfo.collection_macros.size() > 0) {