Changeset 22142 for main/trunk/greenstone2/runtime-src/src/recpt/mod_gsdl.cpp

Timestamp:

2010-05-20T20:59:01+12:00 (14 years ago)

Author:

davidb

Message:

For the CGI 'e' variable to be inter-changable between mod_gsdl and library.cgi then they need to have exactly the same actions. The code has been refactored so they now use a shared function to do this, the ensure this is the case.

File:

• main/trunk/greenstone2/runtime-src/src/recpt/mod_gsdl.cpp (modified) (5 diffs)

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

@@ -81 +81 @@
 
 #include "action.h"
-#include "pageaction.h"
-#include "queryaction.h"
-
-#if defined(USE_SQLITE)
-#include "sqlqueryaction.h"
-#endif
-
-#include "documentaction.h"
-#include "extlinkaction.h"
-#ifdef ENABLE_MGPP
-#include "phindaction.h"
-#endif
-#if defined(USE_MYSQL) || defined(USE_ACCESS)
-#include "orderaction.h"
-#endif
-#include "configaction.h"
-
 #include "browserclass.h"
-#include "vlistbrowserclass.h"
-#include "hlistbrowserclass.h"
-#include "datelistbrowserclass.h"
-#include "invbrowserclass.h"
-#include "pagedbrowserclass.h"
-#include "phindbrowserclass.h"
-
-#include <strstream>
+
+#define GSDL_USE_OSTRINGSTREAM 1
+// ostrstream is deprecated => switch to using ostringstream
+// Doing this with the above define so it is easy to switch
+// back to ostrstream this backwards compatability is needed
+// for some reason.
+
+#if defined(GSDL_USE_OSTRINGSTREAM)
+#  include <sstream>
+#else
+#  if defined(GSDL_USE_IOS_H)
+#    if defined(__WIN32__)
+#      include <strstrea.h> // vc4
+#    else
+#      include <strstream.h>
+#    endif
+#  else
+#    include <strstream>
+#  endif
+#endif
 
 receptionist recpt;
@@ -252 +247 @@
   // class as a filler (but most likely won't work) - only useful
   // if creating a binary that doesn't require access to the database
-  dbclass *db = new gdbmclass();
+  dbclass *db = new gdbmclass(gsdlhome);
 
 #endif
@@ -260 +255 @@
 #endif
 
-  // the list of actions.
-  pageaction *apageaction = new pageaction();
-  apageaction->set_receptionist(&recpt);
-  recpt.add_action(apageaction);
+  userdbclass *udb = new userdbclass(gsdlhome);
+  keydbclass *kdb = new keydbclass(gsdlhome);
+  // do these two database classes ever get deleted in the module version
+  // of Greenstone?
+
+  // librarymain.cpp deletes these when its finished its function
+  // does comparable code need to be put into "gsdl_deinit()" routine
+  // whatever that might be called in reality?
+
+  add_all_actions(recpt,udb,kdb);
+  add_all_browsers(recpt);
   
-  queryaction *aqueryaction = new queryaction();
-  aqueryaction->set_receptionist(&recpt);
-  recpt.add_action(aqueryaction);
-  
-#if defined(USE_SQLITE)
-  sqlqueryaction *asqlqueryaction = new sqlqueryaction();
-  asqlqueryaction->set_receptionist (&recpt);
-  recpt.add_action (asqlqueryaction);
-#endif
-
-  documentaction *adocumentaction = new documentaction();
-  adocumentaction->set_receptionist(&recpt);
-  recpt.add_action(adocumentaction);
-
-  extlinkaction *anextlinkaction = new extlinkaction();
-  recpt.add_action(anextlinkaction);
-
-  // phindaction is for MGPP and uses MGQuery
-#ifdef ENABLE_MGPP
-  phindaction *aphindaction = new phindaction();
-  recpt.add_action(aphindaction);
-#endif
-
-#if defined(USE_MYSQL) || defined(USE_ACCESS)
-  orderaction *aorderaction = new orderaction();
-  aorderaction->set_receptionist(&recpt);
-  recpt.add_action(aorderaction);
-#endif
-
-  configaction *aconfigaction = new configaction();
-  aconfigaction->set_receptionist(&recpt);
-  recpt.add_action(aconfigaction);
-
-  // list of browsers
-  vlistbrowserclass *avlistbrowserclass = new vlistbrowserclass();
-  recpt.add_browser(avlistbrowserclass);
-  recpt.setdefaultbrowser("VList");
-
-  hlistbrowserclass *ahlistbrowserclass = new hlistbrowserclass();
-  recpt.add_browser(ahlistbrowserclass);
-
-  datelistbrowserclass *adatelistbrowserclass = new datelistbrowserclass();
-  recpt.add_browser(adatelistbrowserclass);
-
-  invbrowserclass *ainvbrowserclass = new invbrowserclass();
-  recpt.add_browser(ainvbrowserclass);
-
-  pagedbrowserclass *apagedbrowserclass = new pagedbrowserclass();
-  recpt.add_browser(apagedbrowserclass);
-
-  phindbrowserclass *aphindbrowserclass = new phindbrowserclass();;
-  recpt.add_browser(aphindbrowserclass);
-  
+
   // configure everything
   recpt.configure("gsdlhome", gsdlhome);
@@ -500 +450 @@
   } 
 
+#ifdef GSDL_USE_OSTRINGSTREAM
+  ostringstream pageout;
+#else
   ostrstream pageout;
+#endif
 
   // get http headers
@@ -552 +506 @@
       return 500;
     } 
+#ifdef GSDL_USE_OSTRINGSTREAM
+    string out = pageout.str();
+    ap_rwrite(out.c_str(), out.size(), r);
+#else
     char *out = pageout.str();
     ap_rwrite(out, pageout.pcount(), r);
     pageout.rdbuf()->freeze(0);
+#endif
   }