[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms SearchAction.java

[fpunt]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory 
james.mmbase.org:/tmp/cvs-serv21634/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms

Modified Files:
        SearchAction.java 
Log Message:
Fixed CMSC-882 now trimming spaces


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
See also: http://www.mmbase.org/jira/browse/CMSC-882


Index: SearchAction.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- SearchAction.java   5 Feb 2008 11:09:59 -0000       1.9
+++ SearchAction.java   2 May 2008 13:23:46 -0000       1.10
@@ -154,7 +154,7 @@
                 String paramName = nodeManager.getName() + "." + 
field.getName();
                 String paramValue = request.getParameter(paramName);
                 if (!StringUtil.isEmpty(paramValue)) {
-                    SearchUtil.addLikeConstraint(query, field, paramValue);
+                    SearchUtil.addLikeConstraint(query, field, 
paramValue.trim());
                 }
                 queryStringComposer.addParameter(paramName, paramValue);
             }
@@ -163,9 +163,9 @@
         // Add the title constraint:
         if (!StringUtil.isEmpty(searchForm.getTitle())) {
 
-            queryStringComposer.addParameter(ContentElementUtil.TITLE_FIELD, 
searchForm.getTitle());
+            queryStringComposer.addParameter(ContentElementUtil.TITLE_FIELD, 
searchForm.getTitle().trim());
             Field field = nodeManager.getField(ContentElementUtil.TITLE_FIELD);
-            Constraint titleConstraint = 
SearchUtil.createLikeConstraint(query, field, searchForm.getTitle());
+            Constraint titleConstraint = 
SearchUtil.createLikeConstraint(query, field, searchForm.getTitle().trim());
             SearchUtil.addConstraint(query, titleConstraint);
         }
 
@@ -182,20 +182,21 @@
 
         // Set the objectid constraint
         if (!StringUtil.isEmpty(searchForm.getObjectid())) {
+               String stringObjectId = searchForm.getObjectid().trim();
             Integer objectId = null;
-            if (searchForm.getObjectid().matches("^\\d+$")) {
-                objectId = new Integer(searchForm.getObjectid());
+            if (stringObjectId.matches("^\\d+$")) {
+                objectId = new Integer(stringObjectId);
             }
             else {
-                if (cloud.hasNode(searchForm.getObjectid())) {
-                    objectId = new 
Integer(cloud.getNode(searchForm.getObjectid()).getNumber());
+                if (cloud.hasNode(stringObjectId)) {
+                    objectId = new 
Integer(cloud.getNode(stringObjectId).getNumber());
                 }
                 else {
                     objectId = new Integer(-1);
                 }
             }
             SearchUtil.addEqualConstraint(query, nodeManager, 
ContentElementUtil.NUMBER_FIELD, objectId);
-            queryStringComposer.addParameter(OBJECTID, 
searchForm.getObjectid());
+            queryStringComposer.addParameter(OBJECTID, stringObjectId);
         }
 
         // Add the user personal:
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs