Author: bbrossaud Date: 2010-05-14 11:52:06 +0200 (Fri, 14 May 2010) New Revision: 24 Url: http://chorem.org/repositories/revision/bow/24 Log: the count of the click works Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/java/org/chorem/bow/Model.java trunk/src/main/resources/wikitty-jdbc-config.properties trunk/src/main/webapp/search.jsp trunk/src/main/xmi/bow.zargo Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-05-12 15:38:56 UTC (rev 23) +++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-05-14 09:52:06 UTC (rev 24) @@ -63,6 +63,7 @@ String link = url.trim(); bookmark.setLink(link); } + bookmark.setClick(0); bookmark.setEmail(user.getEmail()); // set the email (user name) bookmark.setDate(new Date()); // set the date return bookmark; Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-12 15:38:56 UTC (rev 23) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-14 09:52:06 UTC (rev 24) @@ -124,6 +124,11 @@ log.debug("Going to actionOrderDesc"); } this.actionOrderDesc(request, response); + } else if (action.equals("addClick")) { + if (log.isDebugEnabled()) { + log.debug("Going to actionAddClic"); + } + this.actionAddClick(request, response); } else { user = null; if (log.isDebugEnabled()) { @@ -145,6 +150,23 @@ } + protected void actionAddClick(HttpServletRequest request, HttpServletResponse response) + throws IOException, ServletException { + String bookmarkId = request.getParameter("bookmarkId"); + if (bookmarkId != null && !bookmarkId.isEmpty()) { + WikittyProxy proxy = model.getProxy(); + Bookmark bookmark = proxy.restore(Bookmark.class, bookmarkId); + if (bookmark != null) { + int click = bookmark.getClick(); + ++click; + bookmark.setClick(click); + proxy.store(bookmark); + String url = bookmark.getLink(); + response.sendRedirect(url); + } + } + } + protected void actionOrderAsc(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { String type = request.getParameter("type"); @@ -161,6 +183,11 @@ eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(). addSortAscending(Bookmark.FQ_FIELD_DATE); bookList = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); + } else if(type.equals("click")) { + Criteria criteria = Search.query(). + eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(). + addSortAscending(Bookmark.FQ_FIELD_CLICK); + bookList = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); } if (bookList != null) { bookmarkActions.setBookmarks(bookList); @@ -186,6 +213,11 @@ eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(). addSortDescending(Bookmark.FQ_FIELD_DATE); bookList = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); + } else if(type.equals("click")) { + Criteria criteria = Search.query(). + eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(). + addSortDescending(Bookmark.FQ_FIELD_CLICK); + bookList = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); } if (bookList != null) { bookmarkActions.setBookmarks(bookList); Modified: trunk/src/main/java/org/chorem/bow/Model.java =================================================================== --- trunk/src/main/java/org/chorem/bow/Model.java 2010-05-12 15:38:56 UTC (rev 23) +++ trunk/src/main/java/org/chorem/bow/Model.java 2010-05-14 09:52:06 UTC (rev 24) @@ -24,7 +24,7 @@ protected WikittyProxy proxy = null; Model() { - System.setProperty("solr.data.dir", System.getProperty("user.home") + "/databases/bow/solr"); + System.setProperty("solr.data.dir", System.getProperty("user.home") + "/.bow/solr"); this.init(); } Modified: trunk/src/main/resources/wikitty-jdbc-config.properties =================================================================== --- trunk/src/main/resources/wikitty-jdbc-config.properties 2010-05-12 15:38:56 UTC (rev 23) +++ trunk/src/main/resources/wikitty-jdbc-config.properties 2010-05-14 09:52:06 UTC (rev 24) @@ -1,5 +1,5 @@ #Connection parameters jdbc.con.driver=org.h2.Driver -jdbc.con.host=jdbc:h2:file:/home/bbrossaud/projets/bow/solr +jdbc.con.host=jdbc:h2:file:~/.bow/localdb/localdb jdbc.con.userName=sa jdbc.con.password= Modified: trunk/src/main/webapp/search.jsp =================================================================== --- trunk/src/main/webapp/search.jsp 2010-05-12 15:38:56 UTC (rev 23) +++ trunk/src/main/webapp/search.jsp 2010-05-14 09:52:06 UTC (rev 24) @@ -1,6 +1,8 @@ + +<%@ page import="org.chorem.bow.Bookmark" %> <%@ page import="org.chorem.bow.BookmarkActions" %> -<%@ page import="org.chorem.bow.Bookmark" %> <%@ page import="java.util.HashMap" %> +<%@ page import="java.text.SimpleDateFormat" %> <%@ page import="java.util.Iterator" %> <%@ page import="java.util.Map" %> <%@ page import="java.util.Set" %> @@ -49,7 +51,7 @@ <th>Remove</th> <th> Date - <a style="text-decoration:none" href="bow?action=orderAsc&type=date"> + <a style="text-decoration:none" href="bow?action=orderAsc&type=date" > <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" /> </a> <a style="text-decoration:none" href="bow?action=orderDesc&type=date"> @@ -67,8 +69,18 @@ </th> <th>Tags</th> <th>Edit</th> + <th> + Click + <a style="text-decoration:none" href="bow?action=orderAsc&type=click"> + <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" /> + </a> + <a style="text-decoration:none" href="bow?action=orderDesc&type=click"> + <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" /> + </a> + </th> </tr> <% + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); for (Bookmark bookmark : bookmarkList) { %> <tr> @@ -78,10 +90,10 @@ </a> </td> <td> - <%=bookmark.getDate()%> + <%=sdf.format(bookmark.getDate())%> </td> <td> - <a href="<%=bookmark.getLink()%>"><%=bookmark.getDescription()%></a> + <a href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a> </td> <td> <% @@ -100,12 +112,15 @@ <td> <form style="display: inline" method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>"> <input type="text" name="nameAndTags" size="50" value="<%=bookmark.getDescription()%>|tag1 tag2 tag3" /> - <input type="image" src="img/edit.png" value="edit" /> + <input type="image" src="img/edit.png" title="Edit"/> </form> </td> <% } %> + <td> + <%=bookmark.getClick()%> + </td> <% } %> Modified: trunk/src/main/xmi/bow.zargo =================================================================== (Binary files differ)