cobricks-cvscommit

[Irina Z. <i_z...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/user
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3818/src/org/cobricks/user

Modified Files:
	UserServlet.java 
Log Message:
delete performSearch() method


Index: UserServlet.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** UserServlet.java	9 Mar 2004 12:08:31 -0000	1.2
--- UserServlet.java	19 Mar 2004 16:14:55 -0000	1.3
***************
*** 46,50 ****
  
      //loginname can consist A-Z, a-z, 0-9, ".", "_" and "-". 
!     //loginname have a length between 6 and 20 character.     
      private static final String LOGIN_REGEXP = "([A-Za-z0-9._-]{6,20})$";
      static Logger logger = Logger.getLogger(UserServlet.class);
--- 46,50 ----
  
      //loginname can consist A-Z, a-z, 0-9, ".", "_" and "-". 
!     //loginname must have a length between 6 and 20 character.     
      private static final String LOGIN_REGEXP = "([A-Za-z0-9._-]{6,20})$";
      static Logger logger = Logger.getLogger(UserServlet.class);
***************
*** 85,89 ****
          this.addTarget("deleterole", "performDeleteRole", "", true);
          this.addTarget("addperm", "performAddPermission", "", true);
-         this.addTarget("search", "performSearch", "", false);
          this.addTarget("customise", "performCustomise", "", false);
  
--- 85,88 ----
***************
*** 213,217 ****
              String userLogin = request.getRequestParameter(FormConstants.USERLOGIN);
  
!             // exists the user with userlogin???
              if (!userManager.checkUser(userLogin)) {
                  Date a = new Date();
--- 212,216 ----
              String userLogin = request.getRequestParameter(FormConstants.USERLOGIN);
  
!             // exists the user with this userlogin???
              if (!userManager.checkUser(userLogin)) {
                  Date a = new Date();
***************
*** 229,236 ****
--- 228,237 ----
                  attrs.put(User.FIRSTNAME,
                      request.getRequestParameter(FormConstants.FIRST_NAME));
+ 
                  attrs.put(User.URI,
                      request.getRequestParameter(FormConstants.USERLOGIN));
  
                  String email = request.getRequestParameter(FormConstants.EMAIL);
+ 
                  attrs.put(User.EMAIL, email);
                  attrs.put(User.USERLOGIN, userLogin);
***************
*** 323,535 ****
      }
  
!     /**
!      * @return
!      **/
!     public String performSearch(
!         PortalRequest prequest,
!         PrintWriter out) {
!         logger.info("performSearch");
! 
!         // check access rights
!         PortalUser portalUser = prequest.getPortalUser();
! 
!         /*
!            if (!userManager.getAccessControl().
!                            checkPermission(portalUser.getUserId(),
!                                            "user", "search", null)) {
!                    prequest.setReturnCode(2000);
!                    return "noaccess";
!            }
!          */
!         Map conditions = new HashMap();
!         conditions.put("1", "=");
!         conditions.put("2", "~");
!         conditions.put("3", ">");
!         conditions.put("4", "<");
!         conditions.put("5", ">=");
!         conditions.put("6", "<=");
! 
!         Map sortBys = new HashMap();
!         sortBys.put("1", User.USERLOGIN);
!         sortBys.put("2", User.LASTNAME);
!         sortBys.put("3", User.FIRSTNAME);
!         sortBys.put("4", " basic.status ");
!         sortBys.put("5", User.EMAIL);
!         sortBys.put("6", " basic.title ");
! 
!         String aname;
!         Set avalueSet;
! 
!         try {
!             Map attrs = new HashMap();
!             boolean allIsNull = true;
! 
!             //userlogin
!             String userLogin = prequest.getRequestParameter(FormConstants.USERLOGIN);
! 
!             if ((userLogin != null) && (userLogin.length() > 0)) {
!                 allIsNull = false;
! 
!                 String cond = prequest.getRequestParameter(FormConstants.COMPARISON_FUNCTION
!                                 .concat(FormConstants.USERLOGIN));
!                 StringTokenizer commaToken = new StringTokenizer(userLogin,
!                         ",");
!                 String cond_1 = (String)conditions.get(cond);
! 
!                 if (commaToken.countTokens() > 1) {
!                     avalueSet = new HashSet();
!                     cond_1 = (String)conditions.get("1");
! 
!                     while (commaToken.hasMoreTokens()) {
!                         avalueSet.add(commaToken.nextToken());
!                     }
! 
!                     aname = User.USERLOGIN.trim().concat(cond_1);
! 
!                     attrs.put(aname, avalueSet);
!                 } else {
!                     aname = User.USERLOGIN.trim().concat(cond_1);
! 
!                     attrs.put(aname, userLogin);
!                 }
!             }
! 
!             //firstname
!             String firstName = prequest.getRequestParameter(FormConstants.FIRST_NAME);
! 
!             if ((firstName != null) && (firstName.length() > 0)) {
!                 allIsNull = false;
! 
!                 String cond = prequest.getRequestParameter(FormConstants.COMPARISON_FUNCTION
!                                 .concat(FormConstants.FIRST_NAME));
!                 logger.debug("cond = " + cond);
! 
!                 StringTokenizer commaToken = new StringTokenizer(firstName,
!                         ",");
! 
!                 if (commaToken.countTokens() > 1) {
!                     cond = (String)conditions.get("1");
!                     ;
!                 }
! 
!                 aname = User.FIRSTNAME.trim().concat((String)conditions.get(
!                             cond));
!                 attrs.put(aname, firstName);
!             }
! 
!             //lastname
!             String lastName = prequest.getRequestParameter(FormConstants.LAST_NAME);
! 
!             if ((lastName != null) && (lastName.length() > 0)) {
!                 allIsNull = false;
! 
!                 String cond = prequest.getRequestParameter(FormConstants.COMPARISON_FUNCTION
!                                 .concat(FormConstants.LAST_NAME));
!                 StringTokenizer commaToken = new StringTokenizer(lastName, ",");
! 
!                 if (commaToken.countTokens() > 1) {
!                     cond = (String)conditions.get("1");
!                 }
! 
!                 aname = User.LASTNAME.trim().concat((String)conditions.get(
!                             cond));
!                 attrs.put(aname, lastName);
!             }
! 
!             //more search criteria
!             String more_criteria = prequest.getRequestParameter("more_attrs");
! 
!             if (more_criteria != null) {
!                 StringTokenizer commaTokenizer = new StringTokenizer(more_criteria,
!                         ",");
!                 List moreAttrs = new ArrayList();
! 
!                 while (commaTokenizer.hasMoreTokens()) {
!                     moreAttrs.add(commaTokenizer.nextToken().trim());
!                 }
! 
!                 for (Iterator i = moreAttrs.iterator(); i.hasNext();) {
!                     aname = ((String)i.next());
! 
!                     //???how can I detect the type of attr???
!                     String avalue = prequest.getRequestParameter(aname).trim();
! 
!                     if ((avalue != null) && (avalue.length() > 0)) {
!                         allIsNull = false;
! 
!                         String cond = prequest.getRequestParameter(FormConstants.COMPARISON_FUNCTION
!                                         .concat(aname));
!                         StringTokenizer commaToken = new StringTokenizer(avalue,
!                                 ",");
! 
!                         if (commaToken.countTokens() > 1) {
!                             cond = (String)conditions.get("1");
!                         }
! 
!                         attrs.put(aname.trim().concat((String)conditions.get(
!                                     cond)), avalue);
!                     }
!                 }
! 
!                 logger.debug("allIsNull = " + allIsNull);
! 
!                 //test begin
! 
!                 /*
!                    Map query = new HashMap();
!                    query.put(User.LASTNAME.concat("~"), "push");
!                    query.put(User.EMAIL.concat("="), "mo...@mo...");
!                    List list = userManager.getUserIdList(query);
!                    //test end
!                  */
!             }
! 
!             //ERROR: one search criteria must be entered at least.
! 
!             /*
!                if (allIsNull) {
!                    prequest.setReturnCode(1001);
!                    return "error";
!                }
!              */
!             boolean orFlag = true;
! 
!             if (prequest.getRequestParameter("SearchLogik").equalsIgnoreCase("and")) {
!                 orFlag = false;
!             }
! 
!             String sortBy = (String)sortBys.get(prequest.getRequestParameter(
!                         FormConstants.SORT));
!             List result = userManager.getUserIdList(attrs, orFlag, sortBy);
! 
!             if (result == null) {
!                 prequest.setReturnCode(1002);
! 
!                 return "error";
!             }
! 
!             //            List result = userManager.getUserIdList(attrs, orFlag, sortBy);
!             if ((result.isEmpty()) || (result == null)) {
!                 prequest.setReturnCode(1002);
! 
!                 return "error";
!             }
! 
!             for (Iterator i = result.iterator(); i.hasNext();) {
!                 if (logger.isDebugEnabled()) {
!                     logger.debug(i.next());
!                 }
!             }
! 
!             prequest.setContextObject("res", result);
! 
!             return "success";
!         } catch (Exception e) {
!             logger.error("Error by search ", e);
!         }
! 
!         return "success";
!     }
! 
      /**
       *
--- 324,328 ----
      }
  
!    
      /**
       *