Changeset 8781 for trunk/greenstone3-extensions/gsdl-as

Timestamp:

2004-12-11T20:14:05+13:00 (19 years ago)

Author:

schweer

Message:

bugfixes

Location:

trunk/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/profiles

Files:

• Predicate.java (modified) (2 diffs)
• PredicateFactory.java (modified) (2 diffs)
• Subscription.java (modified) (1 diff)

trunk/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/profiles/Predicate.java

@@ -108 +108 @@
      */
     public static boolean isMultiValued(String key) {
-        return ArrayHelper.contains(singleValueFields, key);
+        return ArrayHelper.contains(multiValueFields, key);
     }
 
@@ -147 +147 @@
         throw new UnsupportedOperationException("you can only call this method for multi-valued predicates");
     }
+
+    /**
+     * @param key
+     * @return
+     */
+    public static boolean isFieldName(String key) {
+        return ArrayHelper.contains(singleValueFields, key) || ArrayHelper.contains(multiValueFields, key);
+    }
     
 }

trunk/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/profiles/PredicateFactory.java

@@ -115 +115 @@
         for (Iterator iter = values.iterator(); iter.hasNext();) {
             String value = (String) iter.next();
+
+            if (key.equals("host") && !(key.startsWith("http://"))) {
+                value = "http://" + value + ":8080/soap/servlet/rpcrouter";
+            }
+            
             if (keyToPredicates.containsKey(value)) {
                 predicate = (IdEqualsPredicate) keyToPredicates.get(value);
@@ -167 +172 @@
      * @return
      */
-    public static Predicate getIdEqualsPredicate(String key, String value) {
-        return (Predicate) ((Map)idEqualsPredicates.get(key)).get(value);
+    public static IdEqualsPredicate getIdEqualsPredicate(String key, String value) {
+        IdEqualsPredicate result = null; 
+        if (idEqualsPredicates.containsKey(key)) {
+            result = (IdEqualsPredicate) ((Map)idEqualsPredicates.get(key)).get(value);
+        }
+        return result;
     }
     

trunk/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/profiles/Subscription.java

@@ -41 +41 @@
         for (Iterator iter = valueMap.keySet().iterator(); iter.hasNext();) {
             String key = (String) iter.next();
+            
+            if (!Predicate.isFieldName(key)) {
+                continue;
+            }
+            
             Object value = valueMap.get(key);