Changeset 8629

Timestamp:

2004-11-23T14:55:29+13:00 (19 years ago)

Author:

mdewsnip

Message:

More changes to the local library/web library configuration stuff.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (1 diff)
• GathererApplet.java (modified) (1 diff)
• GathererProg.java (modified) (1 diff)
• GetOpt.java (modified) (2 diffs)
• LocalLibraryServer.java (modified) (1 diff)
• gui/CreatePane.java (modified) (2 diffs)
• gui/Preferences.java (modified) (3 diffs)

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

@@ -621 +621 @@
     /** Loads the configuration file if one exists. Otherwise it creates a new one. Currently uses serialization.
      * @param gsdl_path The path to the gsdl directory, gathered from the startup arguments, and presented as a <strong>String</strong>.
-     * @param library_url The path to the library executable, gathered from the startup arguments, and presented as a <strong>String</strong>.
      * @see org.greenstone.gatherer.Configuration
      */

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

@@ -172 +172 @@
 
     g_man = gatherer.init(size, go.gsdl_path, go.gsdl3_path, go.local_library_path,
-                    go.library_url, go.debug, go.perl_path, 
+                    go.library_url_string, go.debug, go.perl_path, 
                     go.no_load, go.filename, go.site_name, 
                     go.servlet_path, go.wget_version_str, go.wget_path);

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

@@ -91 +91 @@
     GUIManager g_man 
         = gatherer.init(size, go.gsdl_path, go.gsdl3_path, go.local_library_path,
-                 go.library_url, go.debug, go.perl_path, 
+                 go.library_url_string, go.debug, go.perl_path, 
                  go.no_load, go.filename, go.site_name, 
                  go.servlet_path, go.wget_version_str, go.wget_path);

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

@@ -42 +42 @@
     public String gsdl_path = null;
     public String gsdl3_path = null;
-    public String library_url = null;
+    public String library_url_string = null;
     public String local_library_path = null;
     public String perl_path = null;
@@ -185 +185 @@
             // Manually specify the Greenstone library URL
             else if (argument_name.equals(StaticStrings.LIBRARY_URL_ARGUMENT)) {
-            library_url = argument_value;
+            library_url_string = argument_value;
             }
             // Parse the path to PERL. If not provided its assumes

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

@@ -59 +59 @@
     static private void config(String command)
     {
+    if (Configuration.library_url == null) {
+        System.err.println("Error: Trying to configure local library with null Configuration.library_url!");
+        return;
+    }
+
     try {
         URL url = new URL(Configuration.library_url.toString() + command);

trunk/gli/src/org/greenstone/gatherer/gui/CreatePane.java

@@ -384 +384 @@
     tree.clearSelection();
     tree.setSelectionPath(path);
+
+    // Validate the preview button
+    if (Gatherer.c_man.built() && Configuration.library_url != null) {
+        preview_button.setEnabled(true);
+        simple_preview_button.setEnabled(true);
+    }
+    else {
+        preview_button.setEnabled(false);
+        simple_preview_button.setEnabled(false);
+    }
     }
 
@@ -542 +552 @@
     }
     tree.valueChanged(null);
-    
-    // now do the preview stuff
-    if (!Gatherer.c_man.built() || Configuration.library_url == null) {
-        preview_button.setEnabled(false);
-        simple_preview_button.setEnabled(false);
-    } else {
-        preview_button.setEnabled(true);
-        simple_preview_button.setEnabled(true);
-    }
     }
 

trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java

@@ -191 +191 @@
     library_path_label = new JLabel();
     library_path_label.setPreferredSize(LABEL_SIZE);
-    library_path_field = new JTextField(Configuration.library_url.toString());
+    String library_url_string = "";
+    if (Configuration.library_url != null) {
+        library_url_string = Configuration.library_url.toString();
+    }
+    library_path_field = new JTextField(library_url_string);
     library_path_field.setCaretPosition(0);
     if (Gatherer.GS3) {
@@ -613 +617 @@
         try {
             Configuration.library_url = new URL(library_url_string);
-            // Configuration.setString("general.library_url", true, library_url_string);
         }
         catch (MalformedURLException exception) {
@@ -619 +622 @@
         }
         }
+        Configuration.setString("general.library_url", true, library_url_string);
+
         boolean site_changed = false;
         if (Gatherer.GS3) {