Changeset 18651

Timestamp:

2009-03-10T13:50:59+13:00 (15 years ago)

Author:

ak19

Message:

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

Location:

gsdl/trunk/runtime-src/src

Files:

• recpt/statusaction.cpp (modified) (2 diffs)
• recpt/statusaction.h (modified) (1 diff)
• w32server/fnord.cpp (modified) (2 diffs)
• w32server/settings.cpp (modified) (3 diffs)

gsdl/trunk/runtime-src/src/recpt/statusaction.cpp

@@ -838 +838 @@
 }
 
-void statusaction::output_gsdlsite (cgiargsclass &/*args*/, displayclass &disp, 
+void statusaction::output_llssite (cgiargsclass &/*args*/, displayclass &disp, 
                     outconvertclass &outconvert, 
                     ostream &textout, ostream &logout) {
 
-  textout << outconvert << disp << "_status:infoheader_(gsdlsite.cfg)\n";
-  textout << outconvert << "<h2>gsdlsite.cfg</h2>\n";
+  textout << outconvert << disp << "_status:infoheader_(llssite.cfg)\n";
+  textout << outconvert << "<h2>llssite.cfg</h2>\n";
   logout << flush;
 
 #ifdef GSDL_LOCAL_LIBRARY
-  text_t gsdlsite_cfg = filename_cat (gsdlhome, "gsdlsite.cfg");
+  text_t llssite_cfg = filename_cat (gsdlhome, "llssite.cfg");
 #else
-  text_t gsdlsite_cfg = "gsdlsite.cfg";
+  text_t llssite_cfg = "llssite.cfg";
 #endif
 
-  char *gsdlsite_cfgc = gsdlsite_cfg.getcstr();
+  char *llssite_cfgc = llssite_cfg.getcstr();
 #ifdef GSDL_USE_IOS_H
-  ifstream gsdlsitein (gsdlsite_cfgc, ios::in | ios::nocreate);
+  ifstream llssitein (llssite_cfgc, ios::in | ios::nocreate);
 #else
-  ifstream gsdlsitein (gsdlsite_cfgc, ios::in);
+  ifstream llssitein (llssite_cfgc, ios::in);
 #endif
 
-  delete []gsdlsite_cfgc;
-
-  if (gsdlsitein) {
-    textout << "<p>The gsdlsite.cfg configuration file contains the\n"
+  delete []llssite_cfgc;
+
+  if (llssitein) {
+    textout << "<p>The llssite.cfg configuration file contains the\n"
         << "following information:\n\n";
-    text_t gsdlsite = "<p><pre>\n";
+    text_t llssite = "<p><pre>\n";
 
     char c;
-    gsdlsitein.get(c);
-    while (!gsdlsitein.eof ()) {
-      gsdlsite.push_back(c);
-      gsdlsitein.get(c);
-    }
-    
-    gsdlsite += "</pre>\n";
-    gsdlsitein.close();
-    textout << outconvert << gsdlsite;
+    llssitein.get(c);
+    while (!llssitein.eof ()) {
+      llssite.push_back(c);
+      llssitein.get(c);
+    }
+    
+    llssite += "</pre>\n";
+    llssitein.close();
+    textout << outconvert << llssite;
 
   } else {
-    textout << "Couldn't read gsdlsite.cfg configuration file\n";
+    textout << "Couldn't read llssite.cfg configuration file\n";
   }
 
@@ -1129 +1129 @@
   else if (arg_p == "usagelog") output_usagelog (args, disp, outconvert, textout, logout);
   else if (arg_p == "errorlog") output_errorlog (args, disp, outconvert, textout, logout);
-  else if (arg_p == "gsdlsite") output_gsdlsite (args, disp, outconvert, textout, logout);
+  else if (arg_p == "llssite") output_llssite (args, disp, outconvert, textout, logout);
   else if (arg_p == "maincfg") output_maincfg (args, disp, outconvert, textout, logout);
   else if (arg_p == "changemaincfg") change_maincfg (args, disp, outconvert, textout, logout);

gsdl/trunk/runtime-src/src/recpt/statusaction.h

@@ -85 +85 @@
             ostream &textout, ostream &logout);
 
-  void output_gsdlsite (cgiargsclass &args, displayclass &disp, 
+  void output_llssite (cgiargsclass &args, displayclass &disp, 
             outconvertclass &outconvert, 
             ostream &textout, ostream &logout);

gsdl/trunk/runtime-src/src/w32server/fnord.cpp

@@ -864 +864 @@
 // directory where server.exe lives)
 // --config=file (the path to the configuration file to use which defaults
-// to GSDLHOME\gsdlsite.cfg)
-// --cmd=init  Used to initialize the gsdlsite.cfg file onlt - jmt12 18/11/2003
+// to GSDLHOME\llssite.cfg)
+// --cmd=init  Used to initialize the llssite.cfg file only - jmt12 18/11/2003
 static void parse_args(const text_t cmdline, text_t &location, text_t &config_file, text_t &command) {
 
@@ -915 +915 @@
 }
 
-// Added code to allow for an 'init' run of the server which just creates the gsdlsite.cfg file
+// Added code to allow for an 'init' run of the server which just creates the llssite.cfg file
 int __stdcall WinMain(HINSTANCE Instance, HINSTANCE /*PrevInstance*/, LPSTR CmdLineStr, int /*CmdShow*/) {
   HWND MainWindow;  MSG Message;  WNDCLASS MainClass;  

gsdl/trunk/runtime-src/src/w32server/settings.cpp

@@ -276 +276 @@
   if (gsdl_conffile.empty()) {
     find_location();
-    gsdl_conffile = filename_cat(data_location, "gsdlsite.cfg");
+    gsdl_conffile = filename_cat(data_location, "llssite.cfg");
   }
 
@@ -290 +290 @@
     
     if (!url.empty()) {
-      // url entry should only be written to gsdlsite.cfg when the
+      // url entry should only be written to llssite.cfg when the
       // server is actually running, not when it's stopped (since we
       // can't be sure what the url is at that stage). That is,
@@ -414 +414 @@
   if (gsdl_conffile.empty()) {
     find_location();
-    gsdl_conffile = filename_cat(data_location, "gsdlsite.cfg");
+    gsdl_conffile = filename_cat(data_location, "llssite.cfg");
   }