Changeset 16295 for gli

Timestamp:

2008-07-03T16:51:13+12:00 (16 years ago)

Author:

ak19

Message:

ArchivesInfPlugin has 0 options which caused GLI to try and load it twice. This problem is now resolved by turning the loading_options_failed member variable into has_loaded_options since the latter now indicates 2 things: whether a plugin has already been loaded before and whether it has successfully been loaded (or failed during loading attempt).

Location:

gli/trunk/src/org/greenstone/gatherer

Files:

• cdm/Plugin.java (modified) (3 diffs)
• greenstone/Plugins.java (modified) (3 diffs)

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

@@ -43 +43 @@
     private boolean does_explode_metadata_databases = false; 
     private boolean does_replace_srcdocs_with_html = false; // to work with replace_srcdoc_with_html.pl
-    private boolean loading_options_failed = false;
+    /** Plugins are loaded as needed. This variable indicates 1. whether a plugin has been loaded already; 2. whether a 
+     * plugin has been successfully loaded. When both are true, has_loaded_options will be true. */
+    private boolean has_loaded_options = false;
 
     /** Constructor used in DOMProxyListModel initializations, and Library Level. Used for Base plugins (those in the list of available plugins, not ones that are in the DOMProxyList)
@@ -84 +86 @@
 
 
-    public boolean didLoadingOptionsFail()
-    {
-    return loading_options_failed;
+    public boolean hasLoadedOptions()
+    {
+    return has_loaded_options;
     }
 
@@ -228 +230 @@
     }
 
-    public void setLoadingOptionsFailed()
-    {
-    this.loading_options_failed = true;
+    public void setHasLoadedOptions(boolean hasLoadedOptions)
+    {
+    this.has_loaded_options = hasLoadedOptions;
     }
 }

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

@@ -83 +83 @@
     // If we've found the plugin, load its arguments now, if required
     if (plugin != null && arguments_required) {
-        if (plugin.getArguments().size() == 0 && plugin.didLoadingOptionsFail() == false) {
+        if (!plugin.hasLoadedOptions()) {
         loadPluginInfo(plugin, collection_specific);
         }
@@ -165 +165 @@
         // Check the XML output was obtained successfully
         if (pluginfo_xml == null || pluginfo_xml.length() == 0) {
-        plugin.setLoadingOptionsFailed();
+        plugin.setHasLoadedOptions(false); // failure to load options
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.PlugInManager.PlugIn_XML_Parse_Failed", plugin.getName()), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         return;
+        } else {
+        plugin.setHasLoadedOptions(true);
         }
 
@@ -243 +245 @@
     Document document = XMLTools.parseXML(new StringReader(xml));
     if (document == null) {
-        plugin.setLoadingOptionsFailed();
+        plugin.setHasLoadedOptions(false); // failure to load the options/failed plugin
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.PlugInManager.PlugIn_XML_Parse_Failed", plugin.getName()), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         return;
+    } else {
+        plugin.setHasLoadedOptions(true);
     }