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

Timestamp:

2012-05-09T20:08:01+12:00 (12 years ago)

Author:

ak19

Message:

Dr Bainbridge has introduced the isPersistentAction (add the a=is-persistent to the library url). It is true for server.exe and when using mod_gsdl, but false for library.cgi which uses the apache web server (when not using mod_gsdl).

Location:

main/trunk/greenstone2/runtime-src/src

Files:

• recpt/Makefile.in (modified) (2 diffs)
• recpt/cgiwrapper.cpp (modified) (2 diffs)
• recpt/cgiwrapper.h (modified) (1 diff)
• recpt/ispersistentaction.cpp (added)
• recpt/ispersistentaction.h (added)
• recpt/librarymain.cpp (modified) (2 diffs)
• recpt/mod_gsdl.cpp (modified) (2 diffs)
• recpt/win32.mak (modified) (2 diffs)
• w32server/cgiwrapper.cpp (modified) (3 diffs)

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

@@ -220 +220 @@
     phindbrowserclass.cpp \
     pingaction.cpp \
+    ispersistentaction.cpp \
     basequeryaction.cpp \
     queryaction.cpp \
@@ -268 +269 @@
     phindbrowserclass.o \
     pingaction.o \
+    ispersistentaction.o \
     basequeryaction.o \
     queryaction.o \

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

@@ -512 +512 @@
 
 
-void add_all_actions(receptionist& recpt, userdbclass* udb, keydbclass* kdb) 
+void add_all_actions(receptionist& recpt, userdbclass* udb, keydbclass* kdb, isPersistentEnum isPersistentVal) 
 {
   // the list of actions.
@@ -535 +535 @@
 #endif
 
+  ispersistentaction *aIsPersistentAction = new ispersistentaction(isPersistentVal); 
+  recpt.add_action (aIsPersistentAction);
+  
 #if defined(USE_RSS)
   rssaction *arssaction = new rssaction();

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

@@ -31 +31 @@
 #include "receptionist.h"
 #include "userdb.h"
+#include "ispersistentaction.h"
 
-void add_all_actions(receptionist& recpt, userdbclass* udb, keydbclass* kdb);
+void add_all_actions(receptionist& recpt, userdbclass* udb, keydbclass* kdb, isPersistentEnum isPersistentVal);
 void add_all_browsers(receptionist& recpt);
 

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

@@ -36 +36 @@
 
 #include "action.h"
+#include "ispersistentaction.h"
 #include "browserclass.h"
 
@@ -96 +97 @@
   keydbclass *kdb = new keydbclass(gsdlhome);
 
-  add_all_actions(recpt,udb,kdb);
+  add_all_actions(recpt,udb,kdb,isNotPersistent); // apache (without mod_gsdl) is not a persistent server
   // Note: these actions will become invalid at the end of this function. 
   // => We will retrieve them from the receptionist and delete them

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

@@ -84 +84 @@
 
 #include "action.h"
+#include "ispersistentaction.h"
 #include "browserclass.h"
 
@@ -267 +268 @@
   // whatever that might be called in reality?
 
-  add_all_actions(recpt,udb,kdb);
+  add_all_actions(recpt,udb,kdb,isPersistent); // apache is a persistent server with mod_gsdl
   add_all_browsers(recpt);
   

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

@@ -272 +272 @@
     phindbrowserclass.cpp \
     pingaction.cpp \
+    ispersistentaction.cpp \
     queryaction.cpp \
     querytools.cpp \
@@ -321 +322 @@
     phindbrowserclass.obj \
     pingaction.obj \
+    ispersistentaction.obj \
     queryaction.obj \
     querytools.obj \

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

@@ -60 +60 @@
 #include "pageaction.h"
 #include "pingaction.h"
+#include "ispersistentaction.h"
 #include "queryaction.h"
 #if defined(USE_SQLITE)
@@ -348 +349 @@
 pageaction *apageaction = NULL;
 pingaction *apingaction = NULL;
+ispersistentaction *aIsPersistentAction = NULL;
 tipaction *atipaction = NULL;
 queryaction *aqueryaction = NULL;
@@ -574 +576 @@
     apingaction = new pingaction();
     recpt.add_action (apingaction);
+  }
+  
+   if (aIsPersistentAction == NULL) {
+    // server.exe is persistent, so passing enum value isPersistent
+    aIsPersistentAction = new ispersistentaction(isPersistent); 
+    recpt.add_action (aIsPersistentAction);
   }