Changeset 902 for trunk/gsdl/src/w32server/cgiwrapper.cpp

Timestamp:

2000-02-03T14:45:48+13:00 (24 years ago)

Author:

sjboddie

Message:

lots of stuff

File:

• trunk/gsdl/src/w32server/cgiwrapper.cpp (modified) (18 diffs)

trunk/gsdl/src/w32server/cgiwrapper.cpp

@@ -9 +9 @@
 #include "wincgiutils.h"
 #include "settings.h"
+#include "fileutil.h"
 
 #include "gsdlconf.h"
@@ -31 +32 @@
 #include "mggdbmsource.h"
 
-
 // actions
+#include "action.h"
+#include "statusaction.h"
 #include "pageaction.h"
 #include "pingaction.h"
 #include "queryaction.h"
 #include "documentaction.h"
-#include "statusaction.h"
+#include "authenaction.h"
 #include "usersaction.h"
-#include "authenaction.h"
-#include "tipaction.h"
+#include "extlinkaction.h"
+//#include "buildaction.h"
+
+// browsers
+#include "browserclass.h"
+#include "vlistbrowserclass.h"
+#include "hlistbrowserclass.h"
+#include "datelistbrowserclass.h"
+#include "invbrowserclass.h"
+#include "pagedbrowserclass.h"
+#include "htmlbrowserclass.h"
 
 // filters
@@ -115 +126 @@
 
 int logstreambuf::sync () {
-  if (gs_keep_log || gs_show_console) {
+  if (gsdl_keep_log || gsdl_show_console) {
     log_message ("LOCAL LIB MESSAGE: ");
         log_message_N (pbase(), out_waiting());
@@ -143 +154 @@
 DWORD lastlibaccesstime;
 DWORD baseavailvirtual;
-
 
 static void page_errorsitecfg (const text_t &gsdlhome, const text_t &collection) {
@@ -318 +328 @@
   cerr = &logstream;
   cout = &textstream;
-  
+
   // collection should be set to "" unless in 
   // collection specific mode
   text_t collection = "";
+  text_tset gsdlhomes;
+  text_tarray collections;
+  colinfo_tmap::const_iterator this_info = gsdl_collectinfo.begin();
+  colinfo_tmap::const_iterator end_info = gsdl_collectinfo.end();
 
   // note the current time
   lastlibaccesstime = GetTickCount();
-  
+
   // before we do the init we should make sure
   // that we can find the relevant directories
-  if (!checkdir (GSDL_GSDLHOME "\\")) return 0;
-  if (!checkdir (GSDL_GSDLHOME "\\macros\\")) return 0;
-  
-  // add a collection server for each collection
-  text_tarray collections;
-  ifstream collist (GSDL_GSDLHOME "/etc/collections.txt");
-  if (!collist) {
-    exit(1);
-  }
-  char col[100];
-  while (!collist.eof()) {
-    collist.getline (col, 100);
-    if (col[0] != '\0')
-      collections.push_back (col);
-  }
-  collist.close();
-
+  if (!checkdir (gsdl_gsdlhome + "\\")) return 0;
+  if (!checkdir (gsdl_gsdlhome + "\\macros\\")) return 0;
+
+  if (collection.empty()) {
+
+    // get all collections from each gsdlhome (this relies 
+    // on there not being more than one collection with the same 
+    // name)
+    read_dir (filename_cat (gsdl_gsdlhome, "collect"), collections);
+    gsdlhomes.insert (gsdl_gsdlhome);
+    while (this_info != end_info) {
+      if (gsdlhomes.find ((*this_info).second.gsdl_gsdlhome) == gsdlhomes.end()) {
+    read_dir (filename_cat ((*this_info).second.gsdl_gsdlhome, "collect"), collections);
+    gsdlhomes.insert ((*this_info).second.gsdl_gsdlhome);
+      }
+      this_info ++;
+    }
+  } else {
+    collections.push_back (collection);
+  }
+  
   text_tarray::const_iterator thiscol = collections.begin();
   text_tarray::const_iterator endcol = collections.end();
-  
+
   while (thiscol != endcol) {
-    
+
     // this memory is created but never destroyed
     // we're also not doing any error checking to make sure we didn't
@@ -396 +414 @@
   
   mapinconvertclass *gbinconvert = new mapinconvertclass();
-  gbinconvert->setmapfile (GSDL_GSDLHOME, "gbku", 0x25a1);
+  gbinconvert->setmapfile (gsdl_gsdlhome, "gbku", 0x25a1);
   mapoutconvertclass *gboutconvert = new mapoutconvertclass();
-  gboutconvert->setmapfile (GSDL_GSDLHOME, "ugbk", 0xa1f5);
+  gboutconvert->setmapfile (gsdl_gsdlhome, "ugbk", 0xa1f5);
   recpt.add_converter ("g", gbinconvert, gboutconvert);
   
@@ -407 +425 @@
   
   pageaction *apageaction = new pageaction();
-  apageaction->set_receptionist (&recpt);
   recpt.add_action (apageaction);
   
@@ -421 +438 @@
   usersaction *ausersaction = new usersaction();
   recpt.add_action (ausersaction);
+
+  extlinkaction *anextlinkaction = new extlinkaction();
+  recpt.add_action (anextlinkaction);
+
+  //  buildaction *abuildaction = new buildaction();
+  //  abuildaction->set_receptionist (&recpt);
+  //  recpt.add_action (abuildaction);
   
   authenaction *aauthenaction = new authenaction();
   aauthenaction->set_receptionist(&recpt);
   recpt.add_action (aauthenaction);
-  
-  tipaction *atipaction = new tipaction();
-  recpt.add_action (atipaction);
+
+
+  // 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);
+
+  htmlbrowserclass *ahtmlbrowserclass = new htmlbrowserclass();
+  recpt.add_browser (ahtmlbrowserclass);
   
   // set defaults
-  recpt.configure ("gsdlhome", GSDL_GSDLHOME);
+  recpt.configure ("gsdlhome", gsdl_gsdlhome);
   recpt.configure ("collection", collection);
 
   int maxrequests = 1;
-  if (!site_cfg_read (recpt, GSDL_GSDLHOME, collection, maxrequests)) {
-    // couldn't find the site configuration file
-    page_errorsitecfg (GSDL_GSDLHOME, collection);
-    return 0;
-  } else if (!main_cfg_read (recpt, GSDL_GSDLHOME, collection)) {
-    // couldn't find the main configuration file
-    page_errormaincfg (GSDL_GSDLHOME, collection);
-    return 0;
+  text_tset seenhomes;
+  this_info = gsdl_collectinfo.begin();
+
+  // configure any collections with gsdlhome (or gdbmhome) 
+  // different from the default
+  while (this_info != end_info) {
+    if (((*this_info).second.gsdl_gsdlhome != gsdl_gsdlhome) ||
+    ((*this_info).second.gsdl_gdbmhome != gsdl_gdbmhome) &&
+    (seenhomes.find ((*this_info).second.gsdl_gsdlhome + 
+             (*this_info).second.gsdl_gdbmhome) == seenhomes.end())) {
+      text_tarray tmpconf;
+      tmpconf.push_back ((*this_info).first);
+      tmpconf.push_back ((*this_info).second.gsdl_gsdlhome);
+      tmpconf.push_back ((*this_info).second.gsdl_gdbmhome);
+      recpt.configure ("collectinfo", tmpconf);
+      seenhomes.insert ((*this_info).second.gsdl_gsdlhome + 
+            (*this_info).second.gsdl_gdbmhome);
+    }
+    this_info ++;
+  }
+
+  // read in config files of each gsdlhome (in no particular order)
+  // 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 
+  // screw with each other.
+  text_tset::const_iterator thome = gsdlhomes.begin();
+  text_tset::const_iterator ehome = gsdlhomes.end();
+  while (thome != ehome) {
+    if (!site_cfg_read (recpt, *thome, collection, 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
+      page_errormaincfg (*thome, collection);
+      return 0;
+    }
+    thome ++;
   }
 
@@ -450 +523 @@
   if (!recpt.init(cerr)) {
     // an error occurred during the initialisation
-    page_errorinit(GSDL_GSDLHOME);
+    page_errorinit(gsdl_gsdlhome);
     return 0;
   }
@@ -465 +538 @@
 
 static void rememberpref (char *tailstr) {
-  strcpy(gs_enterlib, tailstr);
-
-  // add "a=p&p=home"
-  strcat(gs_enterlib, "&a=p&p=home");
+
+  //  gsdl_enterlib = tailstr;
 }
 
@@ -493 +564 @@
 
   // set up file name
-  text_t filenamet = text_t(GSDL_GSDLHOME) + filename;
+  text_t filenamet = text_t(gsdl_gsdlhome) + filename;
   text_t::iterator here = filenamet.begin();
   text_t::iterator end = filenamet.end();
@@ -538 +609 @@
   // has been no errors so far
   cgiargsclass args;
-  if (!recpt.parse_cgi_args (TailStr, args, cerr)) {
-    page_errorparseargs(GSDL_GSDLHOME);
+  text_tmap empty; // don't use this (it's for fastcgi on unix)
+  if (!recpt.parse_cgi_args (TailStr, args, cerr, empty)) {
+    page_errorparseargs(gsdl_gsdlhome);
     return;
   } 
@@ -547 +619 @@
   text_t response_data;
 
-  recpt.get_cgihead_info (args, response, response_data, cerr);
-  char *response_data_c = response_data.getcstr();
+  recpt.get_cgihead_info (args, response, response_data, cerr, empty);
 
   if (response == location) {
     // location response
-    if (send_header(strcat("@", response_data_c), RInfo) < 0) return;
-    // textstream << text_t2ascii << "Location: " << response_data << "\n\n";
+    response_data = "@" + recpt.expandmacros (response_data, args, cerr);
+    char *response_data_c = response_data.getcstr();
+    send_header(response_data_c, RInfo);
+    delete response_data_c;
+    return;
   } else if (response == content) {
     // content response
-    if (send_header(response_data_c, RInfo) < 0) return;
+    char *response_data_c = response_data.getcstr();
+    if (send_header(response_data_c, RInfo) < 0) {
+      delete response_data_c;
+      return;
+    }
+    delete response_data_c;
   } else {
     // unknown response
@@ -565 +644 @@
   textstream.tsbreset();
   textstream.setrequestinfo (RInfo);
-  delete response_data_c;
   
   if (!recpt.produce_content (args, cout, cerr)) {
-    page_errorcgipage(GSDL_GSDLHOME);
+    page_errorcgipage(gsdl_gsdlhome);
     return;
   } 
-  recpt.log_cgi_args (args, cerr);
+  recpt.log_cgi_args (args, cerr, empty);
 
   cout << flush;
@@ -598 +676 @@
     // log the difference in access times
     DWORD thislibaccesstime = GetTickCount();
-    if (gs_keep_log||gs_show_console) {
+    if (gsdl_keep_log||gsdl_show_console) {
       sprintf(tmpstr, "DELTA LIB ACCESS TIME: %i\n", (int)(thislibaccesstime - lastlibaccesstime));
       log_message (tmpstr);
@@ -605 +683 @@
     
     // log this request
-    if (gs_keep_log||gs_show_console) {
+    if (gsdl_keep_log||gsdl_show_console) {
       sprintf (tmpstr, "LOCAL LIB: %s\n", tailstr);
       log_message (tmpstr);
@@ -616 +694 @@
     
     // log memory information
-    if (gs_keep_log||gs_show_console) {
+    if (gsdl_keep_log||gsdl_show_console) {
       MEMORYSTATUS memstatus;
       memstatus.dwLength = sizeof(MEMORYSTATUS);
@@ -627 +705 @@
   } else {
     // local file
-    if (gs_keep_log||gs_show_console) {
+    if (gsdl_keep_log||gsdl_show_console) {
       sprintf (tmpstr, "LOCAL FILE: %s\n", tailstr);
       log_message (tmpstr);