- Timestamp:
- 2009-04-20T14:15:11+12:00 (15 years ago)
- Location:
- gsdl/trunk/runtime-src/src/recpt
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/runtime-src/src/recpt/cgiwrapper.cpp
r18882 r19109 318 318 cout << text_t2ascii << " dbhome=" << configinfo.dbhome << "\n"; 319 319 cout << text_t2ascii << " httpprefix=" << configinfo.httpprefix << "\n"; 320 cout << text_t2ascii << " http img=" << configinfo.httpimg<< "\n";320 cout << text_t2ascii << " httpweb=" << configinfo.httpweb << "\n"; 321 321 cout << text_t2ascii << " gwcgi=" << configinfo.gwcgi << "\n\n" 322 322 << " Note that unless gwcgi has been set from a configuration\n" … … 479 479 int maxrequests = 10000; 480 480 recpt.configure ("collection", collection); 481 recpt.configure ("httpimg", "/gsdl/images");482 481 char *script_name = getenv("SCRIPT_NAME"); 483 482 if (script_name != NULL) recpt.configure("gwcgi", script_name); … … 504 503 page_errorcollect (gsdlhome, errorpage, debug); 505 504 } 505 506 // set up the httpweb variable if it hasn't been defined yet 507 if (configinfo.httpweb.empty()) { 508 recpt.configure("httpweb", configinfo.httpprefix+"/web"); 509 } 510 506 511 // get the query string if it is not being run as a fastcgi 507 512 // script -
gsdl/trunk/runtime-src/src/recpt/receptionist.cpp
r18824 r19109 58 58 collectdir.clear(); 59 59 httpprefix.clear(); 60 http img = "/images";60 httpweb.clear(); 61 61 gwcgi.clear(); 62 62 macrofiles.erase(macrofiles.begin(), macrofiles.end()); … … 91 91 #endif 92 92 } 93 93 94 94 95 void collectioninfo_t::clear () { … … 236 237 else if (key == "collectdir") configinfo.collectdir = cfgline[0]; 237 238 else if (key == "httpprefix") configinfo.httpprefix = cfgline[0]; 238 else if (key == "http img") configinfo.httpimg= cfgline[0];239 else if (key == "httpweb") configinfo.httpweb = cfgline[0]; 239 240 else if (key == "gwcgi") configinfo.gwcgi = cfgline[0]; 240 241 else if (key == "macrofiles") { … … 1454 1455 disp.setmacro ("gsdlhome", displayclass::defaultpackage, dm_safe(configinfo.gsdlhome)); 1455 1456 disp.setmacro ("gwcgi", displayclass::defaultpackage, configinfo.gwcgi); 1456 disp.setmacro ("http img", displayclass::defaultpackage, configinfo.httpimg);1457 disp.setmacro ("httpweb", displayclass::defaultpackage, configinfo.httpweb); 1457 1458 disp.setmacro ("httpprefix", displayclass::defaultpackage, configinfo.httpprefix); 1458 1459 -
gsdl/trunk/runtime-src/src/recpt/receptionist.h
r16310 r19109 84 84 colinfo_tmap collectinfo; 85 85 text_t httpprefix; 86 text_t httpimg; // will equal /imagesif not set86 text_t httpweb; // will be set to httpprefix/web if not set 87 87 text_t gwcgi; 88 88 text_tset macrofiles; … … 118 118 void clear (); 119 119 recptconf () {clear();} 120 120 121 }; 121 122 -
gsdl/trunk/runtime-src/src/recpt/statusaction.cpp
r18882 r19109 149 149 << "<tr valign=top><th>httpprefix</th><td>\"" << rcinfo.httpprefix 150 150 << "\"</td></tr>\n" 151 << "<tr valign=top><th>http img</th><td>\"" << rcinfo.httpimg151 << "<tr valign=top><th>httpweb</th><td>\"" << rcinfo.httpweb 152 152 << "\"</td></tr>\n" 153 153 << "<tr valign=top><th>gwcgi</th><td>\"" << rcinfo.gwcgi
Note:
See TracChangeset
for help on using the changeset viewer.