Changeset 19109

Show
Ignore:
Timestamp:
20.04.2009 14:15:11 (10 years ago)
Author:
kjdon
Message:

httpimg changed to httpweb, and default is now httpprefix/web. not /images or /gsdl/images

Location:
gsdl/trunk/runtime-src/src/recpt
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/runtime-src/src/recpt/cgiwrapper.cpp

    r18882 r19109  
    318318    cout << text_t2ascii << "  dbhome=" << configinfo.dbhome << "\n"; 
    319319  cout << text_t2ascii << "  httpprefix=" << configinfo.httpprefix << "\n"; 
    320   cout << text_t2ascii << "  httpimg=" << configinfo.httpimg << "\n"; 
     320  cout << text_t2ascii << "  httpweb=" << configinfo.httpweb << "\n"; 
    321321  cout << text_t2ascii << "  gwcgi=" << configinfo.gwcgi << "\n\n" 
    322322       << "  Note that unless gwcgi has been set from a configuration\n" 
     
    479479  int maxrequests = 10000; 
    480480  recpt.configure ("collection", collection); 
    481   recpt.configure ("httpimg", "/gsdl/images"); 
    482481  char *script_name = getenv("SCRIPT_NAME"); 
    483482  if (script_name != NULL) recpt.configure("gwcgi", script_name); 
     
    504503    page_errorcollect (gsdlhome, errorpage, debug); 
    505504  } 
     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   
    506511  // get the query string if it is not being run as a fastcgi 
    507512  // script 
  • gsdl/trunk/runtime-src/src/recpt/receptionist.cpp

    r18824 r19109  
    5858  collectdir.clear(); 
    5959  httpprefix.clear(); 
    60   httpimg = "/images"; 
     60  httpweb.clear(); 
    6161  gwcgi.clear(); 
    6262  macrofiles.erase(macrofiles.begin(), macrofiles.end()); 
     
    9191#endif 
    9292} 
     93 
    9394 
    9495void collectioninfo_t::clear () { 
     
    236237    else if (key == "collectdir") configinfo.collectdir = cfgline[0]; 
    237238    else if (key == "httpprefix") configinfo.httpprefix = cfgline[0]; 
    238     else if (key == "httpimg") configinfo.httpimg = cfgline[0]; 
     239    else if (key == "httpweb") configinfo.httpweb = cfgline[0]; 
    239240    else if (key == "gwcgi") configinfo.gwcgi = cfgline[0]; 
    240241    else if (key == "macrofiles") { 
     
    14541455  disp.setmacro ("gsdlhome", displayclass::defaultpackage, dm_safe(configinfo.gsdlhome)); 
    14551456  disp.setmacro ("gwcgi", displayclass::defaultpackage, configinfo.gwcgi); 
    1456   disp.setmacro ("httpimg", displayclass::defaultpackage, configinfo.httpimg); 
     1457  disp.setmacro ("httpweb", displayclass::defaultpackage, configinfo.httpweb); 
    14571458  disp.setmacro ("httpprefix", displayclass::defaultpackage, configinfo.httpprefix); 
    14581459 
  • gsdl/trunk/runtime-src/src/recpt/receptionist.h

    r16310 r19109  
    8484   colinfo_tmap collectinfo; 
    8585   text_t httpprefix; 
    86    text_t httpimg;    // will equal /images if not set 
     86  text_t httpweb; // will be set to httpprefix/web if not set 
    8787   text_t gwcgi; 
    8888   text_tset macrofiles; 
     
    118118   void clear (); 
    119119   recptconf () {clear();} 
     120   
    120121}; 
    121122 
  • gsdl/trunk/runtime-src/src/recpt/statusaction.cpp

    r18882 r19109  
    149149      << "<tr valign=top><th>httpprefix</th><td>\"" << rcinfo.httpprefix 
    150150      << "\"</td></tr>\n" 
    151       << "<tr valign=top><th>httpimg</th><td>\"" << rcinfo.httpimg 
     151      << "<tr valign=top><th>httpweb</th><td>\"" << rcinfo.httpweb 
    152152      << "\"</td></tr>\n" 
    153153      << "<tr valign=top><th>gwcgi</th><td>\"" << rcinfo.gwcgi