Changeset 9093

Timestamp:

2005-02-18T11:23:49+13:00 (19 years ago)

Author:

mdewsnip

Message:

Now deletes the plugins.dat and classifiers.dat files when a new config file is created. This ensures that these two files stay up to date when new versions are released.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Configuration.java (modified) (3 diffs)
• Gatherer.java (modified) (3 diffs)

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

@@ -97 +97 @@
     static public Configuration self = null;
 
+    static public boolean just_created_new_config_file = false;
     /** The path to the Greenstone Suite installation directory. */
     static public String gsdl_path = "";
@@ -154 +155 @@
     }
 
-    // Check the version of the config we have loaded, and if it isn't recent enough, backup the old version, and then create a new config.
+    // If the version of the config we've loaded isn't recent enough, backup the old version and create a new one
+    just_created_new_config_file = false;
     if (general_config != null) {
         Element configuration_element = general_config.getDocumentElement();
@@ -166 +168 @@
     }
 
-    // And if that fails retrieve the default configuration file from our xml library
+    // Create a new config from the default configuration file from our xml library
     if (general_config == null) {
         general_config = Utility.parse(TEMPLATE_CONFIG_XML, true);
+        just_created_new_config_file = true;
     }
 

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

@@ -41 +41 @@
 import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.GAuthenticator;
+import org.greenstone.gatherer.cdm.ClassifierManager;
+import org.greenstone.gatherer.cdm.PluginManager;
 import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.feedback.ActionRecorderDialog;
@@ -146 +148 @@
 
     try {
-        // Load Config
-        loadConfig(gsdl_path, gsdl3_path, site_name);
+        // Load GLI config file
+        new Configuration(gsdl_path, gsdl3_path, site_name);
+        if (Configuration.just_created_new_config_file) {
+        // Delete the plugins.dat and classifiers.dat files
+        PluginManager.clearPluginCache();
+        ClassifierManager.clearClassifierCache();
+        }
+
+        if (GS3) {
+        // Load Greenstone 3 servelt configuration
+        servlet_config = new ServletConfiguration(gsdl3_path);
+        }
 
         // Check we know where Perl is
@@ -629 +641 @@
 
 
-    /** 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>.
-     * @see org.greenstone.gatherer.Configuration
-     */
-    private void loadConfig(String gsdl_path, String gsdl3_path, String site_name) {
-    try {
-        new Configuration(gsdl_path, gsdl3_path, site_name);
-    }
-    catch (Exception error) {
-        DebugStream.println(Configuration.CONFIG_XML+" is not a well formed XML document.");
-        DebugStream.printStackTrace(error);
-    }
-    if (GS3) {
-        try {
-        servlet_config = new ServletConfiguration(gsdl3_path);
-        } catch (Exception exception) {
-        DebugStream.printStackTrace(exception);
-        }
-    }
-    }
-
     /** Causes the general configuration file to export itself to xml. Doesn't effect any remaining collection configuration, as its up to the collection manager to handle them (especially since we have no idea where they are going). */
     private void saveConfig() {