Author: raintang
Date: 2009-08-18 06:46:07 +0200 (Tue, 18 Aug 2009)
New Revision: 37953
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/SearchAction.java
Log:
CMSC-1494 Task2: Searching reactions returns stacktrace
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/SearchAction.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/SearchAction.java
2009-08-17 18:35:19 UTC (rev 37952)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/SearchAction.java
2009-08-18 04:46:07 UTC (rev 37953)
@@ -69,14 +69,13 @@
Step theStep = query.addRelationStep(nodeManager,
RepositoryUtil.CREATIONREL, "SOURCE").getNext();
query.setNodeStep(theStep);
- if (StringUtils.isNotEmpty(searchForm.getContentChannel())) {
+ if (StringUtils.isNotEmpty(searchForm.getContentChannel())) {
Integer ContentChannelNumber =
Integer.parseInt(searchForm.getContentChannel());
StepField stepField = query.createStepField(channelStep,
channelNodeManager.getField("number"));
FieldValueConstraint channelConstraint =
query.createConstraint(stepField, FieldCompareConstraint.EQUAL,
ContentChannelNumber);
- SearchUtil.addConstraint(query, channelConstraint);
- }
- else {
+ SearchUtil.addConstraint(query, channelConstraint);
+ } else if (!"reaction".equalsIgnoreCase(searchForm.getContenttypes())) {
Integer trashNumber =
Integer.parseInt(RepositoryUtil.getTrash(cloud));
StepField stepField = query.createStepField(channelStep,
channelNodeManager.getField("number"));
FieldValueConstraint channelConstraint =
query.createConstraint(stepField, FieldCompareConstraint.NOT_EQUAL,
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
