Changeset 1279 for branches/New_Config_Format-branch/gsdl/src/w32server/cgiwrapper.cpp

Timestamp:

2000-07-13T10:21:53+12:00 (24 years ago)

Author:

sjboddie

Message:

merged changes to trunk into New_Config_Format branch

File:

• branches/New_Config_Format-branch/gsdl/src/w32server/cgiwrapper.cpp (modified) (14 diffs)

branches/New_Config_Format-branch/gsdl/src/w32server/cgiwrapper.cpp

@@ +1 @@
+#include "text_t.h"
+
 #include <windows.h>
 #include <string.h>
@@ -32 +34 @@
 
 // actions
-#include "action.h"
 #include "statusaction.h"
 #include "pageaction.h"
@@ -38 +39 @@
 #include "queryaction.h"
 #include "documentaction.h"
+#include "tipaction.h"
 #include "authenaction.h"
 #include "usersaction.h"
 #include "extlinkaction.h"
-//#include "buildaction.h"
+#include "buildaction.h"
 #include "delhistoryaction.h"
 
 // browsers
-#include "browserclass.h"
 #include "vlistbrowserclass.h"
 #include "hlistbrowserclass.h"
@@ -78 +79 @@
   RequestInfoT *RInfo;
   ostream *casostr;
+#if !defined (GSDL_USE_IOS_H)
+  char buffer[256];
+#endif
 };
 
 textstreambuf::textstreambuf() {
   tsbreset();
+#if !defined (GSDL_USE_IOS_H)
+  setp (&buffer[0], &buffer[255]);
+#else
   if (base() == ebuf()) allocate();
   setp (base(), ebuf());
+#endif
 };
 
 int textstreambuf::sync () {
   if ((RInfo != NULL) && 
-      (Send_String_N(pbase(), out_waiting(), RInfo) < 0)) {
+      (Send_String_N(pbase(), pptr()-pbase(), RInfo) < 0)) {
     RInfo = NULL;
   }
@@ -94 +102 @@
   if (casostr != NULL) {
     char *thepbase=pbase();
-        for (int i=0;i<out_waiting();i++) (*casostr).put(thepbase[i]);
+    for (int i=0;i<(pptr()-pbase());i++) (*casostr).put(thepbase[i]);
   }
   
@@ -118 +126 @@
   int overflow (int ch);
   int underflow () {return EOF;}
+
+#if !defined (GSDL_USE_IOS_H)
+private:
+  char buffer[256];
+#endif
 };
 
 logstreambuf::logstreambuf () {
+#if !defined (GSDL_USE_IOS_H)
+  setp (&buffer[0], &buffer[255]);
+#else
   if (base() == ebuf()) allocate();
   setp (base(), ebuf());
+#endif
 }
 
@@ -128 +145 @@
   if (gsdl_keep_log || gsdl_show_console) {
     log_message ("LOCAL LIB MESSAGE: ");
-        log_message_N (pbase(), out_waiting());
+        log_message_N (pbase(), pptr()-pbase());
   }
 
@@ -154 +171 @@
 DWORD lastlibaccesstime;
 DWORD baseavailvirtual;
-
-static void page_errorsitecfg (const text_t &gsdlhome, const text_t &collection) {
-    
-  text_t message = "Error\n\n"
-    "The site.cfg configuration file could not be found. This file\n"
-    "should contain configuration information relating to this sites\n"
-    "setup.\n";
-  
-  if (collection.empty()) {
-    message += "As this program is not being run in collection specific mode,\n"
-      "the file should reside at " + gsdlhome + "\\etc\\site.cfg.\n";
-  } else {
-    message += "As this program is being run in collection specific mode,\n"
-      "the file can reside at " + gsdlhome + "\\collect\\" + collection +
-      "\\etc\\site.cfg or " + gsdlhome + "\\etc\\site.cfg.\n";
-  }
-
-  MessageBox(NULL, message.getcstr(),
-         "Greenstone Digital Library Software"
-         ,MB_OK|MB_SYSTEMMODAL);
-}
 
 static void page_errormaincfg (const text_t &gsdlhome, const text_t &collection) {
@@ -326 +322 @@
 // returns 1 if successful, 0 if unsuccessful
 int gsdl_init () {
+#if defined (GSDL_USE_IOS_H)
   cerr = &logstream;
   cout = &textstream;
+#else
+  cerr.rdbuf(&logstream);
+  cout.rdbuf(&textstream);
+#endif
 
   // collection should be set to "" unless in 
@@ -425 +426 @@
   
   pageaction *apageaction = new pageaction();
+  apageaction->set_receptionist (&recpt);
   recpt.add_action (apageaction);
   
@@ -430 +432 @@
   recpt.add_action (apingaction);
   
+  tipaction *atipaction = new tipaction();
+  recpt.add_action (atipaction);
+  
   queryaction *aqueryaction = new queryaction();
+  aqueryaction->set_receptionist (&recpt);
   recpt.add_action (aqueryaction);
   
   documentaction *adocumentaction = new documentaction();
+  adocumentaction->set_receptionist (&recpt);
   recpt.add_action (adocumentaction);
   
@@ -442 +449 @@
   recpt.add_action (anextlinkaction);
 
-  //  buildaction *abuildaction = new buildaction();
-  //  abuildaction->set_receptionist (&recpt);
-  //  recpt.add_action (abuildaction);
+  buildaction *abuildaction = new buildaction();
+  abuildaction->set_receptionist (&recpt);
+  recpt.add_action (abuildaction);
   
   authenaction *aauthenaction = new authenaction();
@@ -450 +457 @@
   recpt.add_action (aauthenaction);
 
-  delhistoryaction adelhistoryaction;
-  recpt.add_action(&adelhistoryaction);
+  delhistoryaction *adelhistoryaction = new delhistoryaction();
+  recpt.add_action (adelhistoryaction);
 
 
@@ -503 +510 @@
   // those read in last will override those read earlier
   // collections being used together in this way should be 
-  // careful not to have site.cfg or main.cfg files that might 
+  // careful not to have main.cfg files that might 
   // screw with each other.
   text_tset::const_iterator thome = gsdlhomes.begin();
   text_tset::const_iterator ehome = gsdlhomes.end();
   while (thome != ehome) {
-    // TODO: should only need to do this once now I think
-    // gsdlsite.cfg will need to be installed along with executable
-    //    if (!site_cfg_read (recpt, *thome, maxrequests)) {
-      // couldn't find the site configuration file
-    //      page_errorsitecfg (*thome, collection);
-    //      return 0;
-    //    } else 
     if (!main_cfg_read (recpt, *thome, collection)) {
       // couldn't find the main configuration file