Changeset 4620

Timestamp:

2003-06-12T17:55:59+12:00 (21 years ago)

Author:

jmt12

Message:

2030134: The code is now in place for GLI to create its own site config file so as to avoid the 'GLI crashes leaving gsdlsite.cfg in inconsistant state which subsequently causes problems in GSDL and GLI' bug.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (6 diffs)
• util/GSDLSiteConfig.java (modified) (6 diffs)

trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -163 +163 @@
     }
     try {
-                // Create log
+        // Create log
         log = new Log();
-                // Load Config
+        // Load Config
         loadConfig(gsdl_path, exec_path, perl_path);
 
-                // Read Dictionary
+        // Read Dictionary
         dictionary = new Dictionary(config.getLocale("general.locale", true), config.getFont("general.font", true));
 
-                // If we were given a server run it if neccessary.
+        // If we were given a server run it if neccessary.
         if(config.exec_file != null) {
         startServerEXE();
         }
 
-                // Having loaded the configuration (necessary to determine if certain warnings have been disabled) and dictionary, we now check if the necessary path variables have been provided.
+        // Having loaded the configuration (necessary to determine if certain warnings have been disabled) and dictionary, we now check if the necessary path variables have been provided.
 
         if(config.exec_file == null && config.exec_address == null) {
@@ -184 +184 @@
         missingGSDL(dictionary);
         }
-                // Perl path is a little different as it is perfectly ok to start the Gatherer without providing a perl path
+        // Perl path is a little different as it is perfectly ok to start the Gatherer without providing a perl path
         boolean found_perl = false;
         if(config.perl_path != null) {
@@ -275 +275 @@
     }
     }
-    /** Writes a message to the debug filestream.
-     * @param message The message as a <strong>String</strong>.
-     */
-    //   public void debug(String message) {
-    //debug(null, message);
-    //  }
-    /** Writes a message to the debug filestream.
-     * @param error The <strong>Exception</strong> associated with this message, or <i>null</i> for no exception.
-     * @param message The message as a <strong>String</strong>.
-     * @see java.io.FileOutputStream
-     * @see java.io.PrintStream
-     * @see java.lang.Exception
-     */
-    //  public void debug(Exception exception, String message) {
-    //if(message != null) {
-    //    Gatherer.println(message);
-    //}
-    //if(exception != null) {
-    //    Gatherer.printStackTrace(exception);
-    //}
-    // }
+
     /** Exits the Gatherer after ensuring that things needing saving are saved.
      * @see java.io.FileOutputStream
@@ -704 +684 @@
         gsdlsite_cfg.set();
         // Spawn server
-        server = new ExternalApplication(config.exec_file.getAbsolutePath());
+        String[] command = new String[3];
+        command[0] = config.exec_file.getAbsolutePath();
+        command[1] = "-config_file";
+        command[2] = gsdlsite_cfg.getSiteConfigFilename();
+        server = new ExternalApplication(command);
         server.start();
+        command = null;
         // Now we have to wait until program has started. We do this by reloading and checking
         try {
@@ -780 +765 @@
     private Process process = null;
     /** The initial command string given to this sub-process. */
-    private String command = null;
+    private String[] command = null;
     /** Constructor.
      * @param command The initial command <strong>String</strong>.
      */
     public ExternalApplication(String command) {
+        this.command = new String[1];
+        this.command[0] = command;
+    }
+
+    public ExternalApplication(String[] command) {
         this.command = command;
     }
@@ -797 +787 @@
         // Call an external process using the args.
         try {
-        println("Running " + command);
+        StringBuffer whole_command = new StringBuffer();
+        for(int i = 0; i < command.length; i++) {
+            whole_command.append(command[i]);
+            whole_command.append(" ");
+        }
+        println("Running " + whole_command.toString());
+        whole_command = null;
         Runtime rt = Runtime.getRuntime();
         process = rt.exec(command);

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

@@ -7 +7 @@
     extends LinkedHashMap {
     private File gsdlsite_cfg;
+    private File glisite_cfg;
     private String autoenter_initial;
     private String start_browser_initial;
@@ -13 +14 @@
     static final public String RELEASE_COMMAND = "?a=config&cmd=release-collection&c=";
     static final public String QUIT_COMMAND = "?a=config&cmd=kill";
-
+    
     static final private String AUTOENTER = "autoenter";
     static final private String COLON = ":";
     static final private String ENTERLIB = "enterlib";
     static final private String FALSE = "0";
+    static final private String GLISITE = null ;//"glisite.cfg";
     static final private String GSDL = "gsdl";
     static final private String GSDLSITE_CFG = "gsdlsite.cfg";
@@ -29 +31 @@
     debug("New GSDLSiteConfig for: " + server_exe.getAbsolutePath());
     gsdlsite_cfg = new File(server_exe.getParentFile(), GSDLSITE_CFG);
-          
+    //glisite_cfg = new File(server_exe.getParentFile(), GLISITE_CFG);
     autoenter_initial = null;
     start_browser_initial = null;
@@ -37 +39 @@
     public boolean exists() {
     return gsdlsite_cfg.exists();
+    }
+
+    public String getSiteConfigFilename() {
+    //return GLISITE_CFG;
+    return GSDLSITE_CFG;
     }
 
@@ -97 +104 @@
     /** Restore the autoenter value to its initial value, and remove url if present. */
     public void restore() {
-    debug("Restore Initial Settings");
-    put(AUTOENTER, autoenter_initial);
-    put(STARTBROWSER, start_browser_initial);
-    remove(URL);
-    save();
+    if(glisite_cfg != null) {
+        // Delete the file
+        glisite_cfg.delete();
+    }
+    else {
+        debug("Restore Initial Settings");
+        put(AUTOENTER, autoenter_initial);
+        put(STARTBROWSER, start_browser_initial);
+        remove(URL);
+        save();
+    }
     }
 
@@ -125 +138 @@
     private void save() {
     debug("Save: " + gsdlsite_cfg.getAbsolutePath());
+    //debug("Save: " + glisite_cfg.getAbsolutePath());
     try {
         BufferedWriter out = new BufferedWriter(new FileWriter(gsdlsite_cfg, false));
+        //BufferedWriter out = new BufferedWriter(new FileWriter(glisite_cfg, false));
         for(Iterator keys = keySet().iterator(); keys.hasNext(); ) {
         String key = (String) keys.next();