- Timestamp:
- 2009-01-12T11:18:06+13:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gli/branches/rtl-gli/src/org/greenstone/gatherer/greenstone/Plugins.java
r13594 r18356 83 83 // If we've found the plugin, load its arguments now, if required 84 84 if (plugin != null && arguments_required) { 85 if ( plugin.getArguments().size() == 0 && plugin.didLoadingOptionsFail() == false) {85 if (!plugin.hasLoadedOptions()) { 86 86 loadPluginInfo(plugin, collection_specific); 87 87 } … … 135 135 pluginfo_options += "&collection=" + collection_name; 136 136 } 137 pluginfo_xml = RemoteGreenstoneServer.getScriptOptions("pluginfo.pl", pluginfo_options);137 pluginfo_xml = Gatherer.remoteGreenstoneServer.getScriptOptions("pluginfo.pl", pluginfo_options); 138 138 } 139 139 else { … … 165 165 // Check the XML output was obtained successfully 166 166 if (pluginfo_xml == null || pluginfo_xml.length() == 0) { 167 plugin.set LoadingOptionsFailed();167 plugin.setHasLoadedOptions(false); // failure to load options 168 168 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.PlugInManager.PlugIn_XML_Parse_Failed", plugin.getName()), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE); 169 169 return; 170 } else { 171 plugin.setHasLoadedOptions(true); 170 172 } 171 173 … … 196 198 pluginfo_options += "&collection=" + collection_name; 197 199 } 198 String pluginfo_output = RemoteGreenstoneServer.getScriptOptions("pluginfo.pl", pluginfo_options);200 String pluginfo_output = Gatherer.remoteGreenstoneServer.getScriptOptions("pluginfo.pl", pluginfo_options); 199 201 xml = new StringBuffer(pluginfo_output); 200 202 } … … 243 245 Document document = XMLTools.parseXML(new StringReader(xml)); 244 246 if (document == null) { 245 plugin.set LoadingOptionsFailed();247 plugin.setHasLoadedOptions(false); // failure to load the options/failed plugin 246 248 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.PlugInManager.PlugIn_XML_Parse_Failed", plugin.getName()), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE); 247 249 return; 250 } else { 251 plugin.setHasLoadedOptions(true); 248 252 } 249 253 … … 268 272 else if (node_name.equalsIgnoreCase("Explodes")) { 269 273 plugin.setDoesExplodeMetadataDatabases(XMLTools.getValue(node).equalsIgnoreCase(StaticStrings.YES_STR)); 274 } 275 else if (node_name.equalsIgnoreCase("SourceReplaceable")) { // looking for <SourceReplaceable> tag 276 plugin.setDoesReplaceSrcDocsWithHtml(XMLTools.getValue(node).equalsIgnoreCase(StaticStrings.YES_STR)); 270 277 } 271 278 else if (node_name.equalsIgnoreCase("Processes")) {
Note:
See TracChangeset
for help on using the changeset viewer.