Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory james.mmbase.org:/tmp/cvs-serv5878
Modified Files:
AssetSearchAction.java
Log Message:
CMSC-268, ASSET:Searching for primary and secondary content for an article
using the more advanced custom search windows,keep strict if search commit is
false
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-268
Index: AssetSearchAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- AssetSearchAction.java 4 Jan 2009 06:33:31 -0000 1.12
+++ AssetSearchAction.java 5 Jan 2009 01:50:50 -0000 1.13
@@ -68,6 +68,11 @@
String deleteAssetRequest = request.getParameter("deleteAssetRequest");
String searchShow = request.getParameter("searchShow");
+ String strict = request.getParameter(STRICT);
+ //it is just for keep strict if search commit is false
+ if (StringUtils.isNotEmpty(strict)) {
+ request.setAttribute(STRICT, strict);
+ }
if (StringUtils.isEmpty(searchShow)) {
searchShow = (String)request.getSession().getAttribute("searchShow");
if(StringUtils.isEmpty(searchShow)){
@@ -108,9 +113,8 @@
NodeManager nodeManager =
cloud.getNodeManager(searchForm.getAssettypes());
QueryStringComposer queryStringComposer = new QueryStringComposer();
- if (StringUtils.isNotEmpty(request.getParameter(STRICT))) {
- request.setAttribute(STRICT, request.getParameter(STRICT));
- queryStringComposer.addParameter(STRICT,
request.getParameter(STRICT));
+ if (StringUtils.isNotEmpty(strict)) {
+ queryStringComposer.addParameter(STRICT, strict);
}
if (StringUtils.isNotEmpty(request.getParameter(MODE))) {
queryStringComposer.addParameter(MODE, request.getParameter(MODE));
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
