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

Modified Files:
        ContentSearchAction.java 
Log Message:
CMSC-1116 advanced search for dynamic form save answer gives 500 error


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-1116


Index: ContentSearchAction.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ContentSearchAction.java    11 Mar 2009 08:36:40 -0000      1.8
+++ ContentSearchAction.java    28 Apr 2009 09:24:55 -0000      1.9
@@ -186,11 +186,19 @@
             String paramName = nodeManager.getName() + "." + field.getName();
             String paramValue = request.getParameter(paramName);
             if (StringUtils.isNotEmpty(paramValue)) {
-               SearchUtil.addLikeConstraint(query, field, paramValue.trim());
+               //CMSC-1116 advanced search for dynamic form save answer gives 
500 error
+               //The following if to deal with INTEGER field
+               if(field.getType() == Field.TYPE_INTEGER){
+                  FieldValueConstraint fvc = 
SearchUtil.createEqualConstraint(query, nodeManager, field.getName(), 
Integer.parseInt(paramValue));
+                  SearchUtil.addConstraint(query, fvc);
             }
+               else{
+                  SearchUtil.addLikeConstraint(query, field, 
paramValue.trim());
             queryStringComposer.addParameter(paramName, paramValue);
          }
       }
+         }
+      }
 
       // Add the title constraint:
       if (StringUtils.isNotEmpty(searchForm.getTitle())) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to