Changeset 18651


Ignore:
Timestamp:
2009-03-10T13:50:59+13:00 (12 years ago)
Author:
ak19
Message:

Renaming toplevel gsdlsite.cfg to llssite.cfg (lls = local library server)

Location:
gsdl/trunk/runtime-src/src
Files:
4 edited

Legend:

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

    r17863 r18651  
    838838}
    839839
    840 void statusaction::output_gsdlsite (cgiargsclass &/*args*/, displayclass &disp,
     840void statusaction::output_llssite (cgiargsclass &/*args*/, displayclass &disp,
    841841                    outconvertclass &outconvert,
    842842                    ostream &textout, ostream &logout) {
    843843
    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";
    846846  logout << flush;
    847847
    848848#ifdef GSDL_LOCAL_LIBRARY
    849   text_t gsdlsite_cfg = filename_cat (gsdlhome, "gsdlsite.cfg");
     849  text_t llssite_cfg = filename_cat (gsdlhome, "llssite.cfg");
    850850#else
    851   text_t gsdlsite_cfg = "gsdlsite.cfg";
     851  text_t llssite_cfg = "llssite.cfg";
    852852#endif
    853853
    854   char *gsdlsite_cfgc = gsdlsite_cfg.getcstr();
     854  char *llssite_cfgc = llssite_cfg.getcstr();
    855855#ifdef GSDL_USE_IOS_H
    856   ifstream gsdlsitein (gsdlsite_cfgc, ios::in | ios::nocreate);
     856  ifstream llssitein (llssite_cfgc, ios::in | ios::nocreate);
    857857#else
    858   ifstream gsdlsitein (gsdlsite_cfgc, ios::in);
     858  ifstream llssitein (llssite_cfgc, ios::in);
    859859#endif
    860860
    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"
    865865        << "following information:\n\n";
    866     text_t gsdlsite = "<p><pre>\n";
     866    text_t llssite = "<p><pre>\n";
    867867
    868868    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;
    878878
    879879  } else {
    880     textout << "Couldn't read gsdlsite.cfg configuration file\n";
     880    textout << "Couldn't read llssite.cfg configuration file\n";
    881881  }
    882882
     
    11291129  else if (arg_p == "usagelog") output_usagelog (args, disp, outconvert, textout, logout);
    11301130  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);
    11321132  else if (arg_p == "maincfg") output_maincfg (args, disp, outconvert, textout, logout);
    11331133  else if (arg_p == "changemaincfg") change_maincfg (args, disp, outconvert, textout, logout);
  • gsdl/trunk/runtime-src/src/recpt/statusaction.h

    r7371 r18651  
    8585            ostream &textout, ostream &logout);
    8686
    87   void output_gsdlsite (cgiargsclass &args, displayclass &disp,
     87  void output_llssite (cgiargsclass &args, displayclass &disp,
    8888            outconvertclass &outconvert,
    8989            ostream &textout, ostream &logout);
  • gsdl/trunk/runtime-src/src/w32server/fnord.cpp

    r11718 r18651  
    864864// directory where server.exe lives)
    865865// --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/2003
     866// to GSDLHOME\llssite.cfg)
     867// --cmd=init  Used to initialize the llssite.cfg file only - jmt12 18/11/2003
    868868static void parse_args(const text_t cmdline, text_t &location, text_t &config_file, text_t &command) {
    869869
     
    915915}
    916916
    917 // Added code to allow for an 'init' run of the server which just creates the gsdlsite.cfg file
     917// Added code to allow for an 'init' run of the server which just creates the llssite.cfg file
    918918int __stdcall WinMain(HINSTANCE Instance, HINSTANCE /*PrevInstance*/, LPSTR CmdLineStr, int /*CmdShow*/) {
    919919  HWND MainWindow;  MSG Message;  WNDCLASS MainClass; 
  • gsdl/trunk/runtime-src/src/w32server/settings.cpp

    r18018 r18651  
    276276  if (gsdl_conffile.empty()) {
    277277    find_location();
    278     gsdl_conffile = filename_cat(data_location, "gsdlsite.cfg");
     278    gsdl_conffile = filename_cat(data_location, "llssite.cfg");
    279279  }
    280280
     
    290290   
    291291    if (!url.empty()) {
    292       // url entry should only be written to gsdlsite.cfg when the
     292      // url entry should only be written to llssite.cfg when the
    293293      // server is actually running, not when it's stopped (since we
    294294      // can't be sure what the url is at that stage). That is,
     
    414414  if (gsdl_conffile.empty()) {
    415415    find_location();
    416     gsdl_conffile = filename_cat(data_location, "gsdlsite.cfg");
     416    gsdl_conffile = filename_cat(data_location, "llssite.cfg");
    417417  }
    418418 
Note: See TracChangeset for help on using the changeset viewer.