Changeset 11378 for trunk/gli

Timestamp:

2006-03-16T14:42:37+13:00 (18 years ago)

Author:

mdewsnip

Message:

Now looks at a plugin's block_exp as well as its process_exp to determine if it will "process" a file.

Location:

trunk/gli/src/org/greenstone/gatherer/cdm

Files:

• Plugin.java (modified) (1 diff)
• PluginManager.java (modified) (1 diff)

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

@@ -171 +171 @@
 
 
+    /** Checks whether this plugin instance will process the specified file (given its block_exp). */
+    public boolean doesBlockFile(File file)
+    {
+    // Check the filename against the plugin's block_exp value
+    ArrayList arguments = getArguments(true, true);
+    for (int i = 0; i < arguments.size(); i++) {
+        Argument argument = (Argument) arguments.get(i);
+        if (argument.getName().equals("block_exp")) {
+        // Try the assigned value first, for when the user has manually set the value
+        String regular_expression = argument.getValue();
+        if (regular_expression == null || regular_expression.equals("")) {
+            // Not set, so use the default value
+            regular_expression = argument.getDefaultValue();
+            if (regular_expression.equals("")) {
+            continue;
+            }
+        }
+
+        // The $ at the end doesn't seem to work in Java, so need to add ".*" at the start
+        if (regular_expression.startsWith("(?i)")) {
+            // Don't mess up case-insensitive matching though
+            regular_expression = "(?i)" + ".*" + regular_expression.substring("(?i)".length());
+        }
+        else {
+            regular_expression = ".*" + regular_expression;
+        }
+
+        // If the filename matches the regular expression, this plugin will deal with the file in some way
+        if (file.getName().matches(regular_expression)) {
+            return true;
+        }
+        }
+    }
+
+    // This plugin will (probably) not deal with the specified file
+    return false;
+    }
+
+
     /** Checks whether this plugin instance will process the specified file (given its process_exp). */
     public boolean doesProcessFile(File file)

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

@@ -140 +140 @@
     for (int i = 0; i < super.getSize(); i++) {
         Plugin assigned_plugin = (Plugin) getElementAt(i);
-        if (assigned_plugin.isSeparator() == false && assigned_plugin.doesProcessFile(file) == true) {
+        if (assigned_plugin.isSeparator() == false && (assigned_plugin.doesProcessFile(file) == true || assigned_plugin.doesBlockFile(file) == true)) {
         // This file will be processed by an assigned plugin, so no suggestion is necessary
         DebugStream.println("Processed by assigned plugin: " + assigned_plugin);