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

[mfang]

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

Modified Files:
        SearchAction.java 
Log Message:
CMSC-1126 using Assets in content


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


Index: SearchAction.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/SearchAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- SearchAction.java   24 Sep 2008 09:54:36 -0000      1.10
+++ SearchAction.java   28 Nov 2008 09:26:08 -0000      1.11
@@ -12,12 +12,15 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import net.sf.mmapps.commons.util.StringUtil;
+
 import org.apache.commons.lang.StringUtils;
 
 import org.apache.struts.action.*;
 import org.mmbase.bridge.*;
 import org.mmbase.bridge.util.Queries;
 import org.mmbase.bridge.util.SearchUtil;
+import org.mmbase.storage.search.RelationStep;
 import org.mmbase.storage.search.Step;
 import org.mmbase.util.logging.Logger;
 import org.mmbase.util.logging.Logging;
@@ -33,6 +36,9 @@
 
    private static final String OBJECTID = "objectid";
    private static final String CONTENTTYPES = "contenttypes";
+   private static final String CONTENTCHANNEL = "contentchannel";
+   private static final String CREATIONREL = "creationrel";
+   private static final String DESTINATION = "destination";
 
    private static final String REPOSITORY_SEARCH_RESULTS_PER_PAGE = 
"repository.search.results.per.page";
 
@@ -59,6 +65,16 @@
       Step theStep = query.addStep(nodeManager);
       query.setNodeStep(theStep);
 
+      //search in one contentchannel
+      String channelid=searchForm.getChannelid();
+      if(!StringUtil.isEmpty(channelid)){
+      NodeManager channelManager = cloud.getNodeManager(CONTENTCHANNEL);
+      RelationStep relStep = 
query.addRelationStep(channelManager,CREATIONREL,DESTINATION);
+      Step channelStep = relStep.getNext();
+      Queries.addConstraints(query, channelManager.getName() + ".number=" + 
channelid);
+      request.setAttribute("channelid", channelid);
+      }
+
       // Order the result by:
       String order = searchForm.getOrder();
 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs