Changeset 18651 for gsdl/trunk/runtime-src/src
- Timestamp:
- 2009-03-10T13:50:59+13:00 (15 years ago)
- Location:
- gsdl/trunk/runtime-src/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/runtime-src/src/recpt/statusaction.cpp
r17863 r18651 838 838 } 839 839 840 void statusaction::output_ gsdlsite (cgiargsclass &/*args*/, displayclass &disp,840 void statusaction::output_llssite (cgiargsclass &/*args*/, displayclass &disp, 841 841 outconvertclass &outconvert, 842 842 ostream &textout, ostream &logout) { 843 843 844 textout << outconvert << disp << "_status:infoheader_( gsdlsite.cfg)\n";845 textout << outconvert << "<h2> gsdlsite.cfg</h2>\n";844 textout << outconvert << disp << "_status:infoheader_(llssite.cfg)\n"; 845 textout << outconvert << "<h2>llssite.cfg</h2>\n"; 846 846 logout << flush; 847 847 848 848 #ifdef GSDL_LOCAL_LIBRARY 849 text_t gsdlsite_cfg = filename_cat (gsdlhome, "gsdlsite.cfg");849 text_t llssite_cfg = filename_cat (gsdlhome, "llssite.cfg"); 850 850 #else 851 text_t gsdlsite_cfg = "gsdlsite.cfg";851 text_t llssite_cfg = "llssite.cfg"; 852 852 #endif 853 853 854 char * gsdlsite_cfgc = gsdlsite_cfg.getcstr();854 char *llssite_cfgc = llssite_cfg.getcstr(); 855 855 #ifdef GSDL_USE_IOS_H 856 ifstream gsdlsitein (gsdlsite_cfgc, ios::in | ios::nocreate);856 ifstream llssitein (llssite_cfgc, ios::in | ios::nocreate); 857 857 #else 858 ifstream gsdlsitein (gsdlsite_cfgc, ios::in);858 ifstream llssitein (llssite_cfgc, ios::in); 859 859 #endif 860 860 861 delete [] gsdlsite_cfgc;862 863 if ( gsdlsitein) {864 textout << "<p>The gsdlsite.cfg configuration file contains the\n"861 delete []llssite_cfgc; 862 863 if (llssitein) { 864 textout << "<p>The llssite.cfg configuration file contains the\n" 865 865 << "following information:\n\n"; 866 text_t gsdlsite = "<p><pre>\n";866 text_t llssite = "<p><pre>\n"; 867 867 868 868 char c; 869 gsdlsitein.get(c);870 while (! gsdlsitein.eof ()) {871 gsdlsite.push_back(c);872 gsdlsitein.get(c);873 } 874 875 gsdlsite += "</pre>\n";876 gsdlsitein.close();877 textout << outconvert << gsdlsite;869 llssitein.get(c); 870 while (!llssitein.eof ()) { 871 llssite.push_back(c); 872 llssitein.get(c); 873 } 874 875 llssite += "</pre>\n"; 876 llssitein.close(); 877 textout << outconvert << llssite; 878 878 879 879 } else { 880 textout << "Couldn't read gsdlsite.cfg configuration file\n";880 textout << "Couldn't read llssite.cfg configuration file\n"; 881 881 } 882 882 … … 1129 1129 else if (arg_p == "usagelog") output_usagelog (args, disp, outconvert, textout, logout); 1130 1130 else if (arg_p == "errorlog") output_errorlog (args, disp, outconvert, textout, logout); 1131 else if (arg_p == " gsdlsite") output_gsdlsite (args, disp, outconvert, textout, logout);1131 else if (arg_p == "llssite") output_llssite (args, disp, outconvert, textout, logout); 1132 1132 else if (arg_p == "maincfg") output_maincfg (args, disp, outconvert, textout, logout); 1133 1133 else if (arg_p == "changemaincfg") change_maincfg (args, disp, outconvert, textout, logout); -
gsdl/trunk/runtime-src/src/recpt/statusaction.h
r7371 r18651 85 85 ostream &textout, ostream &logout); 86 86 87 void output_ gsdlsite (cgiargsclass &args, displayclass &disp,87 void output_llssite (cgiargsclass &args, displayclass &disp, 88 88 outconvertclass &outconvert, 89 89 ostream &textout, ostream &logout); -
gsdl/trunk/runtime-src/src/w32server/fnord.cpp
r11718 r18651 864 864 // directory where server.exe lives) 865 865 // --config=file (the path to the configuration file to use which defaults 866 // to GSDLHOME\ gsdlsite.cfg)867 // --cmd=init Used to initialize the gsdlsite.cfg file onlt- jmt12 18/11/2003866 // to GSDLHOME\llssite.cfg) 867 // --cmd=init Used to initialize the llssite.cfg file only - jmt12 18/11/2003 868 868 static void parse_args(const text_t cmdline, text_t &location, text_t &config_file, text_t &command) { 869 869 … … 915 915 } 916 916 917 // Added code to allow for an 'init' run of the server which just creates the gsdlsite.cfg file917 // Added code to allow for an 'init' run of the server which just creates the llssite.cfg file 918 918 int __stdcall WinMain(HINSTANCE Instance, HINSTANCE /*PrevInstance*/, LPSTR CmdLineStr, int /*CmdShow*/) { 919 919 HWND MainWindow; MSG Message; WNDCLASS MainClass; -
gsdl/trunk/runtime-src/src/w32server/settings.cpp
r18018 r18651 276 276 if (gsdl_conffile.empty()) { 277 277 find_location(); 278 gsdl_conffile = filename_cat(data_location, " gsdlsite.cfg");278 gsdl_conffile = filename_cat(data_location, "llssite.cfg"); 279 279 } 280 280 … … 290 290 291 291 if (!url.empty()) { 292 // url entry should only be written to gsdlsite.cfg when the292 // url entry should only be written to llssite.cfg when the 293 293 // server is actually running, not when it's stopped (since we 294 294 // can't be sure what the url is at that stage). That is, … … 414 414 if (gsdl_conffile.empty()) { 415 415 find_location(); 416 gsdl_conffile = filename_cat(data_location, " gsdlsite.cfg");416 gsdl_conffile = filename_cat(data_location, "llssite.cfg"); 417 417 } 418 418
Note:
See TracChangeset
for help on using the changeset viewer.