Author: mfortun Date: 2011-06-01 16:29:46 +0200 (Wed, 01 Jun 2011) New Revision: 932 Url: http://nuiton.org/repositories/revision/wikitty/932 Log: * add buttons next and previous in 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-05-31 15:31:17 UTC (rev 931) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-06-01 14:29:46 UTC (rev 932) @@ -6,63 +6,20 @@ import org.nuiton.wikitty.search.Search; import com.opensymphony.xwork2.ActionContext; -public class PublicationActionView extends PublicationBaseAction { +public class PublicationActionView extends PublicationBaseAction { protected PagedResult<Wikitty> pagedResult; protected Wikitty wikittyResult; - protected String search = "*"; + protected String searchRequest = "*"; protected int first = 0; protected int end = 100; - - - - /** - * - */ - private static final long serialVersionUID = -4927699544115089591L; + protected String id; - static public PublicationActionView getAction() { - return (PublicationActionView) ActionContext.getContext().get( - CONTEXT_ACTION_KEY); - } + protected String search = ""; + protected String next = ""; + protected String previous = ""; - @Override - public String execute() throws Exception { - - - // search = this.getArgument("r", "*"); - // first = this.getArgument("first", "0"); - // end = this.getArgument("end", "100"); - - String id = getArgument("id", ""); - - - - if (!"".equals(id)) { - wikittyResult = getWikittyPublicationProxy().restore(id); - } - - searchForWikitties(); - - return SUCCESS; - } - - protected void searchForWikitties() { - - String r = search; - - int firstIndex = first; - int endIndex = end; - - Criteria criteria = Search.query().keyword(r).criteria(); - criteria.setFirstIndex(firstIndex); - criteria.setEndIndex(endIndex); - - pagedResult = getWikittyPublicationProxy().findAllByCriteria(criteria); - - } - public PagedResult<Wikitty> getPagedResult() { return pagedResult; } @@ -79,12 +36,12 @@ this.wikittyResult = wikittyResult; } - public String getSearch() { - return search; + public String getSearchRequest() { + return searchRequest; } - public void setSearch(String search) { - this.search = search; + public void setSearchRequest(String searchRequest) { + this.searchRequest = searchRequest; } public int getFirst() { @@ -103,7 +60,86 @@ this.end = end; } - + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSearch() { + return search; + } + + public void setSearch(String search) { + this.search = search; + } + + public String getNext() { + return next; + } + + public void setNext(String next) { + this.next = next; + } + + public String getPrevious() { + return previous; + } + + public void setPrevious(String previous) { + this.previous = previous; + } + + /** + * + */ + private static final long serialVersionUID = -4927699544115089591L; + + static public PublicationActionView getAction() { + return (PublicationActionView) ActionContext.getContext().get( + CONTEXT_ACTION_KEY); + } + + @Override + public String execute() throws Exception { + + if (!"".equals(next)) { + int oldbegin = first; + first = end; + end = end + (end - oldbegin); + } + if (!"".equals(previous)) { + + int oldEnd = end; + end = first; + first = first - (oldEnd - first); + + } + + if (end < 0) { + end = 0; + } + + if (first < 0) { + first = 0; + } + + if ("".equals(searchRequest)) { + searchRequest = "*"; + } + + wikittyResult = getWikittyPublicationProxy().restore(id); + + // search wikitties + Criteria criteria = Search.query().keyword(searchRequest).criteria(); + criteria.setFirstIndex(first); + criteria.setEndIndex(end); + + pagedResult = getWikittyPublicationProxy().findAllByCriteria(criteria); + + return SUCCESS; + } + } Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-05-31 15:31:17 UTC (rev 931) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-06-01 14:29:46 UTC (rev 932) @@ -39,6 +39,7 @@ <%@page import="org.nuiton.wikitty.search.PagedResult"%> <%@page import="org.nuiton.wikitty.entities.Wikitty"%> <%@taglib prefix="s" uri="/struts-tags"%> + <h1>Wikitty View</h1> <% @@ -70,11 +71,11 @@ %> <form action="view.action" method="post"> <div> - <textarea title="Search" name="search"><%=action.getSearch()%></textarea> + <textarea title="Search" name="searchRequest"><%=action.getSearchRequest()%></textarea> </div> <s:textfield label="First" key="first" name="first" /> <s:textfield label="End" key="end" name="end" /> - <input type="submit" name="id" value="Search" /> + <input type="submit" name="search" value="Search" /> <pre> </pre> @@ -88,6 +89,7 @@ </tr> + <% for (Wikitty w : action.getPagedResult().getAll()) { %> @@ -98,7 +100,7 @@ action="%{#localContext}/raw/elt_id:%{#wid}" /> <a href="${urlraw}">Raw</a> <s:url var="urleval" action="%{#localContext}/eval/elt_id:%{#wid}" /> <a href="${urleval}">Eval</a></td> - <td><input type="submit" name="id" value="<%=w.getId()%>" /> + <td><input type="submit" name="id" value="<%=w.getId()%>" title="chaussette" /> </td> <td><%=w.getVersion()%></td> @@ -107,5 +109,10 @@ <% } %> + + + </table> + <input type="submit" name="previous" value="previous" /> + <input type="submit" name="next" value="next" /> </form>