Author: mfortun Date: 2011-06-09 10:40:37 +0200 (Thu, 09 Jun 2011) New Revision: 938 Url: http://nuiton.org/repositories/revision/wikitty/938 Log: * correct view link construction with correct use of jquery tag lib * correct search index 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-06-08 15:21:30 UTC (rev 937) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-06-09 08:40:37 UTC (rev 938) @@ -11,7 +11,7 @@ protected PagedResult<Wikitty> pagedResult; protected Wikitty wikittyResult; protected String searchRequest = "*"; - protected int first = 0; + protected int first = 1; protected int end = 100; protected String id; @@ -105,25 +105,27 @@ @Override public String execute() throws Exception { + int delta = end - first; + /* + * if first=1 and end=5 so next values will be first=6 and end=10 + */ if (!"".equals(next)) { - int oldbegin = first; - first = end; - end = end + (end - oldbegin); + first = end + 1; + end = first + delta; } if (!"".equals(previous)) { - - int oldEnd = end; - end = first; - first = first - (oldEnd - first); - + end = first - 1; + first = end - delta; } - if (end < 0) { - end = 0; + // due to how indexes are adjust end and first value have to be strictly + // positive + if (end <= 0) { + end = 1; } - if (first < 0) { - first = 0; + if (first <= 0) { + first = 1; } if ("".equals(searchRequest)) { @@ -134,8 +136,9 @@ // search wikitties Criteria criteria = Search.query().keyword(searchRequest).criteria(); - criteria.setFirstIndex(first); - criteria.setEndIndex(end); + // criteria starts index at 0 so adjust search indexes + criteria.setFirstIndex(first - 1); + criteria.setEndIndex(end - 1); pagedResult = getWikittyPublicationProxy().findAllByCriteria(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-06-08 15:21:30 UTC (rev 937) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-06-09 08:40:37 UTC (rev 938) @@ -61,16 +61,16 @@ <% } %> -<div> -<div id="partnersInfo"> + +<div id="wikittyInfo"> <img src="/img/indicator.gif" alt="Loading..." style="display: none" /> </div> -</div> + <form action="view.action" method="post"> <div> <textarea title="Search" name="searchRequest"><%=action.getSearchRequest()%></textarea> @@ -79,7 +79,7 @@ <s:textfield label="End" key="end" name="end" /> <input type="submit" name="search" value="Search" /> - <pre> WikittyFound: <%=action.getPagedResult().getNumFound()%></pre> + <pre> Wikitty Aviable: <%=action.getPagedResult().getNumFound()%></pre> <br/> @@ -107,21 +107,15 @@ href="${urlraw}">Raw</a> <s:url var="urleval" action="%{#localContext}/eval/elt_id:%{#wid}" /> <a href="${urleval}">Eval</a> - <a id="ajaxlink_<%=i%>" href="javascript:void(0)">View</a> + <!-- <a id="ajaxlink_<%=i%>" href="javascript:void(0)">View</a> --> - <s:url - var="urlFragment" action="/fragment/wikittyInfo" /> - <script type='text/javascript'> - jQuery(document).ready(function () { - var options_ajaxlink_<%=i%> = {}; - options_ajaxlink_<%=i%>.jqueryaction = "anchor"; - options_ajaxlink_<%=i%>.id = "ajaxlink_<%=i%>"; - options_ajaxlink_<%=i%>.targets = "partnersInfo"; - options_ajaxlink_<%=i%>.href = "${urlFragment}"; - options_ajaxlink_<%=i%>.hrefparameter = "id=<%=w.getId()%>"; - jQuery.struts2_jquery.bind(jQuery('#ajaxlink_<%=i%>'),options_ajaxlink_<%=i%>); - }); - </script> + <s:url var="urlFragment" action="/fragment/wikittyInfo"> + <s:param name="id"><%=w.getId()%></s:param> + </s:url> + + + <sj:a targets="wikittyInfo" href="%{#urlFragment}"> view</sj:a> + </td> <td><%=w.getId()%></td>