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

Timestamp:

2005-01-07T18:15:22+13:00 (19 years ago)

Author:

schweer

Message:

first changes towards treating collection ids as unique only on a per-host basis (addressing BTS #11)

Location:

trunk/greenstone3-extensions/gsdl-as

Files:

• create-tables.sql (modified) (1 diff)
• lib/templates/sub_collection.vm (modified) (1 diff)
• src/org/greenstone/gsdlas/Constants.java (modified) (1 diff)
• src/org/greenstone/gsdlas/ProfileStore.java (modified) (5 diffs)
• src/org/greenstone/gsdlas/profiles/Predicate.java (modified) (1 diff)
• src/org/greenstone/gsdlas/profiles/PredicateFactory.java (modified) (6 diffs)
• src/org/greenstone/gsdlas/profiles/Subscription.java (modified) (5 diffs)

trunk/greenstone3-extensions/gsdl-as/create-tables.sql

@@ -19 +19 @@
     field varchar(128) not null, 
     value varchar(255), 
-    type enum("org.greenstone.gsdlas.profiles.IdEqualsPredicate", "org.greenstone.gsdlas.profiles.SubstringMatchPredicate", "org.greenstone.gsdlas.profiles.QueryPredicate") not null,
+    type enum("org.greenstone.gsdlas.profiles.EqualsPredicate", "org.greenstone.gsdlas.profiles.SubstringMatchPredicate", "org.greenstone.gsdlas.profiles.QueryPredicate") not null,
     
     unique(field,type,value)

trunk/greenstone3-extensions/gsdl-as/lib/templates/sub_collection.vm

@@ -37 +37 @@
                     <ol>
                     <li>You can choose one or more collections from the list below. Only events from the collections(s) you have chosen will be sent to you<br/>
-                    <select multiple="multiple" name="collectionID" size="7" style="margin:5px 0px;">
+                    <select multiple="multiple" name="hostCollectionID" size="7" style="margin:5px 0px;">
+                        <option value="">any collection on any host</option>
                         #foreach($host in $hostnames)
                         <optgroup label="$host">
                             #foreach($collection in $collectionnames.get($host))
-                            <option>$collection</option>
+                            <option>$host|$collection</option>
                             #end
-                            <option selected="selected" value="">any collection on host $host</option>
+                            <option selected="selected" value="$host">any collection on host $host</option>
                         </optgroup>
                     #end

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

@@ -22 +22 @@
     public static final String HOST_ID_FIELD = "hostID";
     public static final String COLLECTION_ID_FIELD = "collectionID";
+    public static final String HOST_COLLECTION_ID_FIELD = "hostCollectionID";
     public static final String DOCUMENT_ID_FIELD = "documentID";
     public static final String DOCUMENT_CONTENT_FIELD = "document_content";
     public static final String DOCUMENT_TITLE_FIELD = "document_title";
     public static final String TYPE_FIELD = "type";
+
+
 }

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

@@ -36 +36 @@
 
     private ProfileStore() {
+        // hide default constructor
     }
 
@@ -67 +68 @@
             list.add(subId);
         }
-        if (collectionIdPredicate.isEmpty()) {
-            if (!dontCareSubscriptions.containsKey(Constants.COLLECTION_ID_FIELD)) {
-                dontCareSubscriptions.put(Constants.COLLECTION_ID_FIELD, new TreeSet());
-            }
-            Set list = (Set) dontCareSubscriptions.get(Constants.COLLECTION_ID_FIELD);
-            list.add(subId);
-        }
         if (hostIdPredicate.isEmpty()) {
-            if (!dontCareSubscriptions.containsKey(Constants.HOST_ID_FIELD)) {
-                dontCareSubscriptions.put(Constants.HOST_ID_FIELD, new TreeSet());
-            }
-            Set list = (Set) dontCareSubscriptions.get(Constants.HOST_ID_FIELD);
-            list.add(subId);
+            if (collectionIdPredicate.isEmpty()) {
+                if (!dontCareSubscriptions.containsKey(Constants.COLLECTION_ID_FIELD)) {
+                    dontCareSubscriptions.put(Constants.COLLECTION_ID_FIELD, new TreeSet());
+                }
+                Set list = (Set) dontCareSubscriptions.get(Constants.COLLECTION_ID_FIELD);
+                list.add(subId);
+            }
         }
         if (typePredicate.isEmpty()) {
@@ -110 +106 @@
     public Set getPartiallyMatchedSubscriptions(Map event) {
         Set result = new TreeSet();
-        IdEqualsPredicate predicate;
-        predicate = PredicateFactory.getIdEqualsPredicate(Constants.TYPE_FIELD, 
+        
+        EqualsPredicate predicate;
+        
+        // all subscriptions with matching type...
+        predicate = PredicateFactory.getEqualsPredicate(Constants.TYPE_FIELD, 
                 (String)event.get(Constants.TYPE_FIELD));
         if (predicate != null)
             result.addAll(predicate.getSubscriptionIDs());
         
+        // ...but only those subscriptions where the doc id matches...
         Set docIDSubs = new TreeSet();
-        predicate = PredicateFactory.getIdEqualsPredicate(Constants.DOCUMENT_ID_FIELD, 
+        predicate = PredicateFactory.getEqualsPredicate(Constants.DOCUMENT_ID_FIELD, 
                 (String)event.get(Constants.DOCUMENT_ID_FIELD));
         if (predicate != null)
@@ -124 +124 @@
         result.retainAll(docIDSubs);
         
-        Set collIDSubs = new TreeSet();
-        predicate = PredicateFactory.getIdEqualsPredicate(Constants.COLLECTION_ID_FIELD, 
+        // ...and only those subscriptions where the host/collection id matches:
+        Set hostCollIDSubs = new TreeSet();
+        //   i.e.: host|coll is "don't care"...
+        hostCollIDSubs.addAll(getDontCareSubscriptions(Constants.COLLECTION_ID_FIELD));
+        //   ...or host matches (-> coll is "don't care" for this host)...
+        predicate = PredicateFactory.getEqualsPredicate(Constants.HOST_ID_FIELD, 
+                (String)event.get(Constants.HOST_ID_FIELD));
+        if (predicate != null)
+            hostCollIDSubs.addAll(predicate.getSubscriptionIDs());
+        //   ...or host|coll matches
+        predicate = PredicateFactory.getEqualsPredicate(Constants.COLLECTION_ID_FIELD, 
                 (String)event.get(Constants.COLLECTION_ID_FIELD));
         if (predicate != null)
-            collIDSubs.addAll(predicate.getSubscriptionIDs());
-        collIDSubs.addAll(getDontCareSubscriptions(Constants.COLLECTION_ID_FIELD));
-        result.retainAll(collIDSubs);
-        
-        Set hostIDSubs = new TreeSet();
-        predicate = PredicateFactory.getIdEqualsPredicate(Constants.HOST_ID_FIELD, 
-                (String)event.get(Constants.HOST_ID_FIELD));
-        if (predicate != null)
-            hostIDSubs.addAll(predicate.getSubscriptionIDs());
-        hostIDSubs.addAll(getDontCareSubscriptions(Constants.HOST_ID_FIELD));
-        result.retainAll(hostIDSubs);
+            hostCollIDSubs.addAll(predicate.getSubscriptionIDs());
+        
+        result.retainAll(hostCollIDSubs);
         
         return result;
@@ -380 +381 @@
                     }
                     String value = predicates.getString("value");
-                    if (type.equals(IdEqualsPredicate.class.getName())) {
+                    if (type.equals(EqualsPredicate.class.getName())) {
                         if (!map.containsKey(field)) {
                             map.put(field, new Vector());

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

@@ -45 +45 @@
             Constants.HOST_ID_FIELD,
             Constants.COLLECTION_ID_FIELD,
+            Constants.HOST_COLLECTION_ID_FIELD,
             Constants.DOCUMENT_ID_FIELD };
     

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

@@ -28 +28 @@
     private static int id = 0; 
     
-    private static Map idEqualsPredicates = new TreeMap();
+    private static Map equalsPredicates = new TreeMap();
     
     // substring for collection_name -> SubstringMatchPredicates referring to it
@@ -77 +77 @@
             return null;
         }
-        List results = createIdEqualsPredicates(key, values);
+        List results = createEqualsPredicates(key, values);
         for (Iterator iter = results.iterator(); iter.hasNext();) {
-            IdEqualsPredicate pred = (IdEqualsPredicate) iter.next();
+            EqualsPredicate pred = (EqualsPredicate) iter.next();
 
             pred.setID(pred.saveToDatabase());
@@ -117 +117 @@
      * @return
      */
-    private static List createIdEqualsPredicates(String key, List values) {
+    private static List createEqualsPredicates(String key, List values) {
         List result = new Vector();
         
         Map keyToPredicates;
-        if (!idEqualsPredicates.containsKey(key)) {
+        if (!equalsPredicates.containsKey(key)) {
             keyToPredicates = new HashMap();
-            idEqualsPredicates.put(key, keyToPredicates);
-        }
-        keyToPredicates = (Map) idEqualsPredicates.get(key);
+            equalsPredicates.put(key, keyToPredicates);
+        }
+        keyToPredicates = (Map) equalsPredicates.get(key);
         
         for (Iterator iter = values.iterator(); iter.hasNext();) {
@@ -137 +137 @@
             }
             
-            IdEqualsPredicate predicate = null;
+            EqualsPredicate predicate = null;
             if (keyToPredicates.containsKey(value)) {
-                predicate = (IdEqualsPredicate) keyToPredicates.get(value);
-            } else {
-                predicate = new IdEqualsPredicate(key, value);
+                predicate = (EqualsPredicate) keyToPredicates.get(value);
+            } else {
+                predicate = new EqualsPredicate(key, value);
                 keyToPredicates.put(value, predicate);
             }
@@ -202 +202 @@
      * @return
      */
-    public static IdEqualsPredicate getIdEqualsPredicate(String key, String value) {
-        IdEqualsPredicate result = null; 
-        if (idEqualsPredicates.containsKey(key)) {
-            result = (IdEqualsPredicate) ((Map)idEqualsPredicates.get(key)).get(value);
+    public static EqualsPredicate getEqualsPredicate(String key, String value) {
+        EqualsPredicate result = null; 
+        if (equalsPredicates.containsKey(key)) {
+            result = (EqualsPredicate) ((Map)equalsPredicates.get(key)).get(value);
         }
         return result;
@@ -217 +217 @@
         String value = predicate.getValue();
         
-        if (predicate instanceof IdEqualsPredicate) {
-            Map map = (Map) idEqualsPredicates.get(field);
+        if (predicate instanceof EqualsPredicate) {
+            Map map = (Map) equalsPredicates.get(field);
             if (map.containsKey(value)) {
                 map.remove(value);

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

@@ -15 +15 @@
 import java.util.Map;
 import java.util.TreeMap;
-
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.greenstone.gsdlas.Constants;
 import org.greenstone.gsdlas.database.DatabaseException;
 import org.greenstone.gsdlas.database.DatabaseManager;
@@ -38 +41 @@
     
     public Subscription(Map valueMap) throws DatabaseException, SQLException {
+        valueMap = cleanHostCollectionIDs(valueMap);
         map = new TreeMap();
         for (Iterator iter = valueMap.keySet().iterator(); iter.hasNext();) {
@@ -52 +56 @@
                 map.put(key, predicate);
 
-                if (predicate != null && !(predicate instanceof IdEqualsPredicate)) {
+                if (predicate != null && !(predicate instanceof EqualsPredicate)) {
                     numOfNonEqualsPredicates++;
                 }
@@ -63 +67 @@
                     Predicate predicate = (Predicate) iterator.next();
                     
-                    if (predicate != null && !(predicate instanceof IdEqualsPredicate)) {
+                    if (predicate != null && !(predicate instanceof EqualsPredicate)) {
                         numOfNonEqualsPredicates++;
                     }
@@ -88 +92 @@
     }
     
+    /**
+     * @param valueMap
+     * @return
+     */
+    private Map cleanHostCollectionIDs(Map valueMap) {
+        Map result = new TreeMap();
+        Pattern pattern = Pattern.compile("^(.*)\\|(.*)$");
+        for (Iterator iter = valueMap.keySet().iterator(); iter.hasNext();) {
+            String key = (String) iter.next();
+            if (!key.equals(Constants.HOST_COLLECTION_ID_FIELD)) {
+                result.put(key, valueMap.get(key));
+                continue;
+            }
+            if (key.equals(Constants.HOST_ID_FIELD)) { continue; }
+            
+            List values = (List) valueMap.get(key);
+            List hostIDs = new Vector();
+            List collIDs = new Vector();
+            for (Iterator iterator = values.iterator(); iterator.hasNext();) {
+                String id = (String) iterator.next();
+                Matcher matcher = pattern.matcher(id);
+                if (matcher.matches()) {
+                    String host = null;
+                    String coll = null;
+                    try {
+                        host = matcher.group(1);
+                        coll = matcher.group(2);
+                    } catch (IndexOutOfBoundsException e) { /*ignore*/ }
+                    if (host != null && host.length() > 0) {
+                        if (coll != null && coll.length() > 0) {
+                            if (!collIDs.contains(id)) collIDs.add(id);
+                        } else {
+                            if (!hostIDs.contains(host)) hostIDs.add(host);
+                        }
+                    }
+                }
+            }
+            result.put(Constants.HOST_ID_FIELD, hostIDs);
+            result.put(Constants.COLLECTION_ID_FIELD, collIDs);
+        }
+        return result;
+    }
+
     public boolean containsKey(Object key) {
         return map.containsKey(key);