Author: mfortun Date: 2011-05-10 09:57:31 +0200 (Tue, 10 May 2011) New Revision: 881 Url: http://nuiton.org/repositories/revision/wikitty/881 Log: * improve 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-09 16:08:27 UTC (rev 880) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-05-10 07:57:31 UTC (rev 881) @@ -11,6 +11,10 @@ protected PagedResult<Wikitty> pagedResult; protected Wikitty wikittyResult; + protected String search; + protected String first; + protected String end; + /** * @@ -25,24 +29,29 @@ @Override public String execute() throws Exception { - + + search = this.getArgument("r", "*"); + first = this.getArgument("first", "0"); + end = this.getArgument("end", "100"); + + String id = getArgument("id", ""); System.out.println(id); if (!"".equals(id)) { wikittyResult = getWikittyPublicationProxy().restore(id); } - SearchForAllWikitty(); + searchForWikitties(); return SUCCESS; } - protected void SearchForAllWikitty() { + protected void searchForWikitties() { - String r = "*"; + String r = search; - int firstIndex = 0; - int endIndex = 100; + int firstIndex = Integer.parseInt(first); + int endIndex = Integer.parseInt(end); Criteria criteria = Search.query().keyword(r).criteria(); criteria.setFirstIndex(firstIndex); @@ -68,4 +77,31 @@ this.wikittyResult = wikittyResult; } + public String getSearch() { + return search; + } + + public void setSearch(String search) { + this.search = search; + } + + public String getFirst() { + return first; + } + + public void setFirst(String first) { + this.first = first; + } + + public String getEnd() { + return end; + } + + public void setEnd(String end) { + this.end = end; + } + + + + } 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-09 16:08:27 UTC (rev 880) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-05-10 07:57:31 UTC (rev 881) @@ -76,12 +76,12 @@ <form action="view.action" method="post"> <div> - <textarea name="r" rows="4" cols="20"><%=action.getArgument("r", "*")%></textarea> + <textarea name="r" rows="4" cols="20"><%=action.getSearch()%></textarea> </div> <label for="first">First</label> <input type="text" name="first" - value="<%=action.getArgument("first", "0")%>" /> <label for="first">First</label> + value="<%=action.getFirst()%>" /> <label for="first">End</label> <input type="text" name="end" - value="<%=action.getArgument("end", "100")%>" /> <input type="submit" + value="<%=action.getEnd()%>" /> <input type="submit" name="id" value="Search" /> <pre>