Changeset 1193

Timestamp:

2000-05-28T21:15:35+12:00 (24 years ago)

Author:

sjboddie

Message:

a few small changes to get an initial release of the local library

Location:

trunk/gsdl/src

Files:

• recpt/receptionist.cpp (modified) (2 diffs)
• recpt/receptionist.h (modified) (1 diff)
• w32server/cgiwrapper.cpp (modified) (7 diffs)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.51  2000/05/28 09:15:34  sjboddie
+   a few small changes to get an initial release of the local library
+
    Revision 1.50  2000/05/12 03:09:25  sjboddie
    minor modifications to get web library compiling under VC++ 6.0
@@ -259 +262 @@
   collectdir.clear();
   httpprefix.clear();
-  httpimg.clear();
+  httpimg = "/images";
   gwcgi.clear();
   macrofiles.erase(macrofiles.begin(), macrofiles.end());

trunk/gsdl/src/recpt/receptionist.h

@@ -58 +58 @@
   colinfo_tmap collectinfo;
   text_t httpprefix;
-  text_t httpimg;
+  text_t httpimg;    // will equal /images if not set
   text_t gwcgi;
   text_tset macrofiles;

trunk/gsdl/src/w32server/cgiwrapper.cpp

@@ -32 +32 @@
 
 // actions
-#include "action.h"
 #include "statusaction.h"
 #include "pageaction.h"
@@ -38 +37 @@
 #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"
@@ -154 +153 @@
 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) {
@@ -430 +408 @@
   recpt.add_action (apingaction);
   
+  tipaction *atipaction = new tipaction();
+  recpt.add_action (atipaction);
+  
   queryaction *aqueryaction = new queryaction();
   recpt.add_action (aqueryaction);
@@ -442 +423 @@
   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 +431 @@
   recpt.add_action (aauthenaction);
 
-  delhistoryaction adelhistoryaction;
-  recpt.add_action(&adelhistoryaction);
+  delhistoryaction *adelhistoryaction = new delhistoryaction();
+  recpt.add_action (adelhistoryaction);
 
 
@@ -503 +484 @@
   // 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