Changeset 12633

Timestamp:

2006-08-31T15:16:17+12:00 (18 years ago)

Author:

mdewsnip

Message:

Kissed the horrible old plugins.dat and classifiers.dat files goodbye...

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (2 diffs)
• cdm/ClassifierManager.java (modified) (1 diff)
• cdm/PluginManager.java (modified) (1 diff)
• gui/Preferences.java (modified) (1 diff)

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

@@ -175 +175 @@
         System.err.println("Warning: Unable to make directory: " + collect_directory);
         }
-
-        File plugins_dat_file = new File(getGLIUserDirectoryPath() + "plugins.dat");
-        if (!plugins_dat_file.exists()) {
-        JarTools.extractFromJar("plugins.dat", getGLIUserDirectoryPath(), false);
-        }
-
-        File classifiers_dat_file = new File(getGLIUserDirectoryPath() + "classifiers.dat");
-        if (!classifiers_dat_file.exists()) {
-        JarTools.extractFromJar("classifiers.dat", getGLIUserDirectoryPath(), false);
-        }
     }
 
@@ -219 +209 @@
     }
 
+    // Delete plugins.dat and classifiers.dat files from previous versions of the GLI (no longer used)
+    File plugins_dat_file = new File(Gatherer.getGLIUserDirectoryPath() + "plugins.dat");
+    if (plugins_dat_file.exists()) {
+        System.err.println("Deleting plugins.dat file...");
+        Utility.delete(plugins_dat_file);
+    }
+    File classifiers_dat_file = new File(Gatherer.getGLIUserDirectoryPath() + "classifiers.dat");
+    if (classifiers_dat_file.exists()) {
+        System.err.println("Deleting classifiers.dat file...");
+        Utility.delete(classifiers_dat_file);
+    }
+
     try {
         // Load GLI config file
         new Configuration(getGLIUserDirectoryPath(), gsdl_path, gsdl3_path, gsdl3_src_path, site_name);
-        if (Configuration.just_updated_config_xml_file) {
-        // Delete the plugins.dat and classifiers.dat files
-        PluginManager.clearPluginCache();
-        ClassifierManager.clearClassifierCache();
-        }
 
         if (GS3) {
-        // Load Greenstone 3 servelt configuration
+        // Load Greenstone 3 servlet configuration
         servlet_config = new ServletConfiguration(gsdl3_path);
         }

trunk/gli/src/org/greenstone/gatherer/cdm/ClassifierManager.java

@@ -287 +287 @@
     }
 
-    public static boolean clearClassifierCache() {
-
-    DebugStream.println("deleting classifiers.dat");
-    File class_file = new File(Gatherer.getGLIUserDirectoryPath() + "classifiers.dat");
-    if (class_file.exists()) {
-        return Utility.delete(class_file);
-    }
-    return true;
-    }
-
 
     /** Destructor. */

trunk/gli/src/org/greenstone/gatherer/cdm/PluginManager.java

@@ -337 +337 @@
     }
     Gatherer.c_man.configurationChanged();
-    }
-
-    public static boolean clearPluginCache() {
-
-    DebugStream.println("deleting plugins.dat");
-    File plugin_file = new File(Gatherer.getGLIUserDirectoryPath() + "plugins.dat");
-    if (plugin_file.exists()) {
-        return Utility.delete(plugin_file);
-    }
-    return true;
     }
 

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

@@ -717 +717 @@
         Configuration.setLocale("general.locale", Configuration.GENERAL_SETTING, ((DictionaryEntry) language_combobox.getSelectedItem()).getLocale());
         restart_required = true;
-
-        // Delete the plugins.dat and classifiers.dat files
-        PluginManager.clearPluginCache();
-        ClassifierManager.clearClassifierCache();
         }