Changeset 24414 for main

Timestamp:

2011-08-16T21:17:46+12:00 (13 years ago)

Author:

ak19

Message:

To do with EmbeddedMetadataPlugin: 1.mkcol.pl and GLI changes puts the plugin in the bottom four plugins of the plugin pipeline. 2. EmbeddedMetadataPlugin and PDFPlugin are modified to work together again after the recent changes (introduction of overridable BasePlugin method can_process_file_for_metadata) which were needed to get the EmbeddedMetadataPlugin and OAIPlugin to work together.

Location:

main/trunk

Files:

• gli/src/org/greenstone/gatherer/cdm/PluginManager.java (modified) (5 diffs)
• gli/src/org/greenstone/gatherer/util/StaticStrings.java (modified) (1 diff)
• greenstone2/bin/script/mkcol.pl (modified) (1 diff)
• greenstone2/perllib/plugins/EmbeddedMetadataPlugin.pm (modified) (2 diffs)
• greenstone2/perllib/plugins/PDFPlugin.pm (modified) (1 diff)

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

@@ -71 +71 @@
 
   /** The number of plugins that are fixed 'below the line' */
-  private static int NUM_FIXED_PLUGINS = 3; 
+  private static int NUM_FIXED_PLUGINS = 4; 
     /** Constructor.
      */
@@ -194 +194 @@
      */
     private void assignPlugin(Plugin plugin) {
-      if(plugin.getName().equals(StaticStrings.RECPLUG_STR) || plugin.getName().equals(StaticStrings.ARCPLUG_STR) || plugin.getName().equals(StaticStrings.METADATAXMLPLUG_STR)) {
+      if(plugin.getName().equals(StaticStrings.RECPLUG_STR) || plugin.getName().equals(StaticStrings.ARCPLUG_STR) 
+     || plugin.getName().equals(StaticStrings.METADATAXMLPLUG_STR) || plugin.getName().equals(StaticStrings.EMBEDMETAPLUG_STR)) {
         addAfter(plugin, separator_plugin); // Adds after separator
     } else {
@@ -297 +298 @@
         return;
     }
-    if(plugin.getName().equals(StaticStrings.ARCPLUG_STR) || plugin.getName().equals(StaticStrings.RECPLUG_STR) || plugin.getName().equals(StaticStrings.METADATAXMLPLUG_STR)) {
+    if(plugin.getName().equals(StaticStrings.ARCPLUG_STR) || plugin.getName().equals(StaticStrings.RECPLUG_STR) 
+       || plugin.getName().equals(StaticStrings.METADATAXMLPLUG_STR) || plugin.getName().equals(StaticStrings.EMBEDMETAPLUG_STR)) {
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.Move.Fixed"), Dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
         return;
@@ -362 +364 @@
         Plugin plugin = (Plugin) getElementAt(index);
         String name = plugin.getName();
-        if(name.equals(StaticStrings.RECPLUG_STR) || name.equals(StaticStrings.ARCPLUG_STR) || name.equals(StaticStrings.METADATAXMLPLUG_STR)) {
+        if(name.equals(StaticStrings.RECPLUG_STR) || name.equals(StaticStrings.ARCPLUG_STR) 
+           || name.equals(StaticStrings.METADATAXMLPLUG_STR) || name.equals(StaticStrings.EMBEDMETAPLUG_STR)) {
             found_fixed = true;
             index--;
@@ -721 +724 @@
             String plugin_name = selected_plugin.getName();
             // Some buttons are only available for plugins other than ArcPlug and RecPlug
-            if(plugin_name.equals(StaticStrings.ARCPLUG_STR) || plugin_name.equals(StaticStrings.RECPLUG_STR) || plugin_name.equals(StaticStrings.METADATAXMLPLUG_STR)) {
+            if(plugin_name.equals(StaticStrings.ARCPLUG_STR) || plugin_name.equals(StaticStrings.RECPLUG_STR) 
+           || plugin_name.equals(StaticStrings.METADATAXMLPLUG_STR) || plugin_name.equals(StaticStrings.EMBEDMETAPLUG_STR)) {
               move_up_button.setEnabled(false);
               move_down_button.setEnabled(false);

main/trunk/gli/src/org/greenstone/gatherer/util/StaticStrings.java

@@ -157 +157 @@
     static final public String INT_STR = "int";
     static final public String IMPORT_STR = "import";
-    static final public String[] KEEP_PLUG = { "GreenstoneXMLPlugin", "GreenstoneMETSPlugin", "EmbeddedMetadataPlugin" };
+    static final public String[] KEEP_PLUG = { "GreenstoneXMLPlugin", "GreenstoneMETSPlugin" };
     static final public String LANGUAGE_ARGUMENT = "l=";
     static final public String LANGUAGE_ATTRIBUTE = "language";

main/trunk/greenstone2/bin/script/mkcol.pl

@@ -353 +353 @@
     # load default plugins if none were on command line
     if (!scalar(@plugin)) {
-    @plugin = (ZIPPlugin,GreenstoneXMLPlugin,EmbeddedMetadataPlugin,TextPlugin,HTMLPlugin,EmailPlugin,
-           PDFPlugin,RTFPlugin,WordPlugin,PostScriptPlugin,PowerPointPlugin,ExcelPlugin,ImagePlugin,ISISPlugin,NulPlugin,MetadataXMLPlugin,ArchivesInfPlugin,DirectoryPlugin);
+    @plugin = (ZIPPlugin,GreenstoneXMLPlugin,TextPlugin,HTMLPlugin,EmailPlugin,
+           PDFPlugin,RTFPlugin,WordPlugin,PostScriptPlugin,PowerPointPlugin,ExcelPlugin,ImagePlugin,ISISPlugin,NulPlugin,EmbeddedMetadataPlugin,MetadataXMLPlugin,ArchivesInfPlugin,DirectoryPlugin);
     }
 

main/trunk/greenstone2/perllib/plugins/EmbeddedMetadataPlugin.pm

@@ -139 +139 @@
 
     # this plugin will look for metadata in any file through its
-    # metadata_read() returning undef here means anything else further
+    # metadata_read(). Returning undef here means anything else further
     # down the pipeline can do the same
 
@@ -297 +297 @@
     
     # we don't want to process directories
-    if (!-f $filename_full_path || !$self->can_process_this_file($filename_full_path)) {
+    if (!-f $filename_full_path) {
     return undef;
     }

main/trunk/greenstone2/perllib/plugins/PDFPlugin.pm

@@ -213 +213 @@
 }
 
+# Even if a plugin can extract metadata in its metadata_read pass,
+# make the default return 'undef' so processing of the file continues
+# down the pipeline, so other plugins can also have the opportunity to
+# locate metadata and set it up in the extrametakeys variables that
+# are passed around.
+sub can_process_this_file_for_metadata {
+    my $self = shift(@_);
+
+    # this plugin will look for metadata in any file through its
+    # metadata_read(). Returning undef here means anything else further
+    # down the pipeline can do the same
+
+    return 0;
+}
+
 sub init {
     my $self = shift (@_);