Changeset 4357

Timestamp:

2003-05-27T15:23:23+12:00 (21 years ago)

Author:

jmt12

Message:

Added some static string for server configuration and implemented start_browser changes - John

File:

• trunk/gli/src/org/greenstone/gatherer/util/GSDLSiteConfig.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/util/GSDLSiteConfig.java

@@ -8 +8 @@
      private File gsdlsite_cfg;
      private String autoenter_initial;
+     private String start_browser_initial;
+
+     static final public String ADD_COMMAND = "a=config&cmd=add-collection&c=";
+     static final public String RELEASE_COMMAND = "a=config&cmd=release-collection&c=";
+     static final public String QUIT_COMMAND = "a=";
+
      static final private String AUTOENTER = "autoenter";
      static final private String COLON = ":";
@@ -16 +22 @@
      static final private String PORTNUMBER = "portnumber";
      static final private String SEPARATOR = "/";
+     static final private String STARTBROWSER = "start_browser";
      static final private String TRUE = "1";
      static final private String URL = "url";
+
      public GSDLSiteConfig(File server_exe) {
-         System.err.println("New GSDLSiteConfig for: " + server_exe.getAbsolutePath());
+          debug("New GSDLSiteConfig for: " + server_exe.getAbsolutePath());
           gsdlsite_cfg = new File(server_exe.getParentFile(), GSDLSITE_CFG);
-
+          
           autoenter_initial = null;
+          start_browser_initial = null;
           load();
      }
@@ -48 +57 @@
                     }
                     temp.append(enterlib);
-                }
+                }
                 enterlib = null;
                 url = temp.toString();
           }
-          System.err.println("Found Local Library Address: " + url);
+          debug("Found Local Library Address: " + url);
           return url;
      }
 
      public void load() {
-            System.err.println("Load: " + gsdlsite_cfg.getAbsolutePath());
-          clear();
-          try {
-                BufferedReader in = new BufferedReader(new FileReader(gsdlsite_cfg));
-                String line = null;
-                while((line = in.readLine()) != null) {
-                     String key = null;
-                     String value = null;
-                     int index = -1;
-                     if((index = line.indexOf("=")) != -1 && line.length() >= index + 1) {
-                          key = line.substring(0, index);
-                          value = line.substring(index + 1);
+          if(gsdlsite_cfg.exists()) {
+                debug("Load: " + gsdlsite_cfg.getAbsolutePath());
+                clear();
+                try {
+                     BufferedReader in = new BufferedReader(new FileReader(gsdlsite_cfg));
+                     String line = null;
+                     while((line = in.readLine()) != null) {
+                          String key = null;
+                          String value = null;
+                          int index = -1;
+                          if((index = line.indexOf("=")) != -1 && line.length() >= index + 1) {
+                                key = line.substring(0, index);
+                                value = line.substring(index + 1);
+                          }
+                          else {
+                                key = line;
+                          }
+                          put(key, value);
                      }
-                     else {
-                          key = line;
-                     }
-                     put(key, value);
+                }
+                catch (Exception error) {
+                     error.printStackTrace();
                 }
           }
-          catch (Exception error) {
-                error.printStackTrace();
+          else {
+                debug("No GSDLsite.cfg file can be found!");
           }
      }
 
      /** Restore the autoenter value to its initial value, and remove url if present. */
-     public void restoreAutoEnter() {
-         System.err.println("Restore AutoEnter");
-          put(AUTOENTER, autoenter_initial);
-          remove(URL);
+     public void restore() {
+         debug("Restore Initial Settings");
+         put(AUTOENTER, autoenter_initial);
+         put(STARTBROWSER, start_browser_initial);
+         remove(URL);
+         save();
+     }
+
+     public void set() {
+          debug("Set Session Settings");
+          if(autoenter_initial == null) {
+                autoenter_initial = (String) get(AUTOENTER);
+                debug("Remember autoenter was: " + autoenter_initial);
+          }
+          put(AUTOENTER, TRUE);
+          if(start_browser_initial == null) {
+                start_browser_initial = (String) get(STARTBROWSER);
+                debug("Remember start_browser was: " + start_browser_initial);
+          }
           save();
      }
 
-     public void setAutoEnter() {
-         System.err.println("Set AutoEnter.");
-          if(autoenter_initial == null) {
-                autoenter_initial = (String) get(AUTOENTER);
-                System.err.println("Remember autoenter was: " + autoenter_initial);
-          }
-          put(AUTOENTER, TRUE);
-          save();
+     private void debug(String message) {
+          System.err.println(message);
      }
 
      private void save() {
-         System.err.println("Save: " + gsdlsite_cfg.getAbsolutePath());
+          debug("Save: " + gsdlsite_cfg.getAbsolutePath());
           try {
                 BufferedWriter out = new BufferedWriter(new FileWriter(gsdlsite_cfg, false));