Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms
In directory
james.mmbase.org:/tmp/cvs-serv7343/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms
Modified Files:
Tag: b1_4
SearchAction.java
Log Message:
CMSC-899 backfixed to CMS Container branch 1.4
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms
See also: http://www.mmbase.org/jira/browse/CMSC-899
Index: SearchAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/SearchAction.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -b -r1.7 -r1.7.2.1
--- SearchAction.java 26 Nov 2007 11:43:39 -0000 1.7
+++ SearchAction.java 16 Dec 2008 12:52:42 -0000 1.7.2.1
@@ -132,12 +132,15 @@
protected abstract void addConstraints(SearchForm searchForm, NodeManager
nodeManager,
QueryStringComposer queryStringComposer, NodeQuery query);
-
protected void addField(NodeManager nodeManager, QueryStringComposer
queryStringComposer, NodeQuery query,
String fieldname, String value) {
- if (!StringUtil.isEmpty(value)) {
+ if (StringUtils.isNotEmpty(value)) {
Field field = nodeManager.getField(fieldname);
+ if (field.getType() == Field.TYPE_BOOLEAN) {
+ Queries.addConstraints(query, fieldname + "=" + value);
+ } else {
SearchUtil.addLikeConstraint(query, field, value);
+ }
queryStringComposer.addParameter(fieldname, value);
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
