[Yanel-commits] rev 55777 - public/yanel/trunk/src/resources/user-mgmt/src/java/org/wyona/yanel/impl/resources

[michi at wyona.com]

Author: michi
Date: 2010-12-28 21:22:30 +0100 (Tue, 28 Dec 2010)
New Revision: 55777

Modified:
   public/yanel/trunk/src/resources/user-mgmt/src/java/org/wyona/yanel/impl/resources/ListUsersResource.java
Log:
query implemented

Modified: public/yanel/trunk/src/resources/user-mgmt/src/java/org/wyona/yanel/impl/resources/ListUsersResource.java
===================================================================
--- public/yanel/trunk/src/resources/user-mgmt/src/java/org/wyona/yanel/impl/resources/ListUsersResource.java	2010-12-28 20:04:27 UTC (rev 55776)
+++ public/yanel/trunk/src/resources/user-mgmt/src/java/org/wyona/yanel/impl/resources/ListUsersResource.java	2010-12-28 20:22:30 UTC (rev 55777)
@@ -22,6 +22,8 @@
 import org.wyona.yanel.impl.resources.usecase.UsecaseException;
 import org.wyona.yanel.impl.resources.usecase.UsecaseResource;
 
+import org.apache.log4j.Logger;
+
 import java.lang.System;
 import java.lang.Integer;
 import java.lang.Boolean;
@@ -37,6 +39,7 @@
     // Constants
     private static final int DEFAULT_ITEMS_PER_PAGE = 10;
     //private static final int DEFAULT_ITEMS_PER_PAGE = 100;
+    private static final Logger log =  Logger.getLogger(ListUsersResource.class);
 
     // Variables
     private int currentPage = 1;
@@ -82,8 +85,23 @@
             // All users matching search term,
             // or all users overall if search term is empty
             Iterator<User> allUsers;
-            allUsers = userManager.getAllUsers();
+            String query = getParameterAsString("query");
 
+            if(query != null && !"".equals(query)) { 
+                try {
+                    // TODO: What if getUsers() returns garbage?
+                    allUsers = userManager.getUsers(query);
+                } catch(Exception e) {
+                    log.warn(e, e);
+                    lowerBound = 0;
+                    upperBound = 0;
+                    totalUsers = 0;
+                    return;
+                }
+            } else {
+                allUsers = userManager.getAllUsers();
+            }
+
             // Boundaries...
             lowerBound = (currentPage-1)*itemsPerPage;
             upperBound = lowerBound+itemsPerPage-1; // TODO: On the very last page this doesn't have to be correct