Changeset 8777 for trunk/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/AlertingService.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/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/AlertingService.java (modified) (4 diffs)

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

@@ -21 +21 @@
 import org.greenstone.gsdlas.users.UserManagementException;
 import org.greenstone.gsdlas.users.UserManager;
+import org.greenstone.gsdlas.util.ArrayHelper;
 
 /**
@@ -30 +31 @@
 public class AlertingService extends VelocityServlet {
     
-    public static final Set actions;
-    static {
-        Set set = new TreeSet();
-        set.add("createSubscription");
-        set.add("deleteSubscription");
-        set.add("editSubscription");
-        set.add("showFeed");
-        set.add("listSubscriptions");
-        
-        set.add("login");
-        set.add("register");
-        set.add("logout");
-        set.add("showLoginForm");
-        set.add("showRegistrationForm");
-        actions = Collections.unmodifiableSet(set);
-    }
+    public static final String[] actions = new String[] {
+            "createSubscription",
+            "deleteSubscription",
+            "editSubscription",
+            "showFeed",
+            "listSubscriptions",
+            "login",
+            "register",
+            "logout",
+            "showLoginForm",
+            "showRegistrationForm"
+    };
     
     
@@ -52 +49 @@
         
         String action = req.getParameter("action");
-        
-        if (action == null || !actions.contains(action)) {
-            String title = "Unknown action";
-            String message = "I don't know how to " + action;
-            String details = "The only actions I know are " + actions;
-            return showError(context, message, details);
-        }
-        
 
         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;
+        }
+        
+        if (action == null || !ArrayHelper.contains(actions, action)) {
+            String title = "Unknown action";
+            String message = "I don't know how to " + action;
+            String details = "The only actions I know are " + Arrays.toString(actions);
+            return showError(context, message, details);
+        }
+                
         String templateString = "";
         
@@ -163 +164 @@
         String username = (String) session.getAttribute("username");
         context.put("title", "List of Subscriptions for " + username);
-        context.put("list", ProfileStore.getInstance().getAllSubscriptions());
+        context.put("list", ProfileStore.getInstance().getAllSubscriptionsFor(username));
         return "list.vm";
     }