Changeset 8777 for trunk/gsdl3/packages/gsdl-as/src/org/greenstone/gsdlas/profiles/PredicateFactory.java

Timestamp:

2004-12-10T15:48:39+13:00 (19 years ago)

Author:

schweer

Message:

started to work on multi-valued predicates; started to rework the filter algorithm

File:

• trunk/gsdl3/packages/gsdl-as/src/org/greenstone/gsdlas/profiles/PredicateFactory.java (modified) (5 diffs)

trunk/gsdl3/packages/gsdl-as/src/org/greenstone/gsdlas/profiles/PredicateFactory.java

@@ -27 +27 @@
     private static int id = 0; 
     
-    // documentID -> IdEqualsPredicate referring to it
-    private static Map documentIdEqualsPredicates = new TreeMap();
-    // collectionID -> IdEqualsPredicate referring to it
-    private static Map collectionIdEqualsPredicates = new TreeMap();
+    private static Map idEqualsPredicates = new TreeMap();
     
-    // substring for collection_name -> SubstringMatchPredicate referring to it
+    // substring for collection_name -> SubstringMatchPredicates referring to it
     private static Map collectionNameMatchPredicates = new TreeMap();
     
@@ -59 +56 @@
         }
         
-        if (key.equals("type")) {
-            return result;
-        } else if (key.endsWith("ID")) {
-            result = createIdEqualsPredicate(key, value);
+        if (Predicate.isMultiValued(key)) {
+            List list = new ArrayList();
+            list.add(value);
+            return createPredicate(key, list);
         } else if (key.startsWith("document")) {
             result = createQueryPredicate(key, value);
@@ -78 +75 @@
             return null;
         }
-        // TODO properly handle multi-valued predicates
-        return createPredicate(key, (String) values.get(0));
+        Predicate result = createIdEqualsPredicate(key, values);
+        result.setID(result.saveToDatabase());
+        return result;
     }
 
@@ -102 +100 @@
     /**
      * @param key
-     * @param value
+     * @param values
      * @return
      */
-    private static IdEqualsPredicate createIdEqualsPredicate(String key, String value) {
+    private static IdEqualsPredicate createIdEqualsPredicate(String key, List values) {
         IdEqualsPredicate predicate = null;
-        if (key.equals("documentID")) {
-            if (documentIdEqualsPredicates.containsKey(value)) {
-                predicate = (IdEqualsPredicate) (documentIdEqualsPredicates.get(value));
+        
+        Map keyToPredicates;
+        if (!idEqualsPredicates.containsKey(key)) {
+            keyToPredicates = new HashMap();
+            idEqualsPredicates.put(key, keyToPredicates);
+        }
+        keyToPredicates = (Map) idEqualsPredicates.get(key);
+        
+        for (Iterator iter = values.iterator(); iter.hasNext();) {
+            String value = (String) iter.next();
+            if (keyToPredicates.containsKey(value)) {
+                predicate = (IdEqualsPredicate) keyToPredicates.get(value);
             } else {
                 predicate = new IdEqualsPredicate(key, value);
-                documentIdEqualsPredicates.put(value, predicate);
+                keyToPredicates.put(value, predicate);
             }
-        } else if (key.equals("collectionID")) {
-            if (collectionIdEqualsPredicates.containsKey(value)) {
-                predicate = (IdEqualsPredicate) collectionIdEqualsPredicates.get(value);
-            } else {
-                predicate = new IdEqualsPredicate(key, value);
-                collectionIdEqualsPredicates.put(value, predicate);
-            }
-        } // TODO other IDs
+        }
         return predicate;
     }
@@ -161 +161 @@
         return Collections.unmodifiableCollection(collectionNameMatchPredicates.values());
     }
+
+    /**
+     * @param string
+     * @param string2
+     * @return
+     */
+    public static Predicate getIdEqualsPredicate(String key, String value) {
+        return (Predicate) ((Map)idEqualsPredicates.get(key)).get(value);
+    }
     
 }