Changeset 8630 for trunk/greenstone3-extensions/gsdl-as/src

Timestamp:

2004-11-23T15:08:24+13:00 (19 years ago)

Author:

schweer

Message:

restructured servlet to use velocity

Location:

trunk/greenstone3-extensions/gsdl-as

Files:

• . (modified) (1 prop)
• src/org/greenstone/gsdlas/AlertingService.java (added)
• src/org/greenstone/gsdlas/AlertingServiceServlet.java (modified) (2 diffs)
• src/org/greenstone/gsdlas/ProfileStore.java (modified) (3 diffs)
• src/org/greenstone/gsdlas/profiles/Subscription.java (modified) (1 diff)

trunk/greenstone3-extensions/gsdl-as

@@ -1 +1 @@
 build
 dist
-lib
 test-classes

@@ -1 +1 @@
 build
 dist
-lib
 test-classes

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

@@ -122 +122 @@
             Subscription sub = new Subscription(valueMap);
             // TODO this should probably be somewhere else
-            for (Iterator iter = sub.predicates().iterator(); iter.hasNext();) {
+            for (Iterator iter = sub.getPredicates().iterator(); iter.hasNext();) {
                 Predicate predicate = (Predicate) iter.next();
                 if (predicate != null) {
@@ -151 +151 @@
         }
 
-        // TODO authentication (not everyone should be allowed to post
-        // events...)
         GreenstoneCommunicator gsComm = null;
         try {

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

@@ -164 +164 @@
         
         return matchedPreds;
-//        Set result = new TreeSet();
-//        for (Iterator iter = PredicateFactory.getAllBooleanPredicates().iterator(); iter.hasNext();) {
-//            Predicate predicate = (Predicate) iter.next();
-//            if (predicate.isSatisfied(event)) {
-//                result.add(event);
-//            }
-//        }
-//        return result;
-    }
-
-    /**
-     * @param value
-     * @return
-     */
-    private Set getWordsInString(String value) {
-        Set result = new TreeSet();
-        String[] words = value.split("\\s");
-        // TODO better word recognition
-        for (int i = 0; i < words.length; i++) {
-            String word = words[i];
-            while (word.endsWith(".") || word.endsWith(",") || word.endsWith("?") || word.endsWith("!")) {
-                word = word.substring(0, word.length() - 2);
-            }
-            if (!result.contains(word)) {
-                result.add(word);
-            }
-        }
-        return result;
-    }
-
-    /**
-     * @param object
-     * @return
-     */
-    private Set getWordsInDocument(String documentID) {
-        Set result = new TreeSet();
-        // TODO get document text, use getWordsInString
-        // or better: do something clever using the indexes
-        return result;
     }
 
@@ -270 +231 @@
 
     public String toString() {
-        Set allSubscriptions = new TreeSet();
-        allSubscriptions.addAll(noEqualsSubscriptions);
-        
-        for(Iterator iter = docIdEqualsSubscriptions.values().iterator(); iter.hasNext();) {
-            Set values = (Set) iter.next();
-            allSubscriptions.addAll(values);
-        }
-        
-        for(Iterator iter = docCollectionIdEqualsSubscriptions.values().iterator(); iter.hasNext();) {
-            Set values = (Set) iter.next();
-            allSubscriptions.addAll(values);
-        }
-        
-        for(Iterator iter = collectionIdEqualsSubscriptions.values().iterator(); iter.hasNext();) {
-            Set values = (Set) iter.next();
-            allSubscriptions.addAll(values);
-        }
+        Set allSubscriptions = getAllSubscriptions();
         
         StringBuffer buffer = new StringBuffer();
@@ -298 +243 @@
         return buffer.toString();
     }
+
+    /**
+     * @return
+     */
+    public Set getAllSubscriptions() {
+        Set allSubscriptions = new TreeSet();
+        allSubscriptions.addAll(noEqualsSubscriptions);
+        
+        for(Iterator iter = docIdEqualsSubscriptions.values().iterator(); iter.hasNext();) {
+            Set values = (Set) iter.next();
+            allSubscriptions.addAll(values);
+        }
+        
+        for(Iterator iter = docCollectionIdEqualsSubscriptions.values().iterator(); iter.hasNext();) {
+            Set values = (Set) iter.next();
+            allSubscriptions.addAll(values);
+        }
+        
+        for(Iterator iter = collectionIdEqualsSubscriptions.values().iterator(); iter.hasNext();) {
+            Set values = (Set) iter.next();
+            allSubscriptions.addAll(values);
+        }
+        return Collections.unmodifiableSet(allSubscriptions);
+    }
     
 }

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

@@ -57 +57 @@
     }
     
-    public Collection predicates() {
+    public Collection getPredicates() {
         return Collections.unmodifiableCollection(map.values());
     }

@@ -1 +1 @@
 build
 dist
-lib
 test-classes