Changeset 4339

Timestamp:

2003-05-27T10:58:48+12:00 (21 years ago)

Author:

sjboddie

Message:

Added "start_browser" option to server.exe's gsdlsite.cfg file. Setting
this option to 0 will make the server start up without opening a browser
window.

Location:

trunk/gsdl/src/w32server

Files:

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

trunk/gsdl/src/w32server/fnord.cpp

@@ -340 +340 @@
     enterlib_libaccessnum = libaccessnum;
     
-    // do a quick check to make sure we're using netscape when
-    // we should be (it might have been just installed)
-    if (netscapeneeded) gsdl_check_browser_settings (netscapeneeded);
-    
-    char *cstr_url = url.getcstr();
-    if (strlen (startbrowserdir) <= 0) {
-      res = startbrowser (cstr_url, gsdl_browser_exe, NULL);
-      
-    } else res = startbrowser (cstr_url, gsdl_browser_exe, startbrowserdir);
-    
-    delete cstr_url;
-
+    if (gsdl_start_browser) {
+
+      // do a quick check to make sure we're using netscape when
+      // we should be (it might have been just installed)
+      if (netscapeneeded) gsdl_check_browser_settings (netscapeneeded);
+    
+      char *cstr_url = url.getcstr();
+      if (strlen (startbrowserdir) <= 0) {
+    res = startbrowser (cstr_url, gsdl_browser_exe, NULL);
+    
+      } else res = startbrowser (cstr_url, gsdl_browser_exe, startbrowserdir);
+    
+      delete cstr_url;
+
+    } else {
+      return 1;
+    }
   }
   
@@ -496 +501 @@
     if ((GoButton != NULL) && ((HWND)LParam == GoButton)) {
       // attempt to start a browser
+      gsdl_start_browser = 1;
       if (enter_library (Window) && !gsdl_show_console) 
         ShowWindow(Window,SW_MINIMIZE);
@@ -974 +980 @@
   
   // attempt to start a browser
-  if (gsdl_show_console) infostring = strnothing;
+  if (gsdl_show_console || !gsdl_start_browser) infostring = strnothing;
   else infostring = strsb;
   paint_window (pdc, windowRect);
@@ -1030 +1036 @@
     // do check
     lastcheck = GetTickCount();
-    if (browserrunning(gsdl_browser_exe) == NO_ERROR) {
+    if (gsdl_start_browser && browserrunning(gsdl_browser_exe) == NO_ERROR) {
       // we were able to connect to a browser
       seenbrowser = 1;

trunk/gsdl/src/w32server/settings.cpp

@@ -63 +63 @@
 char gsdl_browser_exe[MAX_FILENAME_SIZE] = "";
 text_t gsdl_url;
+int gsdl_start_browser = 1;
 
 // private data
@@ -305 +306 @@
     write_ini_line(fout, "browserexe", gsdl_browser_exe);
     write_ini_line(fout, "collections", gsdl_collections);
+    write_ini_line(fout, "start_browser", text_t(gsdl_start_browser));
     
     // collection levels
@@ -386 +388 @@
   gsdl_port_num = 80;
   gsdl_auto_enter = 0;
-  
+  gsdl_start_browser = 1;
+
   check_installed_browsers (netscapeneeded);
   gsdl_browser = GS_IEXPLORE;
@@ -449 +452 @@
       } else if (key == "autoenter") {
         gsdl_auto_enter = value.getint();
+        
+      } else if (key == "start_browser") {
+        gsdl_start_browser = value.getint();
     
       } else if (key == "browser") {

trunk/gsdl/src/w32server/settings.h

@@ -58 +58 @@
 extern char gsdl_browser_exe[MAX_FILENAME_SIZE];
 extern text_t gsdl_url;
+extern int gsdl_start_browser;
 
 void Settings_Dialog(HWND window, int netscapeneeded);