Changeset 4292

Timestamp:

2003-05-21T14:00:33+12:00 (21 years ago)

Author:

sjboddie

Message:

server.exe now writes a "url" entry to its configuration file when it starts
up and removes it when it shuts down. This allows the gatherer (and
anything else that needs to) to detect if the server is running and to
know exactly what url it's using.

Location:

trunk/gsdl/src/w32server

Files:

• fnord.cpp (modified) (3 diffs)
• settings.cpp (modified) (4 diffs)
• settings.h (modified) (1 diff)

trunk/gsdl/src/w32server/fnord.cpp

@@ -142 +142 @@
 void finish_up() {
   // remember the current preferences
-  write_settings();
+  write_settings("");
 
   // Shutdown the HTTP server
@@ -320 +320 @@
   if (have_networking) {
     text_t url = "http://" + text_t(localname);
+
+    gsdl_url = url;
+    write_settings(gsdl_url);
+
     if (gsdl_port_num != 80)
       url += ":" + text_t(gsdl_port_num);
-    
+
     url += gsdl_enterlib;
 
@@ -367 +371 @@
          "Failed to start your chosen browser. It seems that your\n"
          "chosen browser has been removed or corrupted.\n"
-         "Please check you browser choice by going to the\n"
+         "Please check your browser choice by going to the\n"
          "'Settings...' item under the 'File' menu.",
          "Greenstone Digital Library Software", MB_OK);

trunk/gsdl/src/w32server/settings.cpp

@@ -62 +62 @@
 int gsdl_browser = GS_IEXPLORE;
 char gsdl_browser_exe[MAX_FILENAME_SIZE] = "";
-
+text_t gsdl_url;
 
 // private data
@@ -267 +267 @@
 }
 
-void write_settings () {
+void write_settings (const text_t url) {
   char conffile[MAX_FILENAME_SIZE];
   
@@ -281 +281 @@
     // top (gsdl) level stuff
     fout << "[gsdl]\n";
+    
+    if (!url.empty()) {
+      // url entry should only be written to gsdlsite.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,
+      // write_settings() is called with the url argument set when the
+      // server first starts up, it's then called without url set as
+      // the server shuts down.
+      write_ini_line(fout, "url", url);      
+    }
+
     write_ini_line(fout, "enterlib", gsdl_enterlib);
     write_ini_line(fout, "gsdlhome", gsdl_gsdlhome);
@@ -814 +825 @@
   // save the settings if we exited via the ok button
   if (res == 1) {
-    write_settings();
+    write_settings(gsdl_url);
     // reset httpprefix in case port number was changed
     //    configure_httpprefix ();

trunk/gsdl/src/w32server/settings.h

@@ -57 +57 @@
 extern int gsdl_browser;
 extern char gsdl_browser_exe[MAX_FILENAME_SIZE];
+extern text_t gsdl_url;
 
 void Settings_Dialog(HWND window, int netscapeneeded);
 
 void read_settings (int netscapeneeded);
-void write_settings ();
+void write_settings (const text_t url);
 
 void gsdl_check_browser_settings (int netscapeneeded);