Changeset 8798 for trunk/greenstone3-extensions

Timestamp:

2004-12-14T14:28:42+13:00 (19 years ago)

Author:

schweer

Message:

filtering should work now (including multivalues); changed database based on Annika's suggestions

Location:

trunk/greenstone3-extensions/gsdl-as

Files:

• lib/templates/sub_collection.vm (modified) (1 diff)
• lib/templates/sub_host.vm (modified) (1 diff)
• src/org/greenstone/gsdlas/AlertingService.java (modified) (6 diffs)
• src/org/greenstone/gsdlas/GreenstoneCommunicator.java (modified) (2 diffs)
• src/org/greenstone/gsdlas/ProfileStore.java (modified) (8 diffs)
• src/org/greenstone/gsdlas/profiles/Predicate.java (modified) (3 diffs)
• src/org/greenstone/gsdlas/profiles/PredicateFactory.java (modified) (5 diffs)
• src/org/greenstone/gsdlas/profiles/QueryPredicate.java (modified) (1 diff)
• src/org/greenstone/gsdlas/profiles/Subscription.java (modified) (4 diffs)
• test-src/org/greenstone/gsdlas/ProfileStoreTest.java (modified) (1 diff)

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="collection" size="7" style="margin:5px 0px;">
+                    <select multiple="multiple" name="collectionID" size="7" style="margin:5px 0px;">
                         #foreach($host in $hostnames)
                         <optgroup label="$host">

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

@@ -37 +37 @@
                     <ol>
                     <li>You can choose one or more hosts from the list below. Only events from the host(s) you have chosen will be sent to you.<br/>
-                    <select multiple="multiple" name="host" size="3" style="margin:5px 0px;">
+                    <select multiple="multiple" name="hostID" size="3" style="margin:5px 0px;">
                     #set($firstoption = true);
                     #foreach($host in $hostnames)

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

@@ -19 +19 @@
 import org.apache.velocity.context.Context;
 import org.apache.velocity.servlet.VelocityServlet;
+import org.greenstone.gsdlas.database.DatabaseException;
+import org.greenstone.gsdlas.profiles.Predicate;
 import org.greenstone.gsdlas.users.UserManagementException;
 import org.greenstone.gsdlas.users.UserManager;
@@ -112 +114 @@
         if (arguments.containsKey("next_page") && arguments.get("next_page").equals("finish")) {
             arguments.putAll(getPageArgsFromSession(session));
+            arguments.put("username", session.getAttribute("username"));
             ProfileStore.getInstance().createSubscription(arguments);
             return listSubscriptions(arguments, context);
@@ -165 +168 @@
         String username = (String) session.getAttribute("username");
         context.put("title", "List of Subscriptions for " + username);
-        context.put("list", ProfileStore.getInstance().getAllSubscriptionsFor(username));
-        return "list.vm";
+        try {
+            Collection subscriptions = ProfileStore.getInstance().getAllSubscriptionsFor(username); 
+            context.put("list", subscriptions);
+            return "list.vm";
+        } catch (DatabaseException de) {
+            context.put("message", "couldn't get list of subscriptions for " + username);
+            context.put("details", de.getMessage());
+            return "error.vm";
+        }
     }
     
@@ -218 +228 @@
         GreenstoneCommunicator gsComm = null;
         try {
-            gsComm = new GreenstoneCommunicator(new URL((String) event.get("host_url")));
+            gsComm = new GreenstoneCommunicator(new URL((String) event.get("hostID")));
         } catch (MalformedURLException e) {
             // TODO Auto-generated catch block
@@ -238 +248 @@
         for (Iterator iter = args.keySet().iterator(); iter.hasNext();) {
             String key = (String) iter.next();
-            if (key.equals("type") || key.equals("host") 
-                    || key.equals("collection") || key.equals("way")) {
+            if (Predicate.isMultiValued(key) || key.equals("way")) {
                 // multi-valued attributes
                 String[] values = ((String[]) args.get(key));
@@ -320 +329 @@
         } else if (nextPage.equals("collection")) {
             // TODO might be query instead of just name
-            List hostNames = (List) arguments.get("host");
+            List hostNames = (List) arguments.get("hostID");
             GreenstoneCommunicator gsComm = null;
             Map collNames = new TreeMap();

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

@@ -146 +146 @@
             // TODO what about the nodeType
             // make sure to pass IDs of whole documents, not of parts of docs
-            Matcher matcher = Pattern.compile("(\\d{8}:\\d+)*").matcher(docID);
+            Matcher matcher = Pattern.compile("(\\d{8}:\\d+).*").matcher(docID);
             if (matcher.matches()) {
                 docID = matcher.group(1);
@@ -159 +159 @@
         Call call = new Call();
         // TODO get the uri from a configuration file
-        call.setTargetObjectURI("teevee.localsite");
+        call.setTargetObjectURI("localsite");
         call.setMethodName("process");
         // set Encoding Style to use literal XML

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

@@ -9 +9 @@
 package org.greenstone.gsdlas;
 
+import java.sql.*;
+import java.sql.Connection;
+import java.sql.Statement;
 import java.util.*;
 
 import javax.servlet.http.HttpSession;
 
+import org.greenstone.gsdlas.database.DatabaseException;
+import org.greenstone.gsdlas.database.DatabaseManager;
 import org.greenstone.gsdlas.profiles.*;
 
@@ -25 +30 @@
     private static ProfileStore instance;
 
-    private Set noEqualsSubscriptions = new TreeSet(); 
+    private Set noEqualsSubscriptions = new TreeSet();
+    private Map dontCareSubscriptions = new TreeMap();
     private Map subscriptions = new TreeMap();
+    
 
     private ProfileStore() {
+        // TODO restore subscriptions from database
     }
 
@@ -46 +54 @@
      */
     private void addSubscription(Subscription subscription) {
-        Predicate documentIdPredicate = subscription.getPredicate("documentID");
-        Predicate collectionIdPredicate = subscription.getPredicate("collectionID");
-        Predicate hostIdPredicate = subscription.getPredicate("host");
-        Predicate typePredicate = subscription.getPredicate("type");
+        // TODO change to lists
+        List documentIdPredicate = subscription.getPredicateList("documentID");
+        List collectionIdPredicate = subscription.getPredicateList("collectionID");
+        List hostIdPredicate = subscription.getPredicateList("hostID");
+        List typePredicate = subscription.getPredicateList("type");
         
         Integer subId = new Integer(subscription.getId());
         
-        if (documentIdPredicate == null && collectionIdPredicate == null 
-                && hostIdPredicate == null && typePredicate == null) {
+        if (documentIdPredicate.isEmpty()) {
+            if (!dontCareSubscriptions.containsKey("documentID")) {
+                dontCareSubscriptions.put("documentID", new TreeSet());
+            }
+            Set list = (Set) dontCareSubscriptions.get("documentID");
+            list.add(subId);
+        }
+        if (collectionIdPredicate.isEmpty()) {
+            if (!dontCareSubscriptions.containsKey("collectionID")) {
+                dontCareSubscriptions.put("collectionID", new TreeSet());
+            }
+            Set list = (Set) dontCareSubscriptions.get("collectionID");
+            list.add(subId);
+        }
+        if (hostIdPredicate.isEmpty()) {
+            if (!dontCareSubscriptions.containsKey("hostID")) {
+                dontCareSubscriptions.put("hostID", new TreeSet());
+            }
+            Set list = (Set) dontCareSubscriptions.get("hostID");
+            list.add(subId);
+        }
+        if (typePredicate.isEmpty()) {
+            if (!dontCareSubscriptions.containsKey("type")) {
+                dontCareSubscriptions.put("type", new TreeSet());
+            }
+            Set list = (Set) dontCareSubscriptions.get("type");
+            list.add(subId);
+        }
+        
+        if (documentIdPredicate.isEmpty() && collectionIdPredicate.isEmpty() 
+                && hostIdPredicate.isEmpty() && typePredicate.isEmpty()) {
             noEqualsSubscriptions.add(subId);
         }
@@ -84 +122 @@
         if (predicate != null)
             docIDSubs.addAll(predicate.getSubscriptionIDs());
-        predicate = PredicateFactory.getIdEqualsPredicate("documentID", null);
-        if (predicate != null)
-            docIDSubs.addAll(predicate.getSubscriptionIDs());
+        docIDSubs.addAll(getDontCareSubscriptions("documentID"));
         result.retainAll(docIDSubs);
         
@@ -93 +129 @@
         if (predicate != null)
             collIDSubs.addAll(predicate.getSubscriptionIDs());
-        predicate = PredicateFactory.getIdEqualsPredicate("collectionID", null);
-        if (predicate != null)
-            collIDSubs.addAll(predicate.getSubscriptionIDs());
+        collIDSubs.addAll(getDontCareSubscriptions("collectionID"));
         result.retainAll(collIDSubs);
         
         Set hostIDSubs = new TreeSet();
-        predicate = PredicateFactory.getIdEqualsPredicate("host", (String)event.get("host"));
+        predicate = PredicateFactory.getIdEqualsPredicate("hostID", (String)event.get("hostID"));
         if (predicate != null)
             hostIDSubs.addAll(predicate.getSubscriptionIDs());
-        predicate = PredicateFactory.getIdEqualsPredicate("host", null);
-        if (predicate != null)
-            hostIDSubs.addAll(predicate.getSubscriptionIDs());
+        hostIDSubs.addAll(getDontCareSubscriptions("hostID"));
         result.retainAll(hostIDSubs);
         
@@ -180 +212 @@
             for (Iterator iterator = pred.getSubscriptionIDs().iterator(); iterator
                     .hasNext();) {
-                // TODO change to subscription IDs
                 Integer subId = (Integer) iterator.next();
                 Subscription sub = (Subscription) subscriptions.get(subId);
@@ -260 +291 @@
      */
     public void deleteSubscription(String subscriptionID) {
+        // delete row from subscriptions table 
+        // for each predicate:
+        // delete row from subs_to_predicates
+        // if there aren't any other subscriptions using this predicate, delete predicate
         // TODO Auto-generated method stub
         
@@ -277 +312 @@
      * @param username
      * @return
-     */
-    public Set getAllSubscriptionsFor(String username) {
+     * @throws DatabaseException
+     */
+    public Set getAllSubscriptionsFor(String username) throws DatabaseException {
         Set result = new TreeSet();
-        // TODO get subscriptions from database
+        try {
+            Connection conn = DatabaseManager.getInstance().getDatabaseConnection();
+            Statement statement = conn.createStatement();
+            String sqlString = "SELECT id FROM subscriptions " +
+                    "WHERE user like '" + username + "';";
+            ResultSet idList = statement.executeQuery(sqlString);
+            while (idList.next()) {
+                int id = idList.getInt("id");
+                result.add(subscriptions.get(new Integer(id)));
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        
         return result;
     }
+
+    /**
+     * @param string
+     * @return
+     */
+    private Set getDontCareSubscriptions(String field) {
+        Set result = new TreeSet();
+        if (dontCareSubscriptions.containsKey(field)) {
+            result = (Set) dontCareSubscriptions.get(field);
+        }
+        return result;
+    }
     
 }

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

@@ -42 +42 @@
     public static final String[] multiValueFields = new String[] {
             "type",
-            "host",
-            "collection",
+            "hostID",
+            "collectionID",
             "documentID" };
     
@@ -117 +117 @@
      */
     int saveToDatabase() throws SQLException, DatabaseException {
-        // TODO handle multi-valued predicate (in subclass?)
         String query = "SELECT id FROM predicates " +
-                "WHERE type='single' AND field = '" + field + 
-                "' AND singleValue = '" + value + "';";
+                "WHERE field = '" + field + 
+                "' AND value = '" + value + "';";
         Statement statement = DatabaseManager.getInstance().getDatabaseConnection().createStatement();
         System.out.println(query);
@@ -129 +128 @@
         }
         // predicate has been newly created
-        String insert = "INSERT INTO predicates (type, field, singleValue) " +
-        "VALUES ('single', '" + field + "', '" + value + "');";
+        String insert = "INSERT INTO predicates (field, value) " +
+        "VALUES ('" + field + "', '" + value + "');";
         System.out.println(insert);
         statement.execute(insert);

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

@@ -59 +59 @@
             List list = new ArrayList();
             list.add(value);
-            return createPredicate(key, list);
+            return (Predicate) createPredicates(key, list).get(0);
         } else if (key.startsWith("document")) {
             result = createQueryPredicate(key, value);
@@ -71 +71 @@
     }
     
-    public static Predicate createPredicate(String key, List values) throws SQLException, DatabaseException {
+    public static List createPredicates(String key, List values) throws SQLException, DatabaseException {
         if (!Predicate.isMultiValued(key)) {
             return null;
         }
-        Predicate result = createIdEqualsPredicate(key, values);
-        result.setID(result.saveToDatabase());
-        return result;
+        List results = createIdEqualsPredicates(key, values);
+        for (Iterator iter = results.iterator(); iter.hasNext();) {
+            IdEqualsPredicate pred = (IdEqualsPredicate) iter.next();
+
+            pred.setID(pred.saveToDatabase());
+        }
+        return results;
     }
 
@@ -103 +107 @@
      * @return
      */
-    private static IdEqualsPredicate createIdEqualsPredicate(String key, List values) {
-        IdEqualsPredicate predicate = null;
+    private static List createIdEqualsPredicates(String key, List values) {
+        List result = new Vector();
         
         Map keyToPredicates;
@@ -116 +120 @@
             String value = (String) iter.next();
 
-            if (key.equals("host") && !(key.startsWith("http://"))) {
+            if (key.equals("hostID") && !(value.startsWith("http://"))) {
                 value = "http://" + value + ":8080/soap/servlet/rpcrouter";
             }
             
+            IdEqualsPredicate predicate = null;
             if (keyToPredicates.containsKey(value)) {
                 predicate = (IdEqualsPredicate) keyToPredicates.get(value);
@@ -126 +131 @@
                 keyToPredicates.put(value, predicate);
             }
+            result.add(predicate);
         }
-        return predicate;
+        return result;
     }
     

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

@@ -27 +27 @@
         super.field = field;
         super.value = query;
-        
-        String[] words = query.split("\\s");
-        for (int i = 0; i < words.length; i++) {
-            String word = words[i];
-            if (!word.startsWith("!")) {
-                containsWords.add(word);
-            } else {
-                if (word.length() > 1) {
-                    notContainsWords.add(word);
-                } else if (i < words.length - 1) {
-                    notContainsWords.add(words[i++]);
-                }
-            }
-        }
     }
-
-    /* (non-Javadoc)
-     * @see org.greenstone.gsdlas.profiles.Predicate#isSatisfied(java.util.Map)
-     */
     public boolean isSatisfied(Map event) {
-        // TODO more efficient implementation
-        
-        String value = (String) event.get(field);
-        if (value == null) return false;
-        
-        
-        for (Iterator iter = containsWords.iterator(); iter.hasNext();) {
-            String word = (String) iter.next();
-            if (value.indexOf(word) == -1) {
-                return false;
-            }
-        }
-        
-        for (Iterator iter = notContainsWords.iterator(); iter.hasNext();) {
-            String word = (String) iter.next();
-            if (value.indexOf(word) >= 0) {
-                return false;
-            }
-        }
-        
         return true;
     }

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

@@ -48 +48 @@
             Object value = valueMap.get(key);
             
-            Predicate predicate = null;
             if (value instanceof String) {
-                predicate = PredicateFactory.createPredicate(key, (String) value);  
+                Predicate predicate = PredicateFactory.createPredicate(key, (String) value);  
                 map.put(key, predicate);
+
+                if (predicate != null && !(predicate instanceof IdEqualsPredicate)) {
+                    numOfNonEqualsPredicates++;
+                }
             } else if (value instanceof List) {
                 List values = (List)value;
-                predicate = PredicateFactory.createPredicate(key, values);  
-                map.put(key, predicate);
+                List predicates = PredicateFactory.createPredicates(key, values);
+                map.put(key, predicates);
+                for (Iterator iterator = predicates.iterator(); iterator
+                        .hasNext();) {
+                    Predicate predicate = (Predicate) iterator.next();
+                    
+                    if (predicate != null && !(predicate instanceof IdEqualsPredicate)) {
+                        numOfNonEqualsPredicates++;
+                    }
+                }
             } 
             
-            if (predicate != null && !(predicate instanceof IdEqualsPredicate)) {
-                numOfNonEqualsPredicates++;
-            }
         }
         
@@ -89 +97 @@
     
     public Predicate getPredicate(String field) {
-        return (Predicate) map.get(field);
+        if (map.get(field) instanceof Predicate) {
+            return (Predicate) map.get(field);
+        }
+        return null;
+    }
+    
+    public List getPredicateList(String field) {
+        if (map.get(field) instanceof List) {
+            return (List) map.get(field);
+        }
+        return new Vector();
     }
     
@@ -99 +117 @@
         Set result = new HashSet();
         for (Iterator iter = map.values().iterator(); iter.hasNext();) {
-            Predicate pred = (Predicate) iter.next();
-            if (pred != null) {
-                result.add(pred);
+            Object next = iter.next();
+            if (next == null) {
+                continue;
+            } else if (next instanceof Predicate) {
+                result.add(next);
+            } else if (next instanceof List) {
+                result.addAll((Collection) next);
             }
         }
@@ -149 +171 @@
             // cannot change user
         }
-        System.out.println(sqlString);
         statement.executeUpdate(sqlString);
         

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

@@ -46 +46 @@
             event.put("documentID", "20041118:5");
             event.put("collectionID", "gs3mgdemo");
-            event.put("host", "http://localhost:8080/soap/servlet/rpcrouter");
+            event.put("hostID", "http://localhost:8080/soap/servlet/rpcrouter");
             
             Set result = ProfileStore.getInstance().filter(event, gsComm);