Changeset 313 for trunk/src/org/expeditee/actions/Actions.java

Timestamp:

09/23/08 15:05:41 (16 years ago)

Author:

ra33

Message:

Added more features to the Greenstone Search

File:

• trunk/src/org/expeditee/actions/Actions.java (modified) (4 diffs)

trunk/src/org/expeditee/actions/Actions.java

@@ -7 +7 @@
 import java.lang.reflect.Modifier;
 import java.net.URL;
+import java.rmi.UnexpectedException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -506 +507 @@
                                         params = new Object[paramCount];
                                         String[] paramStrings = parameters.split("\\s+");
-                                        if (paramCount != paramStrings.length)
+                                        /**
+                                         * Any extra parametres will be treated as the rest of the
+                                         * string if the last param is a string
+                                         */
+                                        if (paramCount > paramStrings.length)
                                                 continue;
-                                        for (int i = 0; i < paramCount; i++) {
-                                                SString nextParam = new SString(paramStrings[i]);
-                                                try {
+                                        /**
+                                         * If there are extra parametres the last param must be a
+                                         * String
+                                         */
+                                        int lastParam = paramTypes.length - 1;
+
+                                        if (paramCount < paramStrings.length
+                                                        && !paramTypes[lastParam].equals(String.class))
+                                                continue;
+                                        try {
+                                                for (int i = 0; i < paramCount; i++) {
+                                                        SString nextParam = new SString(paramStrings[i]);
                                                         params[i] = null;
                                                         if (paramTypes[i].equals(int.class)
@@ -531 +545 @@
                                                                 params[i] = nextParam.stringValue();
                                                         } else {
-                                                                continue;
+                                                                throw new UnexpectedException(
+                                                                                "Unexpected type "
+                                                                                                + paramTypes[i].getClass()
+                                                                                                                .toString());
                                                         }
-                                                } catch (Exception e) {
-                                                        continue;
                                                 }
+                                        } catch (Exception e) {
+                                                continue;
                                         }
+                                        /** Append extra params on the end of the last string param */
+                                        String s = params[lastParam].toString();
+                                        for (int i = paramCount; i < paramStrings.length; i++) {
+                                                s += ' ' + paramStrings[i];
+                                        }
+                                        params[lastParam] = s;
+
                                         con = c;
                                         break;
@@ -861 +885 @@
                 try {
                         return PerformAction(current, launcher, command);
-                }catch (RuntimeException e) {
+                } catch (RuntimeException e) {
                         MessageBay.errorMessage("Action failed: " + e.getMessage());
                 } catch (Exception e) {
-                        MessageBay.errorMessage("Action failed: " + e.getClass().getSimpleName());
+                        MessageBay.errorMessage("Action failed: "
+                                        + e.getClass().getSimpleName());
                 }
                 return null;