Index: /gsdl/trunk/runtime-src/src/recpt/cgiwrapper.cpp =================================================================== --- /gsdl/trunk/runtime-src/src/recpt/cgiwrapper.cpp (revision 19108) +++ /gsdl/trunk/runtime-src/src/recpt/cgiwrapper.cpp (revision 19109) @@ -318,5 +318,5 @@ cout << text_t2ascii << " dbhome=" << configinfo.dbhome << "\n"; cout << text_t2ascii << " httpprefix=" << configinfo.httpprefix << "\n"; - cout << text_t2ascii << " httpimg=" << configinfo.httpimg << "\n"; + cout << text_t2ascii << " httpweb=" << configinfo.httpweb << "\n"; cout << text_t2ascii << " gwcgi=" << configinfo.gwcgi << "\n\n" << " Note that unless gwcgi has been set from a configuration\n" @@ -479,5 +479,4 @@ int maxrequests = 10000; recpt.configure ("collection", collection); - recpt.configure ("httpimg", "/gsdl/images"); char *script_name = getenv("SCRIPT_NAME"); if (script_name != NULL) recpt.configure("gwcgi", script_name); @@ -504,4 +503,10 @@ page_errorcollect (gsdlhome, errorpage, debug); } + + // set up the httpweb variable if it hasn't been defined yet + if (configinfo.httpweb.empty()) { + recpt.configure("httpweb", configinfo.httpprefix+"/web"); + } + // get the query string if it is not being run as a fastcgi // script Index: /gsdl/trunk/runtime-src/src/recpt/receptionist.cpp =================================================================== --- /gsdl/trunk/runtime-src/src/recpt/receptionist.cpp (revision 19108) +++ /gsdl/trunk/runtime-src/src/recpt/receptionist.cpp (revision 19109) @@ -58,5 +58,5 @@ collectdir.clear(); httpprefix.clear(); - httpimg = "/images"; + httpweb.clear(); gwcgi.clear(); macrofiles.erase(macrofiles.begin(), macrofiles.end()); @@ -91,4 +91,5 @@ #endif } + void collectioninfo_t::clear () { @@ -236,5 +237,5 @@ else if (key == "collectdir") configinfo.collectdir = cfgline[0]; else if (key == "httpprefix") configinfo.httpprefix = cfgline[0]; - else if (key == "httpimg") configinfo.httpimg = cfgline[0]; + else if (key == "httpweb") configinfo.httpweb = cfgline[0]; else if (key == "gwcgi") configinfo.gwcgi = cfgline[0]; else if (key == "macrofiles") { @@ -1454,5 +1455,5 @@ disp.setmacro ("gsdlhome", displayclass::defaultpackage, dm_safe(configinfo.gsdlhome)); disp.setmacro ("gwcgi", displayclass::defaultpackage, configinfo.gwcgi); - disp.setmacro ("httpimg", displayclass::defaultpackage, configinfo.httpimg); + disp.setmacro ("httpweb", displayclass::defaultpackage, configinfo.httpweb); disp.setmacro ("httpprefix", displayclass::defaultpackage, configinfo.httpprefix); Index: /gsdl/trunk/runtime-src/src/recpt/receptionist.h =================================================================== --- /gsdl/trunk/runtime-src/src/recpt/receptionist.h (revision 19108) +++ /gsdl/trunk/runtime-src/src/recpt/receptionist.h (revision 19109) @@ -84,5 +84,5 @@ colinfo_tmap collectinfo; text_t httpprefix; - text_t httpimg; // will equal /images if not set + text_t httpweb; // will be set to httpprefix/web if not set text_t gwcgi; text_tset macrofiles; @@ -118,4 +118,5 @@ void clear (); recptconf () {clear();} + }; Index: /gsdl/trunk/runtime-src/src/recpt/statusaction.cpp =================================================================== --- /gsdl/trunk/runtime-src/src/recpt/statusaction.cpp (revision 19108) +++ /gsdl/trunk/runtime-src/src/recpt/statusaction.cpp (revision 19109) @@ -149,5 +149,5 @@ << "