Author: mfortun Date: 2011-08-09 11:03:53 +0200 (Tue, 09 Aug 2011) New Revision: 1113 Url: http://nuiton.org/repositories/revision/wikitty/1113 Log: *repare view page Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-08-09 08:33:30 UTC (rev 1112) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-08-09 09:03:53 UTC (rev 1113) @@ -1,6 +1,11 @@ package org.nuiton.wikitty.publication.action; +import java.util.ArrayList; +import java.util.List; + +import org.nuiton.util.StringUtil; import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.publication.WikittyPublicationProxy; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; @@ -104,7 +109,21 @@ @Override public String execute() throws Exception { + List<String> argsString = new ArrayList<String>(); + String args = ActionContext.getContext().getParameters().get(ARGS_KEY) + .toString(); + String[] argsTab = StringUtil.split(args, SEPARATOR); + for (String arg : argsTab) { + argsString.add(arg); + } + + Criteria criteriaWikitty = searchCriteria(argsString); + + WikittyPublicationProxy proxy = getWikittyPublicationProxy(); + + wikittyResult = proxy.findByCriteria(criteriaWikitty); + int delta = end - first; /* * if first=1 and end=5 so next values will be first=6 and end=10 @@ -132,7 +151,7 @@ searchRequest = "*"; } - wikittyResult = getWikittyPublicationProxy().restore(id); + //wikittyResult = getWikittyPublicationProxy().restore(id); // search wikitties Criteria criteria = Search.query().keyword(searchRequest).criteria(); Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-08-09 08:33:30 UTC (rev 1112) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-08-09 09:03:53 UTC (rev 1113) @@ -112,7 +112,7 @@ href="${urleval}">Eval</a> <!-- <a id="ajaxlink_<%=i%>" href="javascript:void(0)">View</a> --> - <s:url var="urlFragment" action="/fragment/wikittyInfo"> + <s:url var="urlFragment" action="wikittyInfo" namespace="/fragment"> <s:param name="id"><%=w.getId()%></s:param> </s:url>