- Timestamp:
- 2000-05-28T21:15:35+12:00 (24 years ago)
- Location:
- trunk/gsdl/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/src/recpt/receptionist.cpp
r1170 r1193 28 28 /* 29 29 $Log$ 30 Revision 1.51 2000/05/28 09:15:34 sjboddie 31 a few small changes to get an initial release of the local library 32 30 33 Revision 1.50 2000/05/12 03:09:25 sjboddie 31 34 minor modifications to get web library compiling under VC++ 6.0 … … 259 262 collectdir.clear(); 260 263 httpprefix.clear(); 261 httpimg .clear();264 httpimg = "/images"; 262 265 gwcgi.clear(); 263 266 macrofiles.erase(macrofiles.begin(), macrofiles.end()); -
trunk/gsdl/src/recpt/receptionist.h
r864 r1193 58 58 colinfo_tmap collectinfo; 59 59 text_t httpprefix; 60 text_t httpimg; 60 text_t httpimg; // will equal /images if not set 61 61 text_t gwcgi; 62 62 text_tset macrofiles; -
trunk/gsdl/src/w32server/cgiwrapper.cpp
r1011 r1193 32 32 33 33 // actions 34 #include "action.h"35 34 #include "statusaction.h" 36 35 #include "pageaction.h" … … 38 37 #include "queryaction.h" 39 38 #include "documentaction.h" 39 #include "tipaction.h" 40 40 #include "authenaction.h" 41 41 #include "usersaction.h" 42 42 #include "extlinkaction.h" 43 //#include "buildaction.h"43 #include "buildaction.h" 44 44 #include "delhistoryaction.h" 45 45 46 46 // browsers 47 #include "browserclass.h"48 47 #include "vlistbrowserclass.h" 49 48 #include "hlistbrowserclass.h" … … 154 153 DWORD lastlibaccesstime; 155 154 DWORD baseavailvirtual; 156 157 static void page_errorsitecfg (const text_t &gsdlhome, const text_t &collection) {158 159 text_t message = "Error\n\n"160 "The site.cfg configuration file could not be found. This file\n"161 "should contain configuration information relating to this sites\n"162 "setup.\n";163 164 if (collection.empty()) {165 message += "As this program is not being run in collection specific mode,\n"166 "the file should reside at " + gsdlhome + "\\etc\\site.cfg.\n";167 } else {168 message += "As this program is being run in collection specific mode,\n"169 "the file can reside at " + gsdlhome + "\\collect\\" + collection +170 "\\etc\\site.cfg or " + gsdlhome + "\\etc\\site.cfg.\n";171 }172 173 MessageBox(NULL, message.getcstr(),174 "Greenstone Digital Library Software"175 ,MB_OK|MB_SYSTEMMODAL);176 }177 155 178 156 static void page_errormaincfg (const text_t &gsdlhome, const text_t &collection) { … … 430 408 recpt.add_action (apingaction); 431 409 410 tipaction *atipaction = new tipaction(); 411 recpt.add_action (atipaction); 412 432 413 queryaction *aqueryaction = new queryaction(); 433 414 recpt.add_action (aqueryaction); … … 442 423 recpt.add_action (anextlinkaction); 443 424 444 //buildaction *abuildaction = new buildaction();445 //abuildaction->set_receptionist (&recpt);446 //recpt.add_action (abuildaction);425 buildaction *abuildaction = new buildaction(); 426 abuildaction->set_receptionist (&recpt); 427 recpt.add_action (abuildaction); 447 428 448 429 authenaction *aauthenaction = new authenaction(); … … 450 431 recpt.add_action (aauthenaction); 451 432 452 delhistoryaction adelhistoryaction;453 recpt.add_action (&adelhistoryaction);433 delhistoryaction *adelhistoryaction = new delhistoryaction(); 434 recpt.add_action (adelhistoryaction); 454 435 455 436 … … 503 484 // those read in last will override those read earlier 504 485 // collections being used together in this way should be 505 // careful not to have site.cfg ormain.cfg files that might486 // careful not to have main.cfg files that might 506 487 // screw with each other. 507 488 text_tset::const_iterator thome = gsdlhomes.begin(); 508 489 text_tset::const_iterator ehome = gsdlhomes.end(); 509 490 while (thome != ehome) { 510 // TODO: should only need to do this once now I think511 // gsdlsite.cfg will need to be installed along with executable512 // if (!site_cfg_read (recpt, *thome, maxrequests)) {513 // couldn't find the site configuration file514 // page_errorsitecfg (*thome, collection);515 // return 0;516 // } else517 491 if (!main_cfg_read (recpt, *thome, collection)) { 518 492 // couldn't find the main configuration file
Note:
See TracChangeset
for help on using the changeset viewer.