Changeset 24498 for main/trunk/greenstone2/runtime-src/src/w32server/settings.cpp

Timestamp:

2011-08-26T18:49:30+12:00 (13 years ago)

Author:

ak19

Message:

Introduced the --mode=gli command line parameter, where the gli value is used as the property prefix when retrieving autoenter and start_browser properties from the config file. These changes go towards working with a single merged server config file (glisite.cfg and llssite.cfg)

File:

• main/trunk/greenstone2/runtime-src/src/w32server/settings.cpp (modified) (4 diffs)

main/trunk/greenstone2/runtime-src/src/w32server/settings.cpp

@@ -69 +69 @@
 int gsdl_start_browser = 1;
 int gsdl_address_resolution_method = 2;  // use localhost since users may switch between computers
+                // The resolution method was previously on 1: Get an IP, but don't resolve to a name
 text_t gsdl_host_IP;
-// The resolution method was previously on 1: Get an IP, but don't resolve to a name
+text_t gsdl_mode_property_prefix;
 
 // private data
@@ -313 +314 @@
     write_ini_line(fout, "portnumber", text_t(gsdl_port_num));
     write_ini_line(fout, "externalaccess", text_t(gsdl_external_access));
-    write_ini_line(fout, "autoenter", text_t(gsdl_auto_enter));
+    write_ini_line(fout, gsdl_mode_property_prefix+"autoenter", text_t(gsdl_auto_enter));
     write_ini_line(fout, "browser", text_t(gsdl_browser));
     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));
+    write_ini_line(fout, gsdl_mode_property_prefix+"start_browser", text_t(gsdl_start_browser));
     write_ini_line(fout, "address_resolution_method", text_t(gsdl_address_resolution_method));
     write_ini_line(fout, "hostIP", gsdl_host_IP);
@@ -407 +408 @@
   gsdl_port_num = 80;
   gsdl_external_access = 0;
-  gsdl_auto_enter = 0;
-  gsdl_start_browser = 1;
+  if(gsdl_mode_property_prefix == "") {
+    gsdl_auto_enter = 0;
+    gsdl_start_browser = 1;
+  } else {
+    gsdl_auto_enter = 1;
+    gsdl_start_browser = 0;
+  }
 
   check_installed_browsers (netscapeneeded);
@@ -473 +479 @@
         gsdl_external_access = value.getint();
         
-      } else if (key == "autoenter") {
+      } else if (key == gsdl_mode_property_prefix+"autoenter") {
         gsdl_auto_enter = value.getint();
         
-      } else if (key == "start_browser") {
+      } else if (key == gsdl_mode_property_prefix+"start_browser") {
         gsdl_start_browser = value.getint();