[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-serv13724/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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- SearchAction.java   1 Dec 2008 10:47:58 -0000       1.12
+++ SearchAction.java   3 Dec 2008 06:15:37 -0000       1.13
@@ -12,15 +12,12 @@
 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;
@@ -36,9 +33,6 @@
 
    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";
 
@@ -65,19 +59,6 @@
       Step theStep = query.addStep(nodeManager);
       query.setNodeStep(theStep);
 
-      //search in one contentchannel
-      String channelid=searchForm.getChannelid();
-      if(!StringUtil.isEmpty(channelid)){
-      //search in the current channel
-      if("current".equals(channelid))
-         channelid = (String)request.getSession().getAttribute("creation");
-      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