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

Timestamp:

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

Author:

schweer

Message:

normalise event map

File:

• trunk/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/AlertingService.java (modified) (3 diffs)

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

@@ -51 +51 @@
 
         Map args = req.getParameterMap();
-        // TODO stop this, we need multi-valued stuff
-        args = normalise(args);
-
+        
         if (action != null && action.equals("receiveEvent")) {
             receiveEvent(args);
             return null;
         }
+        
+        // TODO stop this, we need multi-valued stuff
+        args = normalise(args);
         
         if (action == null || !ArrayHelper.contains(actions, action)) {
@@ -207 +208 @@
     }
     
-    public void receiveEvent(Map event) {
+    public void receiveEvent(Map rawEvent) {
+        Map event = new TreeMap();
+        for (Iterator iter = rawEvent.keySet().iterator(); iter.hasNext();) {
+            String key = (String) iter.next();
+            String[] value = (String[]) rawEvent.get(key);
+            event.put(key, value[0]);
+        }
+        
         GreenstoneCommunicator gsComm = null;
         try {
@@ -219 +227 @@
         }
         Set matchedSubscriptions = ProfileStore.getInstance().filter(event, gsComm);
+        System.out.println(matchedSubscriptions.size() + " matching subscriptions: " + matchedSubscriptions);
         // TODO do something with the matched subscriptions
     }