- Bow-commits - mailman.cloud.codelutin.com

r33 - in trunk/src/main: java/org/chorem/bow webapp
by bbrossaud＠users.chorem.org May 25, 2010

May 25, 2010

Author: bbrossaud Date: 2010-05-25 15:16:43 +0200 (Tue, 25 May 2010) New Revision: 33 Url: http://chorem.org/repositories/revision/bow/33 Log: addition the last bookmarks and the most clickable bookmarks to the home page Added: trunk/src/main/webapp/login.jsp Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/webapp/home.jsp trunk/src/main/webapp/search.jsp Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-05-21 10:13:25 UTC (rev 32) +++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-05-25 13:16:43 UTC (rev 33) @@ -21,6 +21,7 @@ public class BookmarkActions { protected List<Bookmark> bookmarks = new ArrayList<Bookmark>(); // bookmarks which contain the search tags + protected List<Bookmark> lastBookmarks = new ArrayList<Bookmark>(); protected Map<String, Integer> tagCloud = new HashMap<String, Integer>(); // associate a tag with its frequency // among all bookmarks protected List<String> tagsSearch = new ArrayList<String>(); // contains the tags taped in the search field @@ -42,8 +43,10 @@ int nameIndex = nameAndTags.indexOf('|'); // get the index name of the website if (nameIndex > 0) { String name = nameAndTags.substring(0, nameIndex); // get the website name + if (!name.isEmpty()) { name = name.trim(); bookmark.setDescription(name); // set the description (website name) + } } String tags = nameAndTags; @@ -190,6 +193,16 @@ } } + public void emptySearchline() { + List<Bookmark> bookmarkList = new ArrayList<Bookmark>(bookmarks); + for (Bookmark bookmark : bookmarkList) { + Set<String> tags = bookmark.getTags(); + if (tags != null && !tags.isEmpty()) { + bookmarks.remove(bookmark); + } + } + } + public void reset() { bookmarks.clear(); tagCloud.clear(); @@ -203,6 +216,11 @@ bookmarks = newList; } + public void setLastBookmarks(List<Bookmark> bookmarksList) { + List<Bookmark> newList = new ArrayList(bookmarksList); + lastBookmarks = newList; + } + public String getSearchLine() { return StringUtil.join(tagsSearch, " ", true); // return the search line created with the tags } @@ -229,6 +247,10 @@ return bookmarks; } + public List<Bookmark> getLastBookmarks() { + return lastBookmarks; + } + public int getTmin() { return tmin; } Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-21 10:13:25 UTC (rev 32) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-25 13:16:43 UTC (rev 33) @@ -76,6 +76,12 @@ log.debug("Going to actionLogin"); } this.actionLogout(request, response, session); + } else if (action.equals("home") && user != null) { + if (log.isDebugEnabled()) { + log.debug("Going to actionHome.jsp"); + } + this.actionHome(request, user); + request.getRequestDispatcher("home.jsp").forward(request, response); } else if (action.equals("addUrl") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionAddUrl"); @@ -85,7 +91,7 @@ if (log.isDebugEnabled()) { log.debug("Going to actionSearch"); } - this.actionSearch(request, response, user); + this.actionSearch(request, user); request.getRequestDispatcher("search.jsp").forward(request, response); } else if (action.equals("generateToken") && user != null) { if (log.isDebugEnabled()) { @@ -162,13 +168,13 @@ if (log.isDebugEnabled()) { log.debug("Going to home"); } - request.getRequestDispatcher("home.jsp").forward(request, response); + request.getRequestDispatcher("login.jsp").forward(request, response); } } else { if (log.isDebugEnabled()) { log.debug("Going to home"); } - request.getRequestDispatcher("home.jsp").forward(request, response); + request.getRequestDispatcher("login.jsp").forward(request, response); } request.setAttribute("errorMessage", error); } catch (Exception eee) { @@ -183,7 +189,8 @@ Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(). addSortDescending(Bookmark.FQ_FIELD_CLICK); List<Bookmark> bookList = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); - createBookmarkActions(request, bookList); + BookmarkActions bookmarkActions = createBookmarkActions(request, bookList); + request.setAttribute("bookmarkActions", bookmarkActions); request.setAttribute("token", token); } @@ -212,7 +219,7 @@ protected void actionLogout(HttpServletRequest request, HttpServletResponse response, HttpSession session) throws IOException, ServletException { session.invalidate(); - request.getRequestDispatcher("home.jsp").forward(request, response); + request.getRequestDispatcher("login.jsp").forward(request, response); } protected void actionAddClick(HttpServletRequest request, HttpServletResponse response) @@ -254,7 +261,8 @@ addSortAscending(Bookmark.FQ_FIELD_CLICK); bookList = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); } - createBookmarkActions(request, bookList); + BookmarkActions bookmarkActions = createBookmarkActions(request, bookList); + request.setAttribute("bookmarkActions", bookmarkActions); } } @@ -280,7 +288,8 @@ addSortDescending(Bookmark.FQ_FIELD_CLICK); bookList = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); } - createBookmarkActions(request, bookList); + BookmarkActions bookmarkActions = createBookmarkActions(request, bookList); + request.setAttribute("bookmarkActions", bookmarkActions); } } @@ -359,9 +368,7 @@ tokenActions.setPermanentToken(""); } } - session.setAttribute("tokenActions", tokenActions); - String searchLine = request.getParameter("searchLine"); - response.sendRedirect("bow?action=search&searchLine=" + searchLine); + response.sendRedirect("bow?action=home"); } /* @param request servlet request @@ -371,8 +378,7 @@ protected void actionAddUrl(HttpServletRequest request, HttpServletResponse response, User user) throws IOException, ServletException { addUrl(request, user); - String searchLine = request.getParameter("searchLine"); - response.sendRedirect("bow?action=search&searchLine=" + searchLine); + response.sendRedirect("bow?action=home"); } protected void addUrl(HttpServletRequest request, User user) { @@ -432,16 +438,22 @@ * @param response servlet response * @throws ServletException if a servlet error occurs */ - protected void actionSearch(HttpServletRequest request, HttpServletResponse response, User user) + protected void actionSearch(HttpServletRequest request, User user) throws IOException, ServletException { WikittyProxy proxy = model.getProxy(); Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(). addSortDescending(Bookmark.FQ_FIELD_CLICK); List<Bookmark> bookList = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); // select all bookmarks by user - createBookmarkActions(request, bookList); + BookmarkActions bookmarkActions = createBookmarkActions(request, bookList); + String searchLine = bookmarkActions.getSearchLine(); + if (searchLine.isEmpty()) { + bookmarkActions.emptySearchline(); + } + request.setAttribute("bookmarkActions", bookmarkActions); + } - protected void createBookmarkActions(HttpServletRequest request, List<Bookmark> bookList) { + protected BookmarkActions createBookmarkActions(HttpServletRequest request, List<Bookmark> bookList) { String words = request.getParameter("searchLine"); // retrieve informations taping in the search field BookmarkActions bookmarkActions = new BookmarkActions(); if (bookList != null) { @@ -453,7 +465,7 @@ bookmarkActions.addTag(tag); } bookmarkActions.createTagsCloud(); // create the tags cloud with the new informations - request.setAttribute("bookmarkActions", bookmarkActions); + return bookmarkActions; } /* @param request servlet request @@ -477,8 +489,8 @@ } else { session.setAttribute("user", login); initializeToken(session, login); - actionSearch(request, response, login); - request.getRequestDispatcher("search.jsp").forward(request, response); + actionHome(request, login); + request.getRequestDispatcher("home.jsp").forward(request, response); } } } @@ -496,12 +508,12 @@ if (login != null) { session.setAttribute("user", login); initializeToken(session, login); - actionSearch(request, response, login); - request.getRequestDispatcher("search.jsp").forward(request, response); + actionHome(request, login); + request.getRequestDispatcher("home.jsp").forward(request, response); } else { error = "Unknow email or incorrect password"; - request.getRequestDispatcher("home.jsp").forward(request, response); + request.getRequestDispatcher("login.jsp").forward(request, response); } } @@ -531,7 +543,6 @@ * @return User the user exists */ protected User checkLogin(String email, String password) { - if (email != null && password != null) { if (!email.isEmpty() && !password.isEmpty()) { WikittyProxy proxy = model.getProxy(); @@ -563,4 +574,24 @@ error = "Email and password must be correctly filled"; return true; } + + private void actionHome(HttpServletRequest request, User user) { + WikittyProxy proxy = model.getProxy(); + Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(). + addSortDescending(Bookmark.FQ_FIELD_CLICK); + List<Bookmark> bookList = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); // select all bookmarks by user + criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(). + addSortDescending(Bookmark.FQ_FIELD_DATE).setEndIndex(10); + List<Bookmark> lastBookmarks = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); + BookmarkActions bookmarkActions = createBookmarkActions(request, bookList); + bookList = bookmarkActions.getBookmarks(); + if (bookList.size() > 10) { + bookList = bookmarkActions.getBookmarks().subList(0, 10); + bookmarkActions.setBookmarks(bookList); + } + if (lastBookmarks != null) { + bookmarkActions.setLastBookmarks(lastBookmarks); + } + request.setAttribute("bookmarkActions", bookmarkActions); + } } Modified: trunk/src/main/webapp/home.jsp =================================================================== --- trunk/src/main/webapp/home.jsp 2010-05-21 10:13:25 UTC (rev 32) +++ trunk/src/main/webapp/home.jsp 2010-05-25 13:16:43 UTC (rev 33) @@ -1,20 +1,190 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@page import="org.chorem.bow.Bookmark" %> +<%@page import="org.chorem.bow.BookmarkActions" %> +<%@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" %> +<%@page import="java.util.ArrayList" %> +<%@page import="java.util.List" %> +<%@page import="org.chorem.bow.TokenActions" %> + <% - String error = (String) request.getAttribute("errorMessage"); + TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); + String temporaryToken = tokenActions.getTemporaryToken(); + String permanentToken = tokenActions.getPermanentToken(); + BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions"); + String searchLine = ""; + if (bookmarkActions != null) { + searchLine = bookmarkActions.getSearchLine(); + } + String url = request.getRequestURL().toString(); + int index = url.indexOf("home.jsp"); + url = url.substring(0, index); %> <html> <link rel="stylesheet" type="text/css" href="./css/styles.css" /> + <link rel="search" type="application/opensearchdescription+xml" title="bowTemporarySearchEngine" href="<%=url%>bow?action=temporaryXml" /> + <link rel="search" type="application/opensearchdescription+xml" title="bowPermanentSearchEngine" href="<%=url%>bow?action=permanentXml" /> <body> - <h1 class="login">Login</h1> - <form method="POST" action="bow?action=login"> - email <input type="text" name="email" size="20"><br /> - password <input type=password name="password" size="20"><br /> - <input type="submit" value="login"> - </form> - <%if (error != null) {%> - <font color="red"><%=error%></font> - <%}%> - <a href="bow?action=registration">register</a> + <div id="table"> + <h1 class="result">Home</h1> + <% + if (bookmarkActions != null) { + List<Bookmark> bookmarkList = bookmarkActions.getBookmarks(); + if (!bookmarkList.isEmpty()) { + %> + <h2 class="result">The most using bookmarks</h2> + <table class="result"> + <tr class="result"> + <th class="result date"> + Date + </th> + <th class="result name"> + Name + </th> + <th class ="result tags"> + Tags + </th> + <th class=" result click"> + Click + </th> + </tr> + <% + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + for (Bookmark bookmark : bookmarkList) { + %> + <tr class="result"> + <td class="result"> + <%=sdf.format(bookmark.getDate())%> + </td> + <td class="result"> + <a href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a> + </td> + <td class="result" style="text-align: left"> + <% + Set<String> tagList = bookmark.getTags(); + if (tagList != null && !tagList.isEmpty()) { + for (String tag : tagList) { + %> + <div> + <%=tag%> + </div> + <% + } + } + %> + </td> + <td class="result"> + <%=bookmark.getClick()%> + </td> + </tr> + <% + } + %> + </table> + <% + List<Bookmark> lastBookmarks = bookmarkActions.getLastBookmarks(); + if (!lastBookmarks.isEmpty()) { + %> + <h2 class="result">The last addition bookmarks</h2> + <table class="result"> + <tr class="result"> + <th class="result date"> + Date + </th> + <th class="result name"> + Name + </th> + <th class ="result tags"> + Tags + </th> + <th class=" result click"> + Click + </th> + </tr> + <% + for (Bookmark bookmark : lastBookmarks) { + %> + <tr class="result"> + <td class="result"> + <%=sdf.format(bookmark.getDate())%> + </td> + <td class="result"> + <a href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a> + </td> + <td class="result" style="text-align: left"> + <% + Set<String> tagList = bookmark.getTags(); + if (tagList != null && !tagList.isEmpty()) { + for (String tag : tagList) { + %> + <div> + <%=tag%> + </div> + <% + } + } + %> + </td> + <td class="result"> + <%=bookmark.getClick()%> + </td> + </tr> + <% + } + %> + </table> + <% + } + } else { + %> + <h2 class="result">No Bookmarks</h2> + <% } + } + %> + </div> + <div id="menu"> + <div class="menu"> + <ul id="meta"> + <li><a href="bow?action=logout">Logout</a></li> + <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Temporary token</a></li> + <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Current permanent token</a></li> + <li><a href="bow?action=generateToken&searchLine=<%=searchLine%>">Regenerate permanent token</a></li> + </ul> + </div> + <div class="menu"> + <form method="POST" action="bow?action=addUrl"> + URL<br /> + <input type="text" name="url" size="20" value="URL" /><br /> + Name and Tags<br /> + <input type="text" name="nameAndTags" size="20" value="name|tag1 tag2..." /><br /> + <input type="submit" value="add" /> + </form> + </div> + + <div class="menu"> + <div class="tagCloud"> + <% if (bookmarkActions != null) { + Map<String, Integer> tagsCloud = bookmarkActions.getTagsCloud(); + Set<String> tags = tagsCloud.keySet(); + for (String tag : tags) { + int value = tagsCloud.get(tag); + int font = bookmarkActions.getFont(value); + %> + <a href="bow?action=search&addTag=<%=tag%>&searchLine=<%=searchLine%>" title="<%=value%> results" class="tag" style="font-size: <%=font%>px;"><%=tag%></a> + <% + } + } + %> + <form method="POST" action="bow?action=search" style="text-align: center;margin-left: 20px;"> + <input style="float: left" type="text" name="searchLine" size="20" value="<%=searchLine%>" /> + <input style="float: left;" type="submit" value="Find" /> + </form> + </div> + </div> + </div> </body> </html> \ No newline at end of file Copied: trunk/src/main/webapp/login.jsp (from rev 32, trunk/src/main/webapp/home.jsp) =================================================================== --- trunk/src/main/webapp/login.jsp (rev 0) +++ trunk/src/main/webapp/login.jsp 2010-05-25 13:16:43 UTC (rev 33) @@ -0,0 +1,20 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<% + String error = (String) request.getAttribute("errorMessage"); +%> + +<html> + <link rel="stylesheet" type="text/css" href="./css/styles.css" /> + <body> + <h1 class="login">Login</h1> + <form method="POST" action="bow?action=login"> + email <input type="text" name="email" size="20"><br /> + password <input type=password name="password" size="20"><br /> + <input type="submit" value="login"> + </form> + <%if (error != null) {%> + <font color="red"><%=error%></font> + <%}%> + <a href="bow?action=registration">register</a> + </body> +</html> \ No newline at end of file Modified: trunk/src/main/webapp/search.jsp =================================================================== --- trunk/src/main/webapp/search.jsp 2010-05-21 10:13:25 UTC (rev 32) +++ trunk/src/main/webapp/search.jsp 2010-05-25 13:16:43 UTC (rev 33) @@ -128,9 +128,9 @@ <div class="menu"> <ul id="meta"> <li><a href="bow?action=logout">Logout</a></li> + <li><a href="bow?action=home">Home</a></li> <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Temporary token</a></li> <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Current permanent token</a></li> - <li><a href="bow?action=generateToken&searchLine=<%=searchLine%>">Regenerate permanent token</a></li> </ul> </div> <div class="menu">

1 0

r32 - in trunk/src/main: java/org/chorem/bow webapp webapp/css
by bbrossaud＠users.chorem.org May 21, 2010

May 21, 2010

Author: bbrossaud Date: 2010-05-21 12:13:25 +0200 (Fri, 21 May 2010) New Revision: 32 Url: http://chorem.org/repositories/revision/bow/32 Log: addition 'http://' to the bookmark adress if it doesn't exist Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java trunk/src/main/webapp/css/styles.css trunk/src/main/webapp/home.jsp trunk/src/main/webapp/openSearchResult.jsp trunk/src/main/webapp/register.jsp trunk/src/main/webapp/search.jsp Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-05-21 08:09:47 UTC (rev 31) +++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-05-21 10:13:25 UTC (rev 32) @@ -61,6 +61,9 @@ if (url != null && !url.isEmpty()) { String link = url.trim(); + if (!link.contains("http://")) { + link = "http://" + link; + } bookmark.setLink(link); } bookmark.setClick(0); Modified: trunk/src/main/webapp/css/styles.css =================================================================== --- trunk/src/main/webapp/css/styles.css 2010-05-21 08:09:47 UTC (rev 31) +++ trunk/src/main/webapp/css/styles.css 2010-05-21 10:13:25 UTC (rev 32) @@ -89,6 +89,41 @@ width: 80%; } +h1.result { + font-family:monospace; + color:#FF3F42; + font-size:1.6em; + font-weight:normal; + line-height:20px; + margin-bottom:20px; + margin-left: 5px; + margin-right: 5px; + text-align: center; + background-color: #C5E3F7; + border-radius: 30px; + -webkit-border-radius: 30px; + -moz-border-radius: 30px; + -opera-border-radius:30px; + +} + +h1.login { + font-family:monospace; + color:#FF3F42; + border-bottom: 3px solid #C5E3F7; + margin-bottom: 10px; +} + +h2.result { + font-family:monospace; + color:#FF3F42; + font-size:1em; + font-weight:normal; + line-height:20px; + margin-top:50px; + text-align: center; +} + div.menu{ margin: 10px; border-bottom: 1px solid #ccc; @@ -105,22 +140,13 @@ a { font-family:monospace; - /*background-color:#EFF6FF;*/ color:#0078C8; padding: 0; margin: 0; - /*text-decoration:none;*/ - /*border:2px solid;*/ - /*pour avoir un effet "outset" avec IE :*/ - /*border-color:#75CEFF #6495ed #6495ed #75CEFF;*/ - } a:hover { color: #0095f8; - /*background-color:#D3D3D3;*/ - /*border-color:#696969 #DCDCDC #DCDCDC #696969;*/ - } a.tag { Modified: trunk/src/main/webapp/home.jsp =================================================================== --- trunk/src/main/webapp/home.jsp 2010-05-21 08:09:47 UTC (rev 31) +++ trunk/src/main/webapp/home.jsp 2010-05-21 10:13:25 UTC (rev 32) @@ -4,8 +4,9 @@ %> <html> + <link rel="stylesheet" type="text/css" href="./css/styles.css" /> <body> - <h1>Login</h1> + <h1 class="login">Login</h1> <form method="POST" action="bow?action=login"> email <input type="text" name="email" size="20"><br /> password <input type=password name="password" size="20"><br /> @@ -14,6 +15,6 @@ <%if (error != null) {%> <font color="red"><%=error%></font> <%}%> - <br/><a href="bow?action=registration">register</a> + <a href="bow?action=registration">register</a> </body> </html> \ No newline at end of file Modified: trunk/src/main/webapp/openSearchResult.jsp =================================================================== --- trunk/src/main/webapp/openSearchResult.jsp 2010-05-21 08:09:47 UTC (rev 31) +++ trunk/src/main/webapp/openSearchResult.jsp 2010-05-21 10:13:25 UTC (rev 32) @@ -22,14 +22,14 @@ %> <html> + <link rel="stylesheet" type="text/css" href="./css/styles.css" /> <body> - <h1>Result</h1> + <h1 class="result">Results</h1> <% if (bookmarkActions != null) { List<Bookmark> bookmarkList = bookmarkActions.getBookmarks(); if (!bookmarkList.isEmpty()) { %> - <br/><br/>Results:<br/> <table class="result"> <tr class="result"> <th class="result"> @@ -62,8 +62,8 @@ </th> </tr> <% - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - for (Bookmark bookmark : bookmarkList) { + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + for (Bookmark bookmark : bookmarkList) { %> <tr class="result"> <td class="result"> @@ -89,14 +89,15 @@ <td class="result"> <%=bookmark.getClick()%> </td> - <% - } - %> + </tr> + <% + } + %> </table> <% - } else { + } else { %> - <br/><br/>No Bookmarks found<br/><br/> + <h2 class="result">No Bookmarks found</h2> <% } } %> Modified: trunk/src/main/webapp/register.jsp =================================================================== --- trunk/src/main/webapp/register.jsp 2010-05-21 08:09:47 UTC (rev 31) +++ trunk/src/main/webapp/register.jsp 2010-05-21 10:13:25 UTC (rev 32) @@ -1,8 +1,9 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> <%String error = (String) request.getAttribute("errorMessage");%> <html> + <link rel="stylesheet" type="text/css" href="./css/styles.css" /> <body> - <h1>Register</h1> + <h1 class="login">Register</h1> <form method="POST" action="bow?action=register"> email <input type="text" name="email" size="20"><br /> @@ -12,6 +13,6 @@ <%if (error != null && error.isEmpty() == false) {%> <br/><font color="red"><%=error%></font> <%}%> - <br/><a href="bow?action=home">Return to the login page</a> + <a href="bow?action=home">Return to the login page</a> </body> </html> \ No newline at end of file Modified: trunk/src/main/webapp/search.jsp =================================================================== --- trunk/src/main/webapp/search.jsp 2010-05-21 08:09:47 UTC (rev 31) +++ trunk/src/main/webapp/search.jsp 2010-05-21 10:13:25 UTC (rev 32) @@ -30,12 +30,12 @@ <link rel="search" type="application/opensearchdescription+xml" title="bowPermanentSearchEngine" href="<%=url%>bow?action=permanentXml" /> <body> <div id="table"> + <h1 class="result">My Bookmarks</h1> <% if (bookmarkActions != null) { List<Bookmark> bookmarkList = bookmarkActions.getBookmarks(); if (!bookmarkList.isEmpty()) { %> - Results:<br/> <table class="result"> <tr class="result"> <th class="result remove">Remove</th> @@ -70,8 +70,8 @@ </th> </tr> <% - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - for (Bookmark bookmark : bookmarkList) { + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + for (Bookmark bookmark : bookmarkList) { %> <tr class="result"> <td class="result"> @@ -111,16 +111,17 @@ <td class="result"> <%=bookmark.getClick()%> </td> - <% + </tr> + <% } - %> + %> </table> <% - } - } else { + } else { %> - <br/><br/>No Bookmarks<br/><br/> + <h2 class="result">No Bookmarks</h2> <% } + } %> </div> <div id="menu"> @@ -135,9 +136,9 @@ <div class="menu"> <form method="POST" action="bow?action=addUrl"> URL<br /> - <input onclick="this.value=''" type="text" name="url" size="20" value="URL" /><br /> + <input type="text" name="url" size="20" value="URL" /><br /> Name and Tags<br /> - <input onclick="this.value='|'" type="text" name="nameAndTags" size="20" value="name|tag1 tag2..." /><br /> + <input type="text" name="nameAndTags" size="20" value="name|tag1 tag2..." /><br /> <input type="submit" value="add" /> </form> </div>

1 0

r31 - in trunk/src/main: java/org/chorem/bow webapp/css
by bbrossaud＠users.chorem.org May 21, 2010

May 21, 2010

Author: bbrossaud Date: 2010-05-21 10:09:47 +0200 (Fri, 21 May 2010) New Revision: 31 Url: http://chorem.org/repositories/revision/bow/31 Log: resolved problems with the cirtical actions in the search jsp page Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/webapp/css/styles.css Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-20 15:11:58 UTC (rev 30) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-21 08:09:47 UTC (rev 31) @@ -81,39 +81,32 @@ log.debug("Going to actionAddUrl"); } this.actionAddUrl(request, response, user); - request.getRequestDispatcher("search.jsp").forward(request, response); - } else if (action.equals("search") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionSearch"); } this.actionSearch(request, response, user); request.getRequestDispatcher("search.jsp").forward(request, response); - } else if (action.equals("generateToken") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionGenerateToken"); } this.actionGenerateToken(request, response, user, session); - request.getRequestDispatcher("search.jsp").forward(request, response); } else if (action.equals("deleteTag") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionDeleteTag"); } this.actionDeleteTag(request, response, user); - request.getRequestDispatcher("search.jsp").forward(request, response); } else if (action.equals("removeBookmark") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionRemoveBookmark"); } this.actionRemoveBookmark(request, response, user); - request.getRequestDispatcher("search.jsp").forward(request, response); } else if (action.equals("editBookmark") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionEditBookmark"); } this.actionEditBookmark(request, response, user); - request.getRequestDispatcher("search.jsp").forward(request, response); } else if (action.equals("orderAsc") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionOrderAsc"); @@ -302,12 +295,11 @@ if (bookmark != null) { BookmarkActions.updateBookmark(bookmark, nameAndTags); proxy.store(bookmark); - Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(); - List<Bookmark> bookList = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); // select all bookmarks by user - createBookmarkActions(request, bookList); } } } + String searchLine = request.getParameter("searchLine"); + response.sendRedirect("bow?action=search&searchLine=" + searchLine); } protected void actionRemoveBookmark(HttpServletRequest request, HttpServletResponse response, User user) @@ -316,12 +308,9 @@ if (bookmarkId != null && !bookmarkId.isEmpty()) { WikittyProxy proxy = model.getProxy(); proxy.delete(bookmarkId); - Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(); - List<Bookmark> bookList = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); // select all bookmarks by user - if (bookList != null) { - createBookmarkActions(request, bookList); - } } + String searchLine = request.getParameter("searchLine"); + response.sendRedirect("bow?action=search&searchLine=" + searchLine); } protected void actionDeleteTag(HttpServletRequest request, HttpServletResponse response, User user) @@ -335,12 +324,11 @@ if (bookmark != null) { bookmark.removeTags(tag); proxy.store(bookmark); - Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(); - List<Bookmark> bookList = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); // select all bookmarks by user - createBookmarkActions(request, bookList); } } } + String searchLine = request.getParameter("searchLine"); + response.sendRedirect("bow?action=search&searchLine=" + searchLine); } @@ -372,7 +360,8 @@ } } session.setAttribute("tokenActions", tokenActions); - actionSearch(request, response, user); + String searchLine = request.getParameter("searchLine"); + response.sendRedirect("bow?action=search&searchLine=" + searchLine); } /* @param request servlet request @@ -382,7 +371,8 @@ protected void actionAddUrl(HttpServletRequest request, HttpServletResponse response, User user) throws IOException, ServletException { addUrl(request, user); - actionSearch(request, response, user); + String searchLine = request.getParameter("searchLine"); + response.sendRedirect("bow?action=search&searchLine=" + searchLine); } protected void addUrl(HttpServletRequest request, User user) { Modified: trunk/src/main/webapp/css/styles.css =================================================================== --- trunk/src/main/webapp/css/styles.css 2010-05-20 15:11:58 UTC (rev 30) +++ trunk/src/main/webapp/css/styles.css 2010-05-21 08:09:47 UTC (rev 31) @@ -84,8 +84,6 @@ #table { margin: 0; padding: 0; - background-color:#eaf3f9; - display: inline-block; float: left; position: relative; width: 80%;

1 0

r30 - in trunk/src/main/webapp: . css
by bbrossaud＠users.chorem.org May 20, 2010

May 20, 2010

Author: bbrossaud Date: 2010-05-20 17:11:58 +0200 (Thu, 20 May 2010) New Revision: 30 Url: http://chorem.org/repositories/revision/bow/30 Log: addition last search design Modified: trunk/src/main/webapp/css/styles.css trunk/src/main/webapp/search.jsp Modified: trunk/src/main/webapp/css/styles.css =================================================================== --- trunk/src/main/webapp/css/styles.css 2010-05-20 09:38:01 UTC (rev 29) +++ trunk/src/main/webapp/css/styles.css 2010-05-20 15:11:58 UTC (rev 30) @@ -1,7 +1,7 @@ table.result { border:3px solid #6495ed; border-collapse:collapse; - width:90%; + width:750px; margin:auto; } table.actions { @@ -15,11 +15,34 @@ border:1px dotted #6495ed; padding:5px; background-color:#EFF6FF; - width:15%; } + +.remove { + width:5%; +} + +.edit { + width:30%; +} + +.name { + width:20%; +} + +.click { + width:14%; +} + +.date { + width:12%; +} + +.tags { + width:19%; +} + td.result { - font-family:sans-serif; - font-size:80%; + font-family:monospace; border:1px solid #6495ed; padding:5px; text-align:center; @@ -33,7 +56,7 @@ } div.tagCloud { - background: #EEEEEE none repeat scroll 0 0; + background: #C5E3F7 none repeat scroll 0 0; max-width: 300px; min-width: 200px; padding-bottom: 5px; @@ -49,37 +72,62 @@ } #menu { - list-style-type: none; margin: 0; padding: 0; - text-align: center; + float: left; + background-color:#eaf3f9; + display: inline-block; + position: relative; + width: 20%; } -#menu li { - display: inline; +#table { + margin: 0; + padding: 0; + background-color:#eaf3f9; + display: inline-block; + float: left; + position: relative; + width: 80%; } -#menu a { +div.menu{ + margin: 10px; + border-bottom: 1px solid #ccc; +} + +#meta{ + list-style-type: none; + padding-left: 0px; +} + +#meta li { + margin-bottom: 5px; +} + +a { font-family:monospace; - background-color:#EFF6FF; - color:black; - text-decoration:none; - padding:2px; - border:2px solid; + /*background-color:#EFF6FF;*/ + color:#0078C8; + padding: 0; + margin: 0; + /*text-decoration:none;*/ + /*border:2px solid;*/ /*pour avoir un effet "outset" avec IE :*/ - border-color:#75CEFF #6495ed #6495ed #75CEFF; + /*border-color:#75CEFF #6495ed #6495ed #75CEFF;*/ } -a.menu:hover { - background-color:#D3D3D3; - border-color:#696969 #DCDCDC #DCDCDC #696969; +a:hover { + color: #0095f8; + /*background-color:#D3D3D3;*/ + /*border-color:#696969 #DCDCDC #DCDCDC #696969;*/ } a.tag { font-family:monospace; - color: #EF5252; + color: #FF3F42; margin-left: 2px; margin-right: 2px; border-radius: 30px; Modified: trunk/src/main/webapp/search.jsp =================================================================== --- trunk/src/main/webapp/search.jsp 2010-05-20 09:38:01 UTC (rev 29) +++ trunk/src/main/webapp/search.jsp 2010-05-20 15:11:58 UTC (rev 30) @@ -29,136 +29,139 @@ <link rel="search" type="application/opensearchdescription+xml" title="bowTemporarySearchEngine" href="<%=url%>bow?action=temporaryXml" /> <link rel="search" type="application/opensearchdescription+xml" title="bowPermanentSearchEngine" href="<%=url%>bow?action=permanentXml" /> <body> - <ul id="menu"> - <li><a href="bow?action=logout">Logout</a></li> - <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Temporary token</a></li> - <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Current permanent token</a></li> - <li><a href="bow?action=generateToken&searchLine=<%=searchLine%>">Regenerate permanent token</a></li> - </ul> - <br/><br/> - - <table class="actions"> - <tr> - <td> - <div class="tagCloud"> - <% if (bookmarkActions != null) { - Map<String, Integer> tagsCloud = bookmarkActions.getTagsCloud(); - Set<String> tags = tagsCloud.keySet(); - for (String tag : tags) { - int value = tagsCloud.get(tag); - int font = bookmarkActions.getFont(value); + <div id="table"> + <% + if (bookmarkActions != null) { + List<Bookmark> bookmarkList = bookmarkActions.getBookmarks(); + if (!bookmarkList.isEmpty()) { + %> + Results:<br/> + <table class="result"> + <tr class="result"> + <th class="result remove">Remove</th> + <th class="result date"> + Date + <a style="text-decoration:none" href="bow?action=orderAsc&type=date&searchLine=<%=searchLine%>" > + <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&searchLine=<%=searchLine%>"> + <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" /> + </a> + </th> + <th class="result name"> + Name + <a style="text-decoration:none" href="bow?action=orderAsc&type=name&searchLine=<%=searchLine%>"> + <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" /> + </a> + <a style="text-decoration:none" href="bow?action=orderDesc&type=name&searchLine=<%=searchLine%>"> + <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" /> + </a> + </th> + <th class ="result tags">Tags</th> + <th class="result edit">Edit</th> + <th class=" result click"> + Click + <a style="text-decoration:none" href="bow?action=orderAsc&type=click&searchLine=<%=searchLine%>"> + <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&searchLine=<%=searchLine%>"> + <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 class="result"> + <td class="result"> + <a style="border:none;" href="bow?action=removeBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>"> + <IMG style="border:none;" SRC="img/remove.png" ALT="Remove bookmark" TITLE="Remove" /> + </a> + </td> + <td class="result"> + <%=sdf.format(bookmark.getDate())%> + </td> + <td class="result"> + <a href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a> + </td> + <td class="result" style="text-align: left"> + <% + Set<String> tagList = bookmark.getTags(); + if (tagList != null && !tagList.isEmpty()) { + for (String tag : tagList) { %> - <a href="bow?action=search&addTag=<%=tag%>&searchLine=<%=searchLine%>" title="<%=value%> results" class="tag" style="font-size: <%=font%>px;"><%=tag%></a> + <div> + <a style="text-decoration:none" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>&searchLine=<%=searchLine%>"> + <IMG style="border:none" SRC="img/delete.png" ALT="Delete tag" TITLE="Delete" /> + </a> + <%=tag%> + </div> <% - } + } + } %> - </div> - <form method="POST" action="bow?action=search" style="text-align: left;margin-left: 20px;"> - <input style="float: left" type="text" name="searchLine" size="20" value="<%=searchLine%>" /> - <input style="float: left;" type="submit" value="Find" /> - </form> - </td> - <td> - <div style="float: right"> - <form method="POST" action="bow?action=addUrl"> - URL <input onclick="this.value=''" type="text" name="url" size="20" value="URL" /><br /> - Name and Tags <input onclick="this.value='|'" type="text" name="nameAndTags" size="20" value="name|tag1 tag2..." /><br /> - <input type="submit" value="add" /> + </td> + <td class="result"> + <form method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>"> + <input type="text" name="nameAndTags" size="32" value="<%=bookmark.getDescription()%>|tag1 tag2 tag3" /> + <input type="image" src="img/edit.png" title="Edit"/> </form> - </div> - </td> - </tr> - </table> - <% - List<Bookmark> bookmarkList = bookmarkActions.getBookmarks(); - if (!bookmarkList.isEmpty()) { - %> - <br/><br/>Results:<br/> - <table class="result"> - <tr class="result"> - <th class="result">Remove</th> - <th class="result"> - Date - <a style="text-decoration:none" href="bow?action=orderAsc&type=date&searchLine=<%=searchLine%>" > - <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&searchLine=<%=searchLine%>"> - <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" /> - </a> - </th> - <th class="result"> - Name - <a style="text-decoration:none" href="bow?action=orderAsc&type=name&searchLine=<%=searchLine%>"> - <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" /> - </a> - <a style="text-decoration:none" href="bow?action=orderDesc&type=name&searchLine=<%=searchLine%>"> - <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" /> - </a> - </th> - <th class ="result">Tags</th> - <th class="result">Edit</th> - <th class="result"> - Click - <a style="text-decoration:none" href="bow?action=orderAsc&type=click&searchLine=<%=searchLine%>"> - <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&searchLine=<%=searchLine%>"> - <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" /> - </a> - </th> - </tr> + </td> + <td class="result"> + <%=bookmark.getClick()%> + </td> + <% + } + %> + </table> <% - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - for (Bookmark bookmark : bookmarkList) { + } + } else { %> - <tr class="result"> - <td class="result"> - <a style="border:none;" href="bow?action=removeBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>"> - <IMG style="border:none;" SRC="img/remove.png" ALT="Remove bookmark" TITLE="Remove" /> - </a> - </td> - <td class="result"> - <%=sdf.format(bookmark.getDate())%> - </td> - <td class="result"> - <a href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a> - </td> - <td class="result" style="text-align: left"> - <% - Set<String> tagList = bookmark.getTags(); - if (tagList != null && !tagList.isEmpty()) { - for (String tag : tagList) { + <br/><br/>No Bookmarks<br/><br/> + <% } + %> + </div> + <div id="menu"> + <div class="menu"> + <ul id="meta"> + <li><a href="bow?action=logout">Logout</a></li> + <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Temporary token</a></li> + <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Current permanent token</a></li> + <li><a href="bow?action=generateToken&searchLine=<%=searchLine%>">Regenerate permanent token</a></li> + </ul> + </div> + <div class="menu"> + <form method="POST" action="bow?action=addUrl"> + URL<br /> + <input onclick="this.value=''" type="text" name="url" size="20" value="URL" /><br /> + Name and Tags<br /> + <input onclick="this.value='|'" type="text" name="nameAndTags" size="20" value="name|tag1 tag2..." /><br /> + <input type="submit" value="add" /> + </form> + </div> + + <div class="menu"> + <div class="tagCloud"> + <% if (bookmarkActions != null) { + Map<String, Integer> tagsCloud = bookmarkActions.getTagsCloud(); + Set<String> tags = tagsCloud.keySet(); + for (String tag : tags) { + int value = tagsCloud.get(tag); + int font = bookmarkActions.getFont(value); %> - <div> - <a style="text-decoration:none" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>&searchLine=<%=searchLine%>"> - <IMG style="border:none" SRC="img/delete.png" ALT="Delete tag" TITLE="Delete" /> - </a> - <%=tag%> - </div> + <a href="bow?action=search&addTag=<%=tag%>&searchLine=<%=searchLine%>" title="<%=value%> results" class="tag" style="font-size: <%=font%>px;"><%=tag%></a> <% - } - } + } + } %> - </td> - <td class="result"> - <form style="display: inline" method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>"> - <input type="text" name="nameAndTags" size="50" value="<%=bookmark.getDescription()%>|tag1 tag2 tag3" /> - <input type="image" src="img/edit.png" title="Edit"/> + <form method="POST" action="bow?action=search" style="text-align: center;margin-left: 20px;"> + <input style="float: left" type="text" name="searchLine" size="20" value="<%=searchLine%>" /> + <input style="float: left;" type="submit" value="Find" /> </form> - </td> - <td class="result"> - <%=bookmark.getClick()%> - </td> - <% - } - %> - </table> - <% - } else { - %> - <br/><br/>No Bookmarks<br/><br/> - <% } - } - %> + </div> + </div> + </div> </body> </html> \ No newline at end of file

1 0

r29 - in trunk: . src/main/webapp src/main/webapp/css src/main/webapp/img
by bbrossaud＠users.chorem.org May 20, 2010

May 20, 2010

Author: bbrossaud Date: 2010-05-20 11:38:01 +0200 (Thu, 20 May 2010) New Revision: 29 Url: http://chorem.org/repositories/revision/bow/29 Log: addition bow image for opensearch Added: trunk/src/main/webapp/img/bow.gif Modified: trunk/TODO.txt trunk/src/main/webapp/css/styles.css trunk/src/main/webapp/openSearchResult.jsp trunk/src/main/webapp/permanentXml.jsp trunk/src/main/webapp/search.jsp trunk/src/main/webapp/temporaryXml.jsp Modified: trunk/TODO.txt =================================================================== --- trunk/TODO.txt 2010-05-19 15:58:07 UTC (rev 28) +++ trunk/TODO.txt 2010-05-20 09:38:01 UTC (rev 29) @@ -3,10 +3,10 @@ -> edition, suppression bookmark + tag (14 mai) OK -> triage multiple(nbre de clics, date d'ajout, Alpha) (14 mai) OK --> token temporaire (14 mai) --> completion ==> openSearch(xml) - ==> meta(ex:<link rel="search" type="application/opensearchdescription+xml" href="/w/opensearch_desc.php" title="Wikip�dia (fr)" />) +-> token temporaire (14 mai) OK +-> completion ==> openSearch(xml) OK + ==> meta(ex:<link rel="search" type="application/opensearchdescription+xml" href="/w/opensearch_desc.php" title="Wikip�dia (fr)" />) OK -> le && pour le nuage de tag (11 mai) OK --> gestion des sessions (14 mai) --> javascript ==> var script = document.createElement('script');script.src = url;script.type='text/javascript';document.body.appendChild(script); (11 mai) NOK +-> gestion des sessions (14 mai) OK +-> javascript ==> (11 mai) OK -> Mise en forme (28 mai) \ No newline at end of file Modified: trunk/src/main/webapp/css/styles.css =================================================================== --- trunk/src/main/webapp/css/styles.css 2010-05-19 15:58:07 UTC (rev 28) +++ trunk/src/main/webapp/css/styles.css 2010-05-20 09:38:01 UTC (rev 29) @@ -4,6 +4,12 @@ width:90%; margin:auto; } +table.actions { + border-collapse:collapse; + width:90%; + margin:auto; +} + th.result { font-family:monospace; border:1px dotted #6495ed; @@ -36,31 +42,29 @@ padding-top: 5px; margin-bottom: 5px; text-align: center; + border-radius:40px; -webkit-border-radius:40px; + -opera-border-radius:40px; -moz-border-radius:40px; - border-radius:40px; } -li.search { - display: inline; - margin-left: 5px; - margin-right: 5px; -} - -ul.search { +#menu { list-style-type: none; margin: 0; padding: 0; text-align: center; } -a.menu { +#menu li { + display: inline; +} + +#menu a { font-family:monospace; background-color:#EFF6FF; color:black; text-decoration:none; - text-align:center; - padding:5px; + padding:2px; border:2px solid; /*pour avoir un effet "outset" avec IE :*/ border-color:#75CEFF #6495ed #6495ed #75CEFF; @@ -78,9 +82,10 @@ color: #EF5252; margin-left: 2px; margin-right: 2px; + border-radius: 30px; -webkit-border-radius: 30px; -moz-border-radius: 30px; - border-radius: 30px; + -opera-border-radius:30px; text-decoration:none; } a.tag:hover { Added: trunk/src/main/webapp/img/bow.gif =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/bow.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/src/main/webapp/openSearchResult.jsp =================================================================== --- trunk/src/main/webapp/openSearchResult.jsp 2010-05-19 15:58:07 UTC (rev 28) +++ trunk/src/main/webapp/openSearchResult.jsp 2010-05-20 09:38:01 UTC (rev 29) @@ -30,9 +30,9 @@ if (!bookmarkList.isEmpty()) { %> <br/><br/>Results:<br/> - <table border="1"> - <tr> - <th> + <table class="result"> + <tr class="result"> + <th class="result"> Date <a style="text-decoration:none" href="bow?action=orderAscOS&type=date&searchLine=<%=searchLine%>" > <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" /> @@ -41,7 +41,7 @@ <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" /> </a> </th> - <th> + <th class="result"> Name <a style="text-decoration:none" href="bow?action=orderAscOS&type=name&searchLine=<%=searchLine%>"> <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" /> @@ -50,8 +50,8 @@ <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" /> </a> </th> - <th>Tags</th> - <th> + <th class="result">Tags</th> + <th class="result"> Click <a style="text-decoration:none" href="bow?action=orderAscOS&type=click&searchLine=<%=searchLine%>"> <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" /> @@ -65,14 +65,14 @@ SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); for (Bookmark bookmark : bookmarkList) { %> - <tr> - <td> + <tr class="result"> + <td class="result"> <%=sdf.format(bookmark.getDate())%> </td> - <td> + <td class="result"> <a href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a> </td> - <td> + <td class="result"> <% Set<String> tagList = bookmark.getTags(); if (tagList != null && !tagList.isEmpty()) { @@ -86,7 +86,7 @@ <% } %> - <td> + <td class="result"> <%=bookmark.getClick()%> </td> <% Modified: trunk/src/main/webapp/permanentXml.jsp =================================================================== --- trunk/src/main/webapp/permanentXml.jsp 2010-05-19 15:58:07 UTC (rev 28) +++ trunk/src/main/webapp/permanentXml.jsp 2010-05-20 09:38:01 UTC (rev 29) @@ -17,7 +17,7 @@ <ShortName>bowPermanentSearchEngine</ShortName> <Description>bookmarkSearch</Description> <InputEncoding>inputEncoding</InputEncoding> - <Image width="16" height="16">data:image/x-icon;base64,imageData</Image> + <Image width="16" height="16" type="image/ico"><%=url%>img/bow.gif</Image> <Url type="text/html" method="GET" template="<%=url%>bow?action=openSearchResult&token=<%=token%>&searchLine={searchTerms}" /> <Url type="application/x-suggestions+json" method="GET" template="<%=url%>bow?action=openSearchSuggestion&token=<%=token%>&search={searchTerms}" /> <moz:SearchForm><%=url%>bow</moz:SearchForm> Modified: trunk/src/main/webapp/search.jsp =================================================================== --- trunk/src/main/webapp/search.jsp 2010-05-19 15:58:07 UTC (rev 28) +++ trunk/src/main/webapp/search.jsp 2010-05-20 09:38:01 UTC (rev 29) @@ -29,42 +29,50 @@ <link rel="search" type="application/opensearchdescription+xml" title="bowTemporarySearchEngine" href="<%=url%>bow?action=temporaryXml" /> <link rel="search" type="application/opensearchdescription+xml" title="bowPermanentSearchEngine" href="<%=url%>bow?action=permanentXml" /> <body> - <ul class="search"> - <li style="display: inline;"><a class="menu" href="bow?action=logout">Logout</a></li> - <li style="display: inline;"><a class="menu" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Temporary token</a></li> - <li style="display: inline;"><a class="menu" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Current permanent token</a></li> - <li style="display: inline;"><a class="menu" href="bow?action=generateToken&searchLine=<%=searchLine%>">Regenerate permanent token</a></li> + <ul id="menu"> + <li><a href="bow?action=logout">Logout</a></li> + <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Temporary token</a></li> + <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Current permanent token</a></li> + <li><a href="bow?action=generateToken&searchLine=<%=searchLine%>">Regenerate permanent token</a></li> </ul> <br/><br/> - <div id="searchbox" style="position: absolute; top: 100px; right: 20px;"> - <form method="POST" action="bow?action=addUrl"> - URL <input type="text" name="url" size="20" value="URL" /><br /> - Name and Tags <input type="text" name="nameAndTags" size="20" value="name|tag1 tag2..." /><br /> - <input type="submit" value="add" /> - </form> - </div> - <div class="tagCloud"> - <% if (bookmarkActions != null) { - Map<String, Integer> tagsCloud = bookmarkActions.getTagsCloud(); - Set<String> tags = tagsCloud.keySet(); - for (String tag : tags) { - int value = tagsCloud.get(tag); - int font = bookmarkActions.getFont(value); - %> - <a href="bow?action=search&addTag=<%=tag%>&searchLine=<%=searchLine%>" class="tag" style="font-size: <%=font%>px;"><%=tag%></a> - <% - } - %> - </div> + <table class="actions"> + <tr> + <td> + <div class="tagCloud"> + <% if (bookmarkActions != null) { + Map<String, Integer> tagsCloud = bookmarkActions.getTagsCloud(); + Set<String> tags = tagsCloud.keySet(); + for (String tag : tags) { + int value = tagsCloud.get(tag); + int font = bookmarkActions.getFont(value); + %> + <a href="bow?action=search&addTag=<%=tag%>&searchLine=<%=searchLine%>" title="<%=value%> results" class="tag" style="font-size: <%=font%>px;"><%=tag%></a> + <% + } + %> + </div> + <form method="POST" action="bow?action=search" style="text-align: left;margin-left: 20px;"> + <input style="float: left" type="text" name="searchLine" size="20" value="<%=searchLine%>" /> + <input style="float: left;" type="submit" value="Find" /> + </form> + </td> + <td> + <div style="float: right"> + <form method="POST" action="bow?action=addUrl"> + URL <input onclick="this.value=''" type="text" name="url" size="20" value="URL" /><br /> + Name and Tags <input onclick="this.value='|'" type="text" name="nameAndTags" size="20" value="name|tag1 tag2..." /><br /> + <input type="submit" value="add" /> + </form> + </div> + </td> + </tr> + </table> <% List<Bookmark> bookmarkList = bookmarkActions.getBookmarks(); if (!bookmarkList.isEmpty()) { %> - <form method="POST" action="bow?action=search" style="text-align: left;margin-left: 20px"> - <input type="text" name="searchLine" size="20" value="<%=searchLine%>" /><br /> - <input type="submit" value="Find" /> - </form> <br/><br/>Results:<br/> <table class="result"> <tr class="result"> @@ -100,8 +108,8 @@ </th> </tr> <% - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - for (Bookmark bookmark : bookmarkList) { + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + for (Bookmark bookmark : bookmarkList) { %> <tr class="result"> <td class="result"> @@ -117,9 +125,9 @@ </td> <td class="result" style="text-align: left"> <% - Set<String> tagList = bookmark.getTags(); - if (tagList != null && !tagList.isEmpty()) { - for (String tag : tagList) { + Set<String> tagList = bookmark.getTags(); + if (tagList != null && !tagList.isEmpty()) { + for (String tag : tagList) { %> <div> <a style="text-decoration:none" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>&searchLine=<%=searchLine%>"> @@ -128,8 +136,8 @@ <%=tag%> </div> <% - } - } + } + } %> </td> <td class="result"> @@ -142,11 +150,11 @@ <%=bookmark.getClick()%> </td> <% - } + } %> </table> <% - } else { + } else { %> <br/><br/>No Bookmarks<br/><br/> <% } Modified: trunk/src/main/webapp/temporaryXml.jsp =================================================================== --- trunk/src/main/webapp/temporaryXml.jsp 2010-05-19 15:58:07 UTC (rev 28) +++ trunk/src/main/webapp/temporaryXml.jsp 2010-05-20 09:38:01 UTC (rev 29) @@ -17,7 +17,7 @@ <ShortName>bowTemporarySearchEngine</ShortName> <Description>bookmarkSearch</Description> <InputEncoding>inputEncoding</InputEncoding> - <Image width="16" height="16">data:image/x-icon;base64,imageData</Image> + <Image width="16" height="16" type="image/ico"><%=url%>img/bow.gif</Image> <Url type="text/html" method="GET" template="<%=url%>bow?action=openSearchResult&token=<%=token%>&searchLine={searchTerms}" /> <Url type="application/x-suggestions+json" method="GET" template="<%=url%>bow?action=openSearchSuggestion&token=<%=token%>&search={searchTerms}" /> <moz:SearchForm><%=url%>bow</moz:SearchForm>

1 0

r28 - in trunk/src/main: java/org/chorem/bow webapp webapp/css webapp/img
by bbrossaud＠users.chorem.org May 19, 2010

May 19, 2010

Author: bbrossaud Date: 2010-05-19 17:58:07 +0200 (Wed, 19 May 2010) New Revision: 28 Url: http://chorem.org/repositories/revision/bow/28 Log: better ergonomy for the search page and amelioration of the opensearch suggestion Added: trunk/src/main/webapp/img/asc.png trunk/src/main/webapp/img/desc.png Removed: trunk/src/main/webapp/generateToken.jsp trunk/src/main/webapp/img/asc.png trunk/src/main/webapp/img/desc.png 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/OpenSearchActions.java trunk/src/main/webapp/css/styles.css trunk/src/main/webapp/home.jsp trunk/src/main/webapp/img/delete.png trunk/src/main/webapp/openSearchResult.jsp trunk/src/main/webapp/permanentXml.jsp trunk/src/main/webapp/register.jsp trunk/src/main/webapp/search.jsp trunk/src/main/webapp/suggestions.jsp trunk/src/main/webapp/temporaryXml.jsp Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-05-18 15:26:01 UTC (rev 27) +++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-05-19 15:58:07 UTC (rev 28) @@ -99,6 +99,7 @@ tagCloud.clear(); deleteBookmarkBySearch(); createTagClougByBookmarks(); + defineTValues(); } public void deleteBookmarkBySearch() { @@ -206,8 +207,10 @@ public int getFont(int ti) { int font = 1; if (tmax > tmin) { - font = (15 * (ti - tmin)) / (tmax - tmin); // get the font size for a tag frequency + font = (50 * (ti - tmin)) / (tmax - tmin); // get the font size for a tag frequency } + if (font < 10) + font = 10; return font; } Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-18 15:26:01 UTC (rev 27) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-19 15:58:07 UTC (rev 28) @@ -10,6 +10,8 @@ */ import java.io.IOException; import java.security.NoSuchAlgorithmException; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; @@ -53,7 +55,6 @@ user = checkToken(token, session); } String action = request.getParameter("action"); - response.setContentType("text/html"); if (action != null) { if (action.equals("register")) { if (log.isDebugEnabled()) { @@ -197,16 +198,19 @@ throws IOException, ServletException { if (user != null) { String search = request.getParameter("search"); - log.debug("search={" + search + "}"); if (search != null) { OpenSearchActions openSearchActions = new OpenSearchActions(); WikittyProxy proxy = model.getProxy(); Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(); List<Bookmark> bookList = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); openSearchActions.setBookmarkList(bookList); - search = search.trim(); String[] words = search.split("\\s+"); - openSearchActions.findSuggestions(words); + List<String> searchLine = new ArrayList<String>(Arrays.asList(words)); + if (search.charAt(search.length() - 1) == ' ') { + searchLine.add(""); + } + openSearchActions.findSuggestions(searchLine); + log.debug("result={" + openSearchActions.getJsonResult() + "}"); request.setAttribute("openSearchAction", openSearchActions); } } @@ -441,7 +445,8 @@ protected void actionSearch(HttpServletRequest request, HttpServletResponse response, User user) throws IOException, ServletException { WikittyProxy proxy = model.getProxy(); - Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(); + Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(). + addSortDescending(Bookmark.FQ_FIELD_CLICK); List<Bookmark> bookList = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); // select all bookmarks by user createBookmarkActions(request, bookList); } Modified: trunk/src/main/java/org/chorem/bow/OpenSearchActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/OpenSearchActions.java 2010-05-18 15:26:01 UTC (rev 27) +++ trunk/src/main/java/org/chorem/bow/OpenSearchActions.java 2010-05-19 15:58:07 UTC (rev 28) @@ -23,29 +23,30 @@ protected List<Suggestion> suggestions = new ArrayList<Suggestion>(); protected String[] search = null; - public void findSuggestions(String[] words) { - search = words; + public void findSuggestions(List<String> searchLine) { + int size = searchLine.size(); + search = searchLine.toArray(new String[size]); if (!bookmarkList.isEmpty()) { int i; - for (i = 0; i < (words.length - 1); ++i) { + for (i = 0; i < (search.length - 1); ++i) { List<Bookmark> newList = new ArrayList<Bookmark>(bookmarkList); for (Bookmark bookmark : newList) { - if (!bookmarkHasTag(bookmark, words[i])) { + if (!bookmarkHasTag(bookmark, search[i])) { bookmarkList.remove(bookmark); } } } - fieldSuggestionList(words[i]); + fieldSuggestionList(search[i], searchLine); } } - protected void fieldSuggestionList(String word) { + protected void fieldSuggestionList(String word, List<String> searchLine) { if (bookmarkList != null) { Map<String, Integer> map = new HashMap<String, Integer>(); for (Bookmark bookmark : bookmarkList) { Set<String> tagList = bookmark.getTags(); for (String tag : tagList) { - if (tag.indexOf(word) == 0) { + if (tag.indexOf(word) == 0 && !searchLine.contains(tag)) { if (map.containsKey(tag)) { Integer count = map.get(tag); ++count; Modified: trunk/src/main/webapp/css/styles.css =================================================================== --- trunk/src/main/webapp/css/styles.css 2010-05-18 15:26:01 UTC (rev 27) +++ trunk/src/main/webapp/css/styles.css 2010-05-19 15:58:07 UTC (rev 28) @@ -1,3 +1,89 @@ -test { +table.result { + border:3px solid #6495ed; + border-collapse:collapse; + width:90%; + margin:auto; +} +th.result { + font-family:monospace; + border:1px dotted #6495ed; + padding:5px; + background-color:#EFF6FF; + width:15%; +} +td.result { + font-family:sans-serif; + font-size:80%; + border:1px solid #6495ed; + padding:5px; + text-align:center; +} +caption { + font-family:sans-serif; +} -} \ No newline at end of file +a.logout { + +} + +div.tagCloud { + background: #EEEEEE none repeat scroll 0 0; + max-width: 300px; + min-width: 200px; + padding-bottom: 5px; + padding-left: 10px; + padding-right: 10px; + padding-top: 5px; + margin-bottom: 5px; + text-align: center; + -webkit-border-radius:40px; + -moz-border-radius:40px; + border-radius:40px; +} + +li.search { + display: inline; + margin-left: 5px; + margin-right: 5px; +} + +ul.search { + list-style-type: none; + margin: 0; + padding: 0; + text-align: center; +} + +a.menu { + font-family:monospace; + background-color:#EFF6FF; + color:black; + text-decoration:none; + text-align:center; + padding:5px; + border:2px solid; + /*pour avoir un effet "outset" avec IE :*/ + border-color:#75CEFF #6495ed #6495ed #75CEFF; + +} + +a.menu:hover { + background-color:#D3D3D3; + border-color:#696969 #DCDCDC #DCDCDC #696969; + +} + +a.tag { + font-family:monospace; + color: #EF5252; + margin-left: 2px; + margin-right: 2px; + -webkit-border-radius: 30px; + -moz-border-radius: 30px; + border-radius: 30px; + text-decoration:none; +} +a.tag:hover { + background:#A9BCE1 none repeat scroll 0 0; + color:#FFFFFF; +} Deleted: trunk/src/main/webapp/generateToken.jsp =================================================================== --- trunk/src/main/webapp/generateToken.jsp 2010-05-18 15:26:01 UTC (rev 27) +++ trunk/src/main/webapp/generateToken.jsp 2010-05-19 15:58:07 UTC (rev 28) @@ -1,25 +0,0 @@ - -<%@ page import="org.chorem.bow.TokenActions" %> - -<%TokenActions tokenActions = (TokenActions) request.getAttribute("tokenActions"); - String token = tokenActions.getToken(); - if (token != null && token.isEmpty() == false) { -%> - -<html> - <body> - Use it to add new bookmarks without authentication : <br/><br/> - - <a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='http://localhost:8080/bow/bow?action=addUrl&token=<%=token%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);">Session</a> - <% - } else { - %> - Token not available, try again later ... - <% - } - %> - - <br/><br/><a href="bow?action=search">Return to the search page</a> - - </body> -</html> \ No newline at end of file Modified: trunk/src/main/webapp/home.jsp =================================================================== --- trunk/src/main/webapp/home.jsp 2010-05-18 15:26:01 UTC (rev 27) +++ trunk/src/main/webapp/home.jsp 2010-05-19 15:58:07 UTC (rev 28) @@ -1,9 +1,6 @@ - +<%@page contentType="text/html" pageEncoding="UTF-8"%> <% String error = (String) request.getAttribute("errorMessage"); - String url = request.getRequestURL().toString(); - int index = url.indexOf("home.jsp"); - url = url.substring(0, index); %> <html> Deleted: trunk/src/main/webapp/img/asc.png =================================================================== (Binary files differ) Copied: trunk/src/main/webapp/img/asc.png (from rev 23, trunk/src/main/webapp/img/desc.png) =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/asc.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:mergeinfo + Modified: trunk/src/main/webapp/img/delete.png =================================================================== (Binary files differ) Deleted: trunk/src/main/webapp/img/desc.png =================================================================== (Binary files differ) Copied: trunk/src/main/webapp/img/desc.png (from rev 23, trunk/src/main/webapp/img/asc.png) =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/desc.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:mergeinfo + Modified: trunk/src/main/webapp/openSearchResult.jsp =================================================================== --- trunk/src/main/webapp/openSearchResult.jsp 2010-05-18 15:26:01 UTC (rev 27) +++ trunk/src/main/webapp/openSearchResult.jsp 2010-05-19 15:58:07 UTC (rev 28) @@ -1,15 +1,15 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@page import="org.chorem.bow.Bookmark" %> +<%@page import="org.chorem.bow.BookmarkActions" %> +<%@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" %> +<%@page import="java.util.ArrayList" %> +<%@page import="java.util.List" %> +<%@page import="org.chorem.bow.TokenActions" %> -<%@ page import="org.chorem.bow.Bookmark" %> -<%@ page import="org.chorem.bow.BookmarkActions" %> -<%@ 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" %> -<%@ page import="java.util.ArrayList" %> -<%@ page import="java.util.List" %> -<%@ page import="org.chorem.bow.TokenActions" %> - <% BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions"); String searchLine = ""; Modified: trunk/src/main/webapp/permanentXml.jsp =================================================================== --- trunk/src/main/webapp/permanentXml.jsp 2010-05-18 15:26:01 UTC (rev 27) +++ trunk/src/main/webapp/permanentXml.jsp 2010-05-19 15:58:07 UTC (rev 28) @@ -1,4 +1,5 @@ -<%@ page import="org.chorem.bow.TokenActions" %> +<%@page contentType="text/xml" pageEncoding="UTF-8"%> +<%@page import="org.chorem.bow.TokenActions" %> <% TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); @@ -13,7 +14,7 @@ <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/"> - <ShortName>bowTemporarySearchEngine</ShortName> + <ShortName>bowPermanentSearchEngine</ShortName> <Description>bookmarkSearch</Description> <InputEncoding>inputEncoding</InputEncoding> <Image width="16" height="16">data:image/x-icon;base64,imageData</Image> Modified: trunk/src/main/webapp/register.jsp =================================================================== --- trunk/src/main/webapp/register.jsp 2010-05-18 15:26:01 UTC (rev 27) +++ trunk/src/main/webapp/register.jsp 2010-05-19 15:58:07 UTC (rev 28) @@ -1,4 +1,4 @@ - +<%@page contentType="text/html" pageEncoding="UTF-8"%> <%String error = (String) request.getAttribute("errorMessage");%> <html> <body> @@ -12,6 +12,6 @@ <%if (error != null && error.isEmpty() == false) {%> <br/><font color="red"><%=error%></font> <%}%> - <br/><a href="bow?action=home">Return to the login page<a> + <br/><a href="bow?action=home">Return to the login page</a> </body> </html> \ No newline at end of file Modified: trunk/src/main/webapp/search.jsp =================================================================== --- trunk/src/main/webapp/search.jsp 2010-05-18 15:26:01 UTC (rev 27) +++ trunk/src/main/webapp/search.jsp 2010-05-19 15:58:07 UTC (rev 28) @@ -1,15 +1,15 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@page import="org.chorem.bow.Bookmark" %> +<%@page import="org.chorem.bow.BookmarkActions" %> +<%@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" %> +<%@page import="java.util.ArrayList" %> +<%@page import="java.util.List" %> +<%@page import="org.chorem.bow.TokenActions" %> -<%@ page import="org.chorem.bow.Bookmark" %> -<%@ page import="org.chorem.bow.BookmarkActions" %> -<%@ 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" %> -<%@ page import="java.util.ArrayList" %> -<%@ page import="java.util.List" %> -<%@ page import="org.chorem.bow.TokenActions" %> - <% TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); String temporaryToken = tokenActions.getTemporaryToken(); @@ -25,51 +25,51 @@ %> <html> + <link rel="stylesheet" type="text/css" href="./css/styles.css" /> <link rel="search" type="application/opensearchdescription+xml" title="bowTemporarySearchEngine" href="<%=url%>bow?action=temporaryXml" /> <link rel="search" type="application/opensearchdescription+xml" title="bowPermanentSearchEngine" href="<%=url%>bow?action=permanentXml" /> <body> - <a href="bow?action=logout">Logout</a><br/> - <a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Temporary token</a> - <br/> - <a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Current permanent token</a> - <br/> - <a href="bow?action=generateToken&searchLine=<%=searchLine%>">Regenerate Permanent Token</a><br/><br/> + <ul class="search"> + <li style="display: inline;"><a class="menu" href="bow?action=logout">Logout</a></li> + <li style="display: inline;"><a class="menu" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Temporary token</a></li> + <li style="display: inline;"><a class="menu" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Current permanent token</a></li> + <li style="display: inline;"><a class="menu" href="bow?action=generateToken&searchLine=<%=searchLine%>">Regenerate permanent token</a></li> + </ul> + <br/><br/> + <div id="searchbox" style="position: absolute; top: 100px; right: 20px;"> + <form method="POST" action="bow?action=addUrl"> + URL <input type="text" name="url" size="20" value="URL" /><br /> + Name and Tags <input type="text" name="nameAndTags" size="20" value="name|tag1 tag2..." /><br /> + <input type="submit" value="add" /> + </form> + </div> - <h1>Search</h1> - - <form method="POST" action="bow?action=addUrl"> - URL <input type="text" name="url" size="20" value="URL" /><br /> - Name and Tags <input type="text" name="nameAndTags" size="20" value="name|tag1 tag2..." /><br /> - <input type="submit" value="add" /> - </form> - - <br/><br/><a href="bow?action=generateToken">Generate Token</a><br/><br/> - - <form method="POST" action="bow?action=search"> - <input type="text" name="searchLine" size="20" value="<%=searchLine%>" /><br /> - <input type="submit" value="Find" /> - </form> - - <% if (bookmarkActions != null) { - Map<String, Integer> tagsCloud = bookmarkActions.getTagsCloud(); - Set<String> tags = tagsCloud.keySet(); - for (String tag : tags) { - int value = tagsCloud.get(tag); - int font = bookmarkActions.getFont(value); - %> - - <FONT SIZE="<%=font%>" ><a href="bow?action=search&addTag=<%=tag%>&searchLine=<%=searchLine%>"><%=tag%></a></FONT> - + <div class="tagCloud"> + <% if (bookmarkActions != null) { + Map<String, Integer> tagsCloud = bookmarkActions.getTagsCloud(); + Set<String> tags = tagsCloud.keySet(); + for (String tag : tags) { + int value = tagsCloud.get(tag); + int font = bookmarkActions.getFont(value); + %> + <a href="bow?action=search&addTag=<%=tag%>&searchLine=<%=searchLine%>" class="tag" style="font-size: <%=font%>px;"><%=tag%></a> + <% + } + %> + </div> <% - } List<Bookmark> bookmarkList = bookmarkActions.getBookmarks(); if (!bookmarkList.isEmpty()) { %> + <form method="POST" action="bow?action=search" style="text-align: left;margin-left: 20px"> + <input type="text" name="searchLine" size="20" value="<%=searchLine%>" /><br /> + <input type="submit" value="Find" /> + </form> <br/><br/>Results:<br/> - <table border="1"> - <tr> - <th>Remove</th> - <th> + <table class="result"> + <tr class="result"> + <th class="result">Remove</th> + <th class="result"> Date <a style="text-decoration:none" href="bow?action=orderAsc&type=date&searchLine=<%=searchLine%>" > <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" /> @@ -78,7 +78,7 @@ <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" /> </a> </th> - <th> + <th class="result"> Name <a style="text-decoration:none" href="bow?action=orderAsc&type=name&searchLine=<%=searchLine%>"> <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" /> @@ -87,9 +87,9 @@ <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" /> </a> </th> - <th>Tags</th> - <th>Edit</th> - <th> + <th class ="result">Tags</th> + <th class="result">Edit</th> + <th class="result"> Click <a style="text-decoration:none" href="bow?action=orderAsc&type=click&searchLine=<%=searchLine%>"> <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" /> @@ -103,40 +103,42 @@ SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); for (Bookmark bookmark : bookmarkList) { %> - <tr> - <td> + <tr class="result"> + <td class="result"> <a style="border:none;" href="bow?action=removeBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>"> <IMG style="border:none;" SRC="img/remove.png" ALT="Remove bookmark" TITLE="Remove" /> </a> </td> - <td> + <td class="result"> <%=sdf.format(bookmark.getDate())%> </td> - <td> + <td class="result"> <a href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a> </td> - <td> + <td class="result" style="text-align: left"> <% Set<String> tagList = bookmark.getTags(); if (tagList != null && !tagList.isEmpty()) { for (String tag : tagList) { %> - <%=tag%> - <a style="text-decoration:none" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>&searchLine=<%=searchLine%>"> - <IMG style="border:none" SRC="img/delete.png" ALT="Delete tag" TITLE="Delete" /> - </a> + <div> + <a style="text-decoration:none" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>&searchLine=<%=searchLine%>"> + <IMG style="border:none" SRC="img/delete.png" ALT="Delete tag" TITLE="Delete" /> + </a> + <%=tag%> + </div> <% } } %> </td> - <td> + <td class="result"> <form style="display: inline" method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>"> <input type="text" name="nameAndTags" size="50" value="<%=bookmark.getDescription()%>|tag1 tag2 tag3" /> <input type="image" src="img/edit.png" title="Edit"/> </form> </td> - <td> + <td class="result"> <%=bookmark.getClick()%> </td> <% Modified: trunk/src/main/webapp/suggestions.jsp =================================================================== --- trunk/src/main/webapp/suggestions.jsp 2010-05-18 15:26:01 UTC (rev 27) +++ trunk/src/main/webapp/suggestions.jsp 2010-05-19 15:58:07 UTC (rev 28) @@ -1,4 +1,4 @@ - +<%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page import="org.chorem.bow.OpenSearchActions" %> <%@page import="org.chorem.bow.Suggestion" %> <%@page import="java.util.List" %> Modified: trunk/src/main/webapp/temporaryXml.jsp =================================================================== --- trunk/src/main/webapp/temporaryXml.jsp 2010-05-18 15:26:01 UTC (rev 27) +++ trunk/src/main/webapp/temporaryXml.jsp 2010-05-19 15:58:07 UTC (rev 28) @@ -1,4 +1,5 @@ -<%@ page import="org.chorem.bow.TokenActions" %> +<%@page contentType="text/xml" pageEncoding="UTF-8"%> +<%@page import="org.chorem.bow.TokenActions" %> <% TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions");

1 0

r27 - in trunk/src/main: java/org/chorem/bow webapp/WEB-INF
by bbrossaud＠users.chorem.org May 18, 2010

May 18, 2010

Author: bbrossaud Date: 2010-05-18 17:26:01 +0200 (Tue, 18 May 2010) New Revision: 27 Url: http://chorem.org/repositories/revision/bow/27 Log: deleted useless servlet Removed: trunk/src/main/java/org/chorem/bow/OpenSearchXmlServlet.java Modified: trunk/src/main/webapp/WEB-INF/web.xml Deleted: trunk/src/main/java/org/chorem/bow/OpenSearchXmlServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/OpenSearchXmlServlet.java 2010-05-18 15:21:30 UTC (rev 26) +++ trunk/src/main/java/org/chorem/bow/OpenSearchXmlServlet.java 2010-05-18 15:26:01 UTC (rev 27) @@ -1,36 +0,0 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - -package org.chorem.bow; - -import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * - * @author bbrossaud - */ -public class OpenSearchXmlServlet extends HttpServlet { - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException { - this.doPost(request, response); - } - - /* @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet error occurs - */ - @Override - public void doPost(HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException { - request.getRequestDispatcher("xml.jsp").forward(request, response); - } - -} Modified: trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/src/main/webapp/WEB-INF/web.xml 2010-05-18 15:21:30 UTC (rev 26) +++ trunk/src/main/webapp/WEB-INF/web.xml 2010-05-18 15:26:01 UTC (rev 27) @@ -8,11 +8,6 @@ <servlet-name>Controller</servlet-name> </servlet> - <servlet> - <servlet-class>org.chorem.bow.OpenSearchXmlServlet</servlet-class> - <servlet-name>XML</servlet-name> - </servlet> -  <servlet-mapping> @@ -20,9 +15,4 @@ <url-pattern>/bow</url-pattern> </servlet-mapping> - <servlet-mapping> - <servlet-name>XML</servlet-name> - <url-pattern>/xml</url-pattern> - </servlet-mapping> - </web-app> \ No newline at end of file

1 0

r26 - in trunk: . src/main/java/org/chorem/bow src/main/webapp src/main/webapp/WEB-INF
by bbrossaud＠users.chorem.org May 18, 2010

May 18, 2010

Author: bbrossaud Date: 2010-05-18 17:21:30 +0200 (Tue, 18 May 2010) New Revision: 26 Url: http://chorem.org/repositories/revision/bow/26 Log: permanent and temporary opensearch functionalities addition Added: trunk/src/main/java/org/chorem/bow/OpenSearchActions.java trunk/src/main/java/org/chorem/bow/OpenSearchXmlServlet.java trunk/src/main/java/org/chorem/bow/Suggestion.java trunk/src/main/java/org/chorem/bow/SuggestionsComparator.java trunk/src/main/webapp/openSearchResult.jsp trunk/src/main/webapp/permanentXml.jsp trunk/src/main/webapp/suggestions.jsp trunk/src/main/webapp/temporaryXml.jsp Modified: trunk/pom.xml 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/webapp/WEB-INF/web.xml trunk/src/main/webapp/generateToken.jsp trunk/src/main/webapp/home.jsp trunk/src/main/webapp/search.jsp Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-14 15:09:05 UTC (rev 25) +++ trunk/pom.xml 2010-05-18 15:21:30 UTC (rev 26) @@ -48,27 +48,20 @@ </dependency> <dependency> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty-api</artifactId> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> <version>${wikitty.version}</version> </dependency> <dependency> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty-jdbc-impl</artifactId> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc-impl</artifactId> <version>${wikitty.version}</version> - - <exclusions> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty-multistorage-impl</artifactId> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-multistorage-impl</artifactId> <version>${wikitty.version}</version> </dependency> @@ -119,7 +112,7 @@   <projectId>bow</projectId> - <wikitty.version>1.5-cl-SNAPSHOT</wikitty.version> + <wikitty.version>2.0-SNAPSHOT</wikitty.version>  <junit.version>4.7</junit.version> <siteLocales>en</siteLocales> @@ -170,7 +163,7 @@ </xmiResources> <includes>**/*.objectmodel</includes> <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> - <templates>org.sharengo.wikitty.generator.WikittyMetaGenerator</templates> + <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator</templates> <defaultPackage>com.jurismarches.vradi</defaultPackage> <extractedPackages>org.chorem.bow</extractedPackages> <generatedPackages>org.chorem.bow</generatedPackages> @@ -185,8 +178,8 @@ <dependencies> <dependency> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty-generators</artifactId> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-generators</artifactId> <version>${wikitty.version}</version> </dependency>  Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-05-14 15:09:05 UTC (rev 25) +++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-05-18 15:21:30 UTC (rev 26) @@ -35,7 +35,7 @@ * @return null if all fields are not correctly filled * @return Bookmark the website bookmark */ - public Bookmark createBookmark(String url, String nameAndTags, User user) { + public static Bookmark createBookmark(String url, String nameAndTags, User user) { Bookmark bookmark = (Bookmark) new BookmarkImpl(); @@ -69,7 +69,7 @@ return bookmark; } - public void updateBookmark(Bookmark bookmark, String nameAndTags) { + public static void updateBookmark(Bookmark bookmark, String nameAndTags) { int nameIndex = nameAndTags.indexOf('|'); // get the index name of the website if (nameIndex > 0) { String name = nameAndTags.substring(0, nameIndex); // get the website name @@ -172,11 +172,16 @@ } } - public void addTags(String[] tags) { - for (int i = 0; i - < tags.length; i++) { - if (!tagsSearch.contains(tags[i])) { - tagsSearch.add(tags[i]); + public void addTags(String str) { + if (str != null) { + if (!str.isEmpty()) { + str = str.trim(); + String[] tags = str.split("\\s+"); + for (int i = 0; i < tags.length; i++) { + if (!tagsSearch.contains(tags[i])) { + tagsSearch.add(tags[i]); + } + } } } } Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-14 15:09:05 UTC (rev 25) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-18 15:21:30 UTC (rev 26) @@ -18,9 +18,9 @@ import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.sharengo.wikitty.Criteria; -import org.sharengo.wikitty.WikittyProxy; -import org.sharengo.wikitty.search.Search; +import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.search.Search; /** * @@ -30,8 +30,6 @@ private static final Log log = LogFactory.getLog(ControllerServlet.class); protected Model model = new Model(); - protected BookmarkActions bookmarkActions = new BookmarkActions(); - protected TokenActions tokenActions = new TokenActions(); protected String error = ""; @Override @@ -47,13 +45,15 @@ @Override public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - try { + try { HttpSession session = request.getSession(true); User user = (User) session.getAttribute("user"); + String token = request.getParameter("token"); // token or not + if (token != null && !token.isEmpty()) { + user = checkToken(token, session); + } String action = request.getParameter("action"); response.setContentType("text/html"); - request.setAttribute("bookmarkActions", bookmarkActions); - request.setAttribute("tokenActions", tokenActions); if (action != null) { if (action.equals("register")) { if (log.isDebugEnabled()) { @@ -62,9 +62,7 @@ this.actionRegister(request, response, session); } else if (action.equals("registration")) { if (log.isDebugEnabled()) { - if (log.isDebugEnabled()) { - log.debug("Going to Register"); - } + log.debug("Going to Register"); } request.getRequestDispatcher("register.jsp").forward(request, response); } else if (action.equals("login")) { @@ -77,61 +75,95 @@ log.debug("Going to actionLogin"); } this.actionLogout(request, response, session); - } else if (action.equals("addUrl")) { + } else if (action.equals("addUrl") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionAddUrl"); } - this.actionAddUrl(request, response, session); + this.actionAddUrl(request, response, user); + request.getRequestDispatcher("search.jsp").forward(request, response); + } else if (action.equals("search") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionSearch"); } this.actionSearch(request, response, user); - } else if (action.equals("clickOnTag") && user != null) { - if (log.isDebugEnabled()) { - log.debug("Going to actionClickOnTag"); - } - this.actionClickOnTag(request, response, user); + request.getRequestDispatcher("search.jsp").forward(request, response); + } else if (action.equals("generateToken") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionGenerateToken"); } - try { - this.actionGenerateToken(request, response, user); - } catch (NoSuchAlgorithmException ex) { - log.error("No Such Algorithm", ex); - request.getRequestDispatcher("error.jsp").forward(request, response); - } + this.actionGenerateToken(request, response, user, session); + request.getRequestDispatcher("search.jsp").forward(request, response); } else if (action.equals("deleteTag") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionDeleteTag"); } this.actionDeleteTag(request, response, user); + request.getRequestDispatcher("search.jsp").forward(request, response); } else if (action.equals("removeBookmark") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionRemoveBookmark"); } this.actionRemoveBookmark(request, response, user); + request.getRequestDispatcher("search.jsp").forward(request, response); } else if (action.equals("editBookmark") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionEditBookmark"); } this.actionEditBookmark(request, response, user); + request.getRequestDispatcher("search.jsp").forward(request, response); } else if (action.equals("orderAsc") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionOrderAsc"); } this.actionOrderAsc(request, response, user); + request.getRequestDispatcher("search.jsp").forward(request, response); + } else if (action.equals("orderAscOS") && user != null) { + if (log.isDebugEnabled()) { + log.debug("Going to actionOrderAsc"); + } + this.actionOrderAsc(request, response, user); + request.getRequestDispatcher("openSearchResult.jsp").forward(request, response); } else if (action.equals("orderDesc") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionOrderDesc"); } this.actionOrderDesc(request, response, user); + request.getRequestDispatcher("search.jsp").forward(request, response); + } else if (action.equals("orderDescOS") && user != null) { + if (log.isDebugEnabled()) { + log.debug("Going to actionOrderDesc"); + } + this.actionOrderDesc(request, response, user); + request.getRequestDispatcher("openSearchResult.jsp").forward(request, response); } else if (action.equals("addClick") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionAddClic"); } this.actionAddClick(request, response); + } else if (action.equals("temporaryXml")) { + if (log.isDebugEnabled()) { + log.debug("Going to temporaryXml.jsp"); + } + request.getRequestDispatcher("temporaryXml.jsp").forward(request, response); + } else if (action.equals("permanentXml")) { + if (log.isDebugEnabled()) { + log.debug("Going to permanentXml.jsp"); + } + request.getRequestDispatcher("permanentXml.jsp").forward(request, response); + } else if (action.equals("openSearchSuggestion") && user != null) { + if (log.isDebugEnabled()) { + log.debug("Going to actionOpenSearchSuggestion"); + } + this.actionOpenSearchSuggestion(request, response, user); + request.getRequestDispatcher("suggestions.jsp").forward(request, response); + } else if (action.equals("openSearchResult") && user != null) { + if (log.isDebugEnabled()) { + log.debug("Going to actionOpenSearchResult"); + } + this.actionOpenSearchResult(request, response, user, token); + request.getRequestDispatcher("openSearchResult.jsp").forward(request, response); } else { if (log.isDebugEnabled()) { log.debug("Going to home"); @@ -146,10 +178,40 @@ } request.setAttribute("errorMessage", error); } catch (Exception eee) { - request.getRequestDispatcher("error.jsp").forward(request, response); + //request.getRequestDispatcher("error.jsp").forward(request, response); + throw new ServletException("DO GET ERROR", eee); } } + protected void actionOpenSearchResult(HttpServletRequest request, HttpServletResponse response, User user, String token) + throws IOException, ServletException { + WikittyProxy proxy = model.getProxy(); + Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(). + addSortDescending(Bookmark.FQ_FIELD_CLICK); + List<Bookmark> bookList = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); + createBookmarkActions(request, bookList); + request.setAttribute("token", token); + } + + protected void actionOpenSearchSuggestion(HttpServletRequest request, HttpServletResponse response, User user) + throws IOException, ServletException { + if (user != null) { + String search = request.getParameter("search"); + log.debug("search={" + search + "}"); + if (search != null) { + OpenSearchActions openSearchActions = new OpenSearchActions(); + WikittyProxy proxy = model.getProxy(); + Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(); + List<Bookmark> bookList = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); + openSearchActions.setBookmarkList(bookList); + search = search.trim(); + String[] words = search.split("\\s+"); + openSearchActions.findSuggestions(words); + request.setAttribute("openSearchAction", openSearchActions); + } + } + } + protected void actionLogout(HttpServletRequest request, HttpServletResponse response, HttpSession session) throws IOException, ServletException { session.invalidate(); @@ -189,18 +251,14 @@ 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(). + } 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); - bookmarkActions.createTagsCloud(); - } + createBookmarkActions(request, bookList); } - request.getRequestDispatcher("search.jsp").forward(request, response); } protected void actionOrderDesc(HttpServletRequest request, HttpServletResponse response, User user) @@ -219,18 +277,14 @@ 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(). + } 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); - bookmarkActions.createTagsCloud(); - } + createBookmarkActions(request, bookList); } - request.getRequestDispatcher("search.jsp").forward(request, response); } protected void actionEditBookmark(HttpServletRequest request, HttpServletResponse response, User user) @@ -242,18 +296,14 @@ WikittyProxy proxy = model.getProxy(); Bookmark bookmark = proxy.restore(Bookmark.class, bookmarkId); if (bookmark != null) { - bookmarkActions.updateBookmark(bookmark, nameAndTags); + BookmarkActions.updateBookmark(bookmark, nameAndTags); proxy.store(bookmark); Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(); List<Bookmark> bookList = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); // select all bookmarks by user - if (bookList != null) { - bookmarkActions.setBookmarks(bookList); - bookmarkActions.createTagsCloud(); - } + createBookmarkActions(request, bookList); } } } - request.getRequestDispatcher("search.jsp").forward(request, response); } protected void actionRemoveBookmark(HttpServletRequest request, HttpServletResponse response, User user) @@ -265,19 +315,17 @@ Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(); List<Bookmark> bookList = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); // select all bookmarks by user if (bookList != null) { - bookmarkActions.setBookmarks(bookList); - bookmarkActions.createTagsCloud(); + createBookmarkActions(request, bookList); } } - request.getRequestDispatcher("search.jsp").forward(request, response); } protected void actionDeleteTag(HttpServletRequest request, HttpServletResponse response, User user) throws IOException, ServletException { String bookmarkId = request.getParameter("bookmarkId"); - String tag = request.getParameter("tag"); + String tag = request.getParameter("deleteTag"); if (tag != null && bookmarkId != null) { - if (!tag.isEmpty() && !bookmarkId.isEmpty()) { + if (!bookmarkId.isEmpty()) { WikittyProxy proxy = model.getProxy(); Bookmark bookmark = proxy.restore(Bookmark.class, bookmarkId); if (bookmark != null) { @@ -285,14 +333,10 @@ proxy.store(bookmark); Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(); List<Bookmark> bookList = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); // select all bookmarks by user - if (bookList != null) { - bookmarkActions.setBookmarks(bookList); - bookmarkActions.createTagsCloud(); - } + createBookmarkActions(request, bookList); } } } - request.getRequestDispatcher("search.jsp").forward(request, response); } @@ -300,7 +344,7 @@ * @param response servlet response * @throws ServletException if a servlet error occurs */ - protected void actionGenerateToken(HttpServletRequest request, HttpServletResponse response, User user) + protected void actionGenerateToken(HttpServletRequest request, HttpServletResponse response, User user, HttpSession session) throws IOException, ServletException, NoSuchAlgorithmException { WikittyProxy proxy = model.getProxy(); @@ -309,45 +353,38 @@ if (currentToken != null) { proxy.delete(currentToken.getWikittyId()); } - String token = tokenActions.generateToken(); // Generate an encoding MD5 token - criteria = Search.query().eq(Token.FQ_FIELD_TOKEN, token).criteria(); - if (proxy.findByCriteria(Token.class, criteria) == null) { // Check if the token already exists - TokenImpl newToken = new TokenImpl(); - newToken.setToken(token); - newToken.setEmail(user.getEmail()); - proxy.store((Token) newToken); // If the token doesn't exist, it is stored - tokenActions.setPermanentToken(token); - } else { - tokenActions.setPermanentToken(""); + TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); + if (tokenActions != null) { + String token = tokenActions.generateToken(); // Generate an encoding MD5 token + criteria = Search.query().eq(Token.FQ_FIELD_TOKEN, token).criteria(); + if (proxy.findByCriteria(Token.class, criteria) == null) { // Check if the token already exists + TokenImpl newToken = new TokenImpl(); + newToken.setToken(token); + newToken.setEmail(user.getEmail()); + proxy.store((Token) newToken); // If the token doesn't exist, it is stored + tokenActions.setPermanentToken(token); + } else { + tokenActions.setPermanentToken(""); + } } - request.getRequestDispatcher("search.jsp").forward(request, response); + session.setAttribute("tokenActions", tokenActions); + actionSearch(request, response, user); } /* @param request servlet request * @param response servlet response * @throws ServletException if a servlet error occurs */ - protected void actionAddUrl(HttpServletRequest request, HttpServletResponse response, HttpSession session) + protected void actionAddUrl(HttpServletRequest request, HttpServletResponse response, User user) throws IOException, ServletException { - String token = request.getParameter("token"); // token or not - if (token != null && !token.isEmpty()) { - User user = checkToken(token, session); - addUrl(request, user); - } - else { - User user = (User) session.getAttribute("user"); - if (user != null) { - addUrl(request, user); - actionSearch(request, response, user); - } - } - + addUrl(request, user); + actionSearch(request, response, user); } protected void addUrl(HttpServletRequest request, User user) { String url = request.getParameter("url"); // url of the website String nameAndTags = request.getParameter("nameAndTags"); // name and tags - Bookmark bookmark = bookmarkActions.createBookmark(url, nameAndTags, user); + Bookmark bookmark = BookmarkActions.createBookmark(url, nameAndTags, user); if (bookmark != null) { WikittyProxy proxy = model.getProxy(); proxy.store(bookmark); // store the bookmark if all is Ok @@ -357,7 +394,6 @@ } } - protected User checkToken(String token, HttpSession session) { if (checkTemporaryToken(token, session) == true) { User user = (User) session.getAttribute("user"); @@ -367,7 +403,6 @@ return user; } - /* @param token String which contains the MD5 encoding token * @return null the token doesn't exist * @return User the token owner @@ -387,63 +422,43 @@ } protected boolean checkTemporaryToken(String token, HttpSession session) { - String temporaryToken = (String) session.getAttribute("temporaryToken"); - if (temporaryToken != null) { - if (temporaryToken.equals(token)) { - return true; + TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); + if (tokenActions != null) { + String temporaryToken = tokenActions.getTemporaryToken(); + if (temporaryToken != null) { + if (temporaryToken.equals(token)) { + return true; + } } } return false; - } /* @param request servlet request * @param response servlet response * @throws ServletException if a servlet error occurs */ - protected void actionClickOnTag(HttpServletRequest request, HttpServletResponse response, User user) + protected void actionSearch(HttpServletRequest request, HttpServletResponse response, User user) throws IOException, ServletException { WikittyProxy proxy = model.getProxy(); - String tag = request.getParameter("tag"); - bookmarkActions.getTagsCloud().clear(); Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(); List<Bookmark> bookList = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); // select all bookmarks by user - if (bookList != null) { - bookmarkActions.setBookmarks(bookList); - } - if (tag != null) { - if (!tag.isEmpty()) { - tag = tag.trim(); - bookmarkActions.addTag(tag); // if a new tag is selected, adding in tag list - } - } - bookmarkActions.createTagsCloud(); // create the tags cloud with the new informations - request.getRequestDispatcher("search.jsp").forward(request, response); + createBookmarkActions(request, bookList); } - /* @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet error occurs - */ - protected void actionSearch(HttpServletRequest request, HttpServletResponse response, User user) - throws IOException, ServletException { - WikittyProxy proxy = model.getProxy(); - String words = request.getParameter("words"); // retrieve informations taping in the search field - bookmarkActions.reset(); - Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(); - List<Bookmark> bookList = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); // select all bookmarks by user + protected void createBookmarkActions(HttpServletRequest request, List<Bookmark> bookList) { + String words = request.getParameter("searchLine"); // retrieve informations taping in the search field + BookmarkActions bookmarkActions = new BookmarkActions(); if (bookList != null) { bookmarkActions.setBookmarks(bookList); } - if (words != null) { - if (!words.isEmpty()) { - words = words.trim(); - String[] tags = words.split("\\s+"); - bookmarkActions.addTags(tags); // add the new tags - } + bookmarkActions.addTags(words); // add the new tags + String tag = request.getParameter("addTag"); + if (tag != null && !tag.isEmpty()) { + bookmarkActions.addTag(tag); } bookmarkActions.createTagsCloud(); // create the tags cloud with the new informations - request.getRequestDispatcher("search.jsp").forward(request, response); + request.setAttribute("bookmarkActions", bookmarkActions); } /* @param request servlet request @@ -466,20 +481,9 @@ request.getRequestDispatcher("error.jsp").forward(request, response); } else { session.setAttribute("user", login); - Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, login.getEmail()).criteria(); - Token token = proxy.findByCriteria(Token.class, criteria); - if (token == null) { - token = new TokenImpl(); - String newToken = tokenActions.generateToken(); - token.setToken(newToken); - token.setEmail(login.getEmail()); - proxy.store(token); - } - tokenActions.setPermanentToken(token.getToken()); - String temporaryToken = tokenActions.generateToken(); - tokenActions.setTemporaryToken(temporaryToken); - session.setAttribute("temporaryToken", temporaryToken); - this.actionSearch(request, response, login); + initializeToken(session, login); + actionSearch(request, response, login); + request.getRequestDispatcher("search.jsp").forward(request, response); } } } @@ -495,28 +499,37 @@ User login = this.checkLogin(email, password); // check if the user exists if (login != null) { - WikittyProxy proxy = model.getProxy(); session.setAttribute("user", login); - Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, login.getEmail()).criteria(); - Token token = proxy.findByCriteria(Token.class, criteria); - if (token == null) { - token = new TokenImpl(); - String newToken = tokenActions.generateToken(); - token.setToken(newToken); - token.setEmail(login.getEmail()); - proxy.store(token); - } - tokenActions.setPermanentToken(token.getToken()); - String temporaryToken = tokenActions.generateToken(); - tokenActions.setTemporaryToken(temporaryToken); - session.setAttribute("temporaryToken", temporaryToken); - this.actionSearch(request, response, login); + initializeToken(session, login); + actionSearch(request, response, login); + request.getRequestDispatcher("search.jsp").forward(request, response); + } else { error = "Unknow email or incorrect password"; request.getRequestDispatcher("home.jsp").forward(request, response); } } + protected void initializeToken(HttpSession session, User login) + throws NoSuchAlgorithmException { + WikittyProxy proxy = model.getProxy(); + Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, login.getEmail()).criteria(); + Token token = proxy.findByCriteria(Token.class, criteria); + TokenActions tokenActions = new TokenActions(); + if (token == null) { + token = new TokenImpl(); + String newToken = tokenActions.generateToken(); + token.setToken(newToken); + token.setEmail(login.getEmail()); + proxy.store(token); + } + tokenActions.setPermanentToken(token.getToken()); + String temporaryToken = tokenActions.generateToken(); + tokenActions.setTemporaryToken(temporaryToken); + session.setAttribute("tokenActions", tokenActions); + } + + /* @param email String which contains the user name (email) * @param password String which contains the user password * @return null the user doesn't exist @@ -555,5 +568,4 @@ error = "Email and password must be correctly filled"; return true; } - } Modified: trunk/src/main/java/org/chorem/bow/Model.java =================================================================== --- trunk/src/main/java/org/chorem/bow/Model.java 2010-05-14 15:09:05 UTC (rev 25) +++ trunk/src/main/java/org/chorem/bow/Model.java 2010-05-18 15:21:30 UTC (rev 26) @@ -5,15 +5,15 @@ package org.chorem.bow; import java.util.Properties; -import org.sharengo.wikitty.WikittyExtensionStorage; -import org.sharengo.wikitty.WikittyProxy; -import org.sharengo.wikitty.WikittyService; -import org.sharengo.wikitty.WikittyStorage; -import org.sharengo.wikitty.jdbc.WikittyExtensionStorageJDBC; -import org.sharengo.wikitty.jdbc.WikittyStorageJDBC; -import org.sharengo.wikitty.multistorage.MultiStorageConfiguration; -import org.sharengo.wikitty.multistorage.MultiStorageConfiguration.BasicConfiguration; -import org.sharengo.wikitty.multistorage.WikittyServiceMultiStorage; +import org.nuiton.wikitty.WikittyExtensionStorage; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.WikittyStorage; +import org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC; +import org.nuiton.wikitty.jdbc.WikittyStorageJDBC; +import org.nuiton.wikitty.multistorage.MultiStorageConfiguration; +import org.nuiton.wikitty.multistorage.MultiStorageConfiguration.BasicConfiguration; +import org.nuiton.wikitty.multistorage.WikittyServiceMultiStorage; /** * Added: trunk/src/main/java/org/chorem/bow/OpenSearchActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/OpenSearchActions.java (rev 0) +++ trunk/src/main/java/org/chorem/bow/OpenSearchActions.java 2010-05-18 15:21:30 UTC (rev 26) @@ -0,0 +1,149 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package org.chorem.bow; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import org.apache.commons.lang.StringUtils; + +/** + * + * @author bbrossaud + */ +public class OpenSearchActions { + + protected List<Bookmark> bookmarkList = new ArrayList<Bookmark>(); + protected List<Suggestion> suggestions = new ArrayList<Suggestion>(); + protected String[] search = null; + + public void findSuggestions(String[] words) { + search = words; + if (!bookmarkList.isEmpty()) { + int i; + for (i = 0; i < (words.length - 1); ++i) { + List<Bookmark> newList = new ArrayList<Bookmark>(bookmarkList); + for (Bookmark bookmark : newList) { + if (!bookmarkHasTag(bookmark, words[i])) { + bookmarkList.remove(bookmark); + } + } + } + fieldSuggestionList(words[i]); + } + } + + protected void fieldSuggestionList(String word) { + if (bookmarkList != null) { + Map<String, Integer> map = new HashMap<String, Integer>(); + for (Bookmark bookmark : bookmarkList) { + Set<String> tagList = bookmark.getTags(); + for (String tag : tagList) { + if (tag.indexOf(word) == 0) { + if (map.containsKey(tag)) { + Integer count = map.get(tag); + ++count; + map.put(tag, count); + } else { + map.put(tag, 1); + } + } + } + } + Set<String> keys = map.keySet(); + for (String key : keys) { + Suggestion newSuggestion = new Suggestion(); + newSuggestion.setName(key); + newSuggestion.setNb(map.get(key)); + suggestions.add(newSuggestion); + } + + Collections.sort(suggestions, new SuggestionsComparator()); + } + } + + protected boolean bookmarkHasTag(Bookmark bookmark, String tag) { + Set<String> tagList = bookmark.getTags(); + if (tagList.contains(tag)) { + return true; + } + return false; + } + + public void setBookmarkList(List<Bookmark> bookmarks) { + if (bookmarks != null) { + List<Bookmark> newList = new ArrayList(bookmarks); + bookmarkList = newList; + } + } + + public String getJsonResult() { + String str = "["; + + str += "\"" + StringUtils.join(search, ' ') + "\","; + str += getJsonSuggestions(); + str += ","; + str += getJsonDescription(); + str += "]"; + return str; + } + + public String getJsonSuggestions() { + String str = "["; + String srch = ""; + Iterator<Suggestion> it = suggestions.iterator(); + if (search.length > 1) { + srch = StringUtils.join(search, ' ', 0, (search.length - 1)); + srch += " "; + } + while (it.hasNext()) { + Suggestion su = it.next(); + str += "\"" + srch + su.getName() + "\""; + if (it.hasNext()) { + str += ","; + } + } + str += "]"; + return str; + } + + public String getJsonDescription() { + String str = "["; + Iterator<Suggestion> it = suggestions.iterator(); + while (it.hasNext()) { + Suggestion su = it.next(); + str += "\"" + su.getNb() + " results\""; + if (it.hasNext()) { + str += ","; + } + } + str += "]"; + return str; + } + + public void setSearch(String[] tab) { + search = tab; + } + + public void setSuggestionList(List<Suggestion> list) { + suggestions = list; + } + + public List<Bookmark> getBookmarkList() { + return bookmarkList; + } + + public String[] getSearch() { + return search; + } + + public List<Suggestion> getSuggestionList() { + return suggestions; + } +} Added: trunk/src/main/java/org/chorem/bow/OpenSearchXmlServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/OpenSearchXmlServlet.java (rev 0) +++ trunk/src/main/java/org/chorem/bow/OpenSearchXmlServlet.java 2010-05-18 15:21:30 UTC (rev 26) @@ -0,0 +1,36 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.chorem.bow; + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * + * @author bbrossaud + */ +public class OpenSearchXmlServlet extends HttpServlet { + + @Override + public void doGet(HttpServletRequest request, HttpServletResponse response) + throws IOException, ServletException { + this.doPost(request, response); + } + + /* @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet error occurs + */ + @Override + public void doPost(HttpServletRequest request, HttpServletResponse response) + throws IOException, ServletException { + request.getRequestDispatcher("xml.jsp").forward(request, response); + } + +} Added: trunk/src/main/java/org/chorem/bow/Suggestion.java =================================================================== --- trunk/src/main/java/org/chorem/bow/Suggestion.java (rev 0) +++ trunk/src/main/java/org/chorem/bow/Suggestion.java 2010-05-18 15:21:30 UTC (rev 26) @@ -0,0 +1,31 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.chorem.bow; + +/** + * + * @author bbrossaud + */ +public class Suggestion { + int nb = 0; + String name = ""; + + public void setNb(int value) { + nb = value; + } + + public void setName(String str) { + name = str; + } + + public int getNb() { + return nb; + } + + public String getName() { + return name; + } +} Added: trunk/src/main/java/org/chorem/bow/SuggestionsComparator.java =================================================================== --- trunk/src/main/java/org/chorem/bow/SuggestionsComparator.java (rev 0) +++ trunk/src/main/java/org/chorem/bow/SuggestionsComparator.java 2010-05-18 15:21:30 UTC (rev 26) @@ -0,0 +1,24 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.chorem.bow; + +import java.util.Comparator; + +/** + * + * @author bbrossaud + */ +public class SuggestionsComparator implements Comparator<Suggestion> { + + @Override + public int compare(Suggestion o1, Suggestion o2) { + if (o1.getNb() < o2.getNb()) + return 1; + if (o1.getNb() > o2.getNb()) + return -1; + return 0; + } +} Modified: trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/src/main/webapp/WEB-INF/web.xml 2010-05-14 15:09:05 UTC (rev 25) +++ trunk/src/main/webapp/WEB-INF/web.xml 2010-05-18 15:21:30 UTC (rev 26) @@ -1,19 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http:/java.sun.com/dtd/web-app_2_3.dtd"> - +  <servlet> <servlet-class>org.chorem.bow.ControllerServlet</servlet-class> <servlet-name>Controller</servlet-name> </servlet> + <servlet> + <servlet-class>org.chorem.bow.OpenSearchXmlServlet</servlet-class> + <servlet-name>XML</servlet-name> + </servlet> - +  <servlet-mapping> <servlet-name>Controller</servlet-name> <url-pattern>/bow</url-pattern> </servlet-mapping> + <servlet-mapping> + <servlet-name>XML</servlet-name> + <url-pattern>/xml</url-pattern> + </servlet-mapping> + </web-app> \ No newline at end of file Modified: trunk/src/main/webapp/generateToken.jsp =================================================================== --- trunk/src/main/webapp/generateToken.jsp 2010-05-14 15:09:05 UTC (rev 25) +++ trunk/src/main/webapp/generateToken.jsp 2010-05-18 15:21:30 UTC (rev 26) @@ -1,3 +1,4 @@ + <%@ page import="org.chorem.bow.TokenActions" %> <%TokenActions tokenActions = (TokenActions) request.getAttribute("tokenActions"); Modified: trunk/src/main/webapp/home.jsp =================================================================== --- trunk/src/main/webapp/home.jsp 2010-05-14 15:09:05 UTC (rev 25) +++ trunk/src/main/webapp/home.jsp 2010-05-18 15:21:30 UTC (rev 26) @@ -1,16 +1,22 @@ -<%String error = (String) request.getAttribute("errorMessage");%> +<% + String error = (String) request.getAttribute("errorMessage"); + String url = request.getRequestURL().toString(); + int index = url.indexOf("home.jsp"); + url = url.substring(0, index); +%> + <html> - <body> - <h1>Login</h1> - <form method="POST" action="bow?action=login"> - email <input type="text" name="email" size="20"><br /> - password <input type=password name="password" size="20"><br /> - <input type="submit" value="login"> - </form> - <%if (error != null) {%> - <font color="red"><%=error%></font> - <%}%> - <br/><a href="bow?action=registration">register</a> - </body> + <body> + <h1>Login</h1> + <form method="POST" action="bow?action=login"> + email <input type="text" name="email" size="20"><br /> + password <input type=password name="password" size="20"><br /> + <input type="submit" value="login"> + </form> + <%if (error != null) {%> + <font color="red"><%=error%></font> + <%}%> + <br/><a href="bow?action=registration">register</a> + </body> </html> \ No newline at end of file Added: trunk/src/main/webapp/openSearchResult.jsp =================================================================== --- trunk/src/main/webapp/openSearchResult.jsp (rev 0) +++ trunk/src/main/webapp/openSearchResult.jsp 2010-05-18 15:21:30 UTC (rev 26) @@ -0,0 +1,104 @@ + +<%@ page import="org.chorem.bow.Bookmark" %> +<%@ page import="org.chorem.bow.BookmarkActions" %> +<%@ 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" %> +<%@ page import="java.util.ArrayList" %> +<%@ page import="java.util.List" %> +<%@ page import="org.chorem.bow.TokenActions" %> + +<% + BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions"); + String searchLine = ""; + if (bookmarkActions != null) { + searchLine = bookmarkActions.getSearchLine(); + } + String url = request.getRequestURL().toString(); + int index = url.indexOf("openSearchResult.jsp"); + url = url.substring(0, index); +%> + +<html> + <body> + <h1>Result</h1> + + <% if (bookmarkActions != null) { + List<Bookmark> bookmarkList = bookmarkActions.getBookmarks(); + if (!bookmarkList.isEmpty()) { + %> + <br/><br/>Results:<br/> + <table border="1"> + <tr> + <th> + Date + <a style="text-decoration:none" href="bow?action=orderAscOS&type=date&searchLine=<%=searchLine%>" > + <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" /> + </a> + <a style="text-decoration:none" href="bow?action=orderDescOS&type=date&searchLine=<%=searchLine%>"> + <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" /> + </a> + </th> + <th> + Name + <a style="text-decoration:none" href="bow?action=orderAscOS&type=name&searchLine=<%=searchLine%>"> + <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" /> + </a> + <a style="text-decoration:none" href="bow?action=orderDescOS&type=name&searchLine=<%=searchLine%>"> + <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" /> + </a> + </th> + <th>Tags</th> + <th> + Click + <a style="text-decoration:none" href="bow?action=orderAscOS&type=click&searchLine=<%=searchLine%>"> + <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" /> + </a> + <a style="text-decoration:none" href="bow?action=orderDescOS&type=click&searchLine=<%=searchLine%>"> + <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> + <td> + <%=sdf.format(bookmark.getDate())%> + </td> + <td> + <a href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a> + </td> + <td> + <% + Set<String> tagList = bookmark.getTags(); + if (tagList != null && !tagList.isEmpty()) { + for (String tag : tagList) { + %> + <%=tag%> + <% + } + %> + </td> + <% + } + %> + <td> + <%=bookmark.getClick()%> + </td> + <% + } + %> + </table> + <% + } else { + %> + <br/><br/>No Bookmarks found<br/><br/> + <% } + } + %> + </body> +</html> \ No newline at end of file Added: trunk/src/main/webapp/permanentXml.jsp =================================================================== --- trunk/src/main/webapp/permanentXml.jsp (rev 0) +++ trunk/src/main/webapp/permanentXml.jsp 2010-05-18 15:21:30 UTC (rev 26) @@ -0,0 +1,23 @@ +<%@ page import="org.chorem.bow.TokenActions" %> + +<% + TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); + String token = ""; + if (tokenActions != null) { + token = tokenActions.getPermanentToken(); + } + String url = request.getRequestURL().toString(); + int index = url.indexOf("permanentXml.jsp"); + url = url.substring(0, index); +%> + +<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" + xmlns:moz="http://www.mozilla.org/2006/browser/search/"> + <ShortName>bowTemporarySearchEngine</ShortName> + <Description>bookmarkSearch</Description> + <InputEncoding>inputEncoding</InputEncoding> + <Image width="16" height="16">data:image/x-icon;base64,imageData</Image> + <Url type="text/html" method="GET" template="<%=url%>bow?action=openSearchResult&token=<%=token%>&searchLine={searchTerms}" /> + <Url type="application/x-suggestions+json" method="GET" template="<%=url%>bow?action=openSearchSuggestion&token=<%=token%>&search={searchTerms}" /> + <moz:SearchForm><%=url%>bow</moz:SearchForm> +</OpenSearchDescription> \ No newline at end of file Modified: trunk/src/main/webapp/search.jsp =================================================================== --- trunk/src/main/webapp/search.jsp 2010-05-14 15:09:05 UTC (rev 25) +++ trunk/src/main/webapp/search.jsp 2010-05-18 15:21:30 UTC (rev 26) @@ -10,22 +10,30 @@ <%@ page import="java.util.List" %> <%@ page import="org.chorem.bow.TokenActions" %> - <% - TokenActions tokenActions = (TokenActions) request.getAttribute("tokenActions"); + TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); String temporaryToken = tokenActions.getTemporaryToken(); String permanentToken = tokenActions.getPermanentToken(); BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions"); + String searchLine = ""; + if (bookmarkActions != null) { + searchLine = bookmarkActions.getSearchLine(); + } + String url = request.getRequestURL().toString(); + int index = url.indexOf("search.jsp"); + url = url.substring(0, index); %> <html> + <link rel="search" type="application/opensearchdescription+xml" title="bowTemporarySearchEngine" href="<%=url%>bow?action=temporaryXml" /> + <link rel="search" type="application/opensearchdescription+xml" title="bowPermanentSearchEngine" href="<%=url%>bow?action=permanentXml" /> <body> <a href="bow?action=logout">Logout</a><br/> - <a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='http://localhost:8080/bow/bow?action=addUrl&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);">Temporary token</a> + <a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Temporary token</a> <br/> - <a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='http://localhost:8080/bow/bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);">Permanent token</a> + <a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Current permanent token</a> <br/> - <a href="bow?action=generateToken">Generate Permanent Token</a><br/><br/> + <a href="bow?action=generateToken&searchLine=<%=searchLine%>">Regenerate Permanent Token</a><br/><br/> <h1>Search</h1> @@ -38,7 +46,7 @@ <br/><br/><a href="bow?action=generateToken">Generate Token</a><br/><br/> <form method="POST" action="bow?action=search"> - <input type="text" name="words" size="20" value="<%=bookmarkActions.getSearchLine()%>" /><br /> + <input type="text" name="searchLine" size="20" value="<%=searchLine%>" /><br /> <input type="submit" value="Find" /> </form> @@ -50,11 +58,10 @@ int font = bookmarkActions.getFont(value); %> - <FONT SIZE="<%=font%>" ><a href="bow?action=clickOnTag&tag=<%=tag%>"><%=tag%></a></FONT> + <FONT SIZE="<%=font%>" ><a href="bow?action=search&addTag=<%=tag%>&searchLine=<%=searchLine%>"><%=tag%></a></FONT> <% } - List<String> tagsSearch = bookmarkActions.getTagsSearch(); List<Bookmark> bookmarkList = bookmarkActions.getBookmarks(); if (!bookmarkList.isEmpty()) { %> @@ -64,19 +71,19 @@ <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&searchLine=<%=searchLine%>" > <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"> + <a style="text-decoration:none" href="bow?action=orderDesc&type=date&searchLine=<%=searchLine%>"> <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" /> </a> </th> <th> Name - <a style="text-decoration:none" href="bow?action=orderAsc&type=name"> + <a style="text-decoration:none" href="bow?action=orderAsc&type=name&searchLine=<%=searchLine%>"> <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" /> </a> - <a style="text-decoration:none" href="bow?action=orderDesc&type=name"> + <a style="text-decoration:none" href="bow?action=orderDesc&type=name&searchLine=<%=searchLine%>"> <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" /> </a> </th> @@ -84,10 +91,10 @@ <th>Edit</th> <th> Click - <a style="text-decoration:none" href="bow?action=orderAsc&type=click"> + <a style="text-decoration:none" href="bow?action=orderAsc&type=click&searchLine=<%=searchLine%>"> <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"> + <a style="text-decoration:none" href="bow?action=orderDesc&type=click&searchLine=<%=searchLine%>"> <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" /> </a> </th> @@ -98,7 +105,7 @@ %> <tr> <td> - <a style="border:none;" href="bow?action=removeBookmark&bookmarkId=<%=bookmark.getWikittyId()%>"> + <a style="border:none;" href="bow?action=removeBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>"> <IMG style="border:none;" SRC="img/remove.png" ALT="Remove bookmark" TITLE="Remove" /> </a> </td> @@ -115,22 +122,20 @@ for (String tag : tagList) { %> <%=tag%> - <a style="text-decoration:none" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&tag=<%=tag%>"> + <a style="text-decoration:none" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>&searchLine=<%=searchLine%>"> <IMG style="border:none" SRC="img/delete.png" ALT="Delete tag" TITLE="Delete" /> </a> <% - } + } + } %> </td> <td> - <form style="display: inline" method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>"> + <form style="display: inline" method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>"> <input type="text" name="nameAndTags" size="50" value="<%=bookmark.getDescription()%>|tag1 tag2 tag3" /> <input type="image" src="img/edit.png" title="Edit"/> </form> </td> - <% - } - %> <td> <%=bookmark.getClick()%> </td> Added: trunk/src/main/webapp/suggestions.jsp =================================================================== --- trunk/src/main/webapp/suggestions.jsp (rev 0) +++ trunk/src/main/webapp/suggestions.jsp 2010-05-18 15:21:30 UTC (rev 26) @@ -0,0 +1,21 @@ + +<%@page import="org.chorem.bow.OpenSearchActions" %> +<%@page import="org.chorem.bow.Suggestion" %> +<%@page import="java.util.List" %> +<%@page import="java.util.Iterator" %> + + +<% + OpenSearchActions osa = (OpenSearchActions) request.getAttribute("openSearchAction"); + if (osa != null) { + String[] word = osa.getSearch(); + if (word != null) { + List<Suggestion> suggestions = osa.getSuggestionList(); + if (suggestions != null) { +%> +<%=osa.getJsonResult()%> +<% + } + } + } +%> \ No newline at end of file Added: trunk/src/main/webapp/temporaryXml.jsp =================================================================== --- trunk/src/main/webapp/temporaryXml.jsp (rev 0) +++ trunk/src/main/webapp/temporaryXml.jsp 2010-05-18 15:21:30 UTC (rev 26) @@ -0,0 +1,23 @@ +<%@ page import="org.chorem.bow.TokenActions" %> + +<% + TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); + String token = ""; + if (tokenActions != null) { + token = tokenActions.getTemporaryToken(); + } + String url = request.getRequestURL().toString(); + int index = url.indexOf("temporaryXml.jsp"); + url = url.substring(0, index); +%> + +<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" + xmlns:moz="http://www.mozilla.org/2006/browser/search/"> + <ShortName>bowTemporarySearchEngine</ShortName> + <Description>bookmarkSearch</Description> + <InputEncoding>inputEncoding</InputEncoding> + <Image width="16" height="16">data:image/x-icon;base64,imageData</Image> + <Url type="text/html" method="GET" template="<%=url%>bow?action=openSearchResult&token=<%=token%>&searchLine={searchTerms}" /> + <Url type="application/x-suggestions+json" method="GET" template="<%=url%>bow?action=openSearchSuggestion&token=<%=token%>&search={searchTerms}" /> + <moz:SearchForm><%=url%>bow</moz:SearchForm> +</OpenSearchDescription> \ No newline at end of file

1 0

r25 - in trunk: . src/main/java/org/chorem/bow src/main/webapp
by bbrossaud＠users.chorem.org May 14, 2010

May 14, 2010

Author: bbrossaud Date: 2010-05-14 17:09:05 +0200 (Fri, 14 May 2010) New Revision: 25 Url: http://chorem.org/repositories/revision/bow/25 Log: Session and temporary token works Modified: trunk/TODO.txt trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/java/org/chorem/bow/TokenActions.java trunk/src/main/webapp/search.jsp Modified: trunk/TODO.txt =================================================================== --- trunk/TODO.txt 2010-05-14 09:52:06 UTC (rev 24) +++ trunk/TODO.txt 2010-05-14 15:09:05 UTC (rev 25) @@ -1,12 +1,12 @@ le 11 mai 2010 A faire pour le vendredi 28 mai: --> edition, suppression bookmark + tag (14 mai) --> triage multiple(nbre de clics, date d'ajout, Alpha) (14 mai) +-> edition, suppression bookmark + tag (14 mai) OK +-> triage multiple(nbre de clics, date d'ajout, Alpha) (14 mai) OK -> token temporaire (14 mai) -> completion ==> openSearch(xml) ==> meta(ex:<link rel="search" type="application/opensearchdescription+xml" href="/w/opensearch_desc.php" title="Wikip�dia (fr)" />) -> le && pour le nuage de tag (11 mai) OK --> gestion des sessions +-> gestion des sessions (14 mai) -> javascript ==> var script = document.createElement('script');script.src = url;script.type='text/javascript';document.body.appendChild(script); (11 mai) NOK -> Mise en forme (28 mai) \ No newline at end of file Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-14 09:52:06 UTC (rev 24) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-14 15:09:05 UTC (rev 25) @@ -11,13 +11,11 @@ import java.io.IOException; import java.security.NoSuchAlgorithmException; import java.util.List; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.sharengo.wikitty.Criteria; @@ -33,7 +31,6 @@ private static final Log log = LogFactory.getLog(ControllerServlet.class); protected Model model = new Model(); protected BookmarkActions bookmarkActions = new BookmarkActions(); - protected User user = null; protected TokenActions tokenActions = new TokenActions(); protected String error = ""; @@ -50,8 +47,9 @@ @Override public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { -// try { - error = ""; + try { + HttpSession session = request.getSession(true); + User user = (User) session.getAttribute("user"); String action = request.getParameter("action"); response.setContentType("text/html"); request.setAttribute("bookmarkActions", bookmarkActions); @@ -61,7 +59,7 @@ if (log.isDebugEnabled()) { log.debug("Going to actionRegister"); } - this.actionRegister(request, response); + this.actionRegister(request, response, session); } else if (action.equals("registration")) { if (log.isDebugEnabled()) { if (log.isDebugEnabled()) { @@ -73,82 +71,90 @@ if (log.isDebugEnabled()) { log.debug("Going to actionLogin"); } - this.actionLogin(request, response); + this.actionLogin(request, response, session); + } else if (action.equals("logout")) { + if (log.isDebugEnabled()) { + log.debug("Going to actionLogin"); + } + this.actionLogout(request, response, session); } else if (action.equals("addUrl")) { if (log.isDebugEnabled()) { log.debug("Going to actionAddUrl"); } - this.actionAddUrl(request, response); + this.actionAddUrl(request, response, session); } else if (action.equals("search") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionSearch"); } - this.actionSearch(request, response); + this.actionSearch(request, response, user); } else if (action.equals("clickOnTag") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionClickOnTag"); } - this.actionClickOnTag(request, response); + this.actionClickOnTag(request, response, user); } else if (action.equals("generateToken") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionGenerateToken"); } try { - this.actionGenerateToken(request, response); + this.actionGenerateToken(request, response, user); } catch (NoSuchAlgorithmException ex) { log.error("No Such Algorithm", ex); request.getRequestDispatcher("error.jsp").forward(request, response); } - } else if (action.equals("deleteTag")) { + } else if (action.equals("deleteTag") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionDeleteTag"); } - this.actionDeleteTag(request, response); - } else if (action.equals("removeBookmark")) { + this.actionDeleteTag(request, response, user); + } else if (action.equals("removeBookmark") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionRemoveBookmark"); } - this.actionRemoveBookmark(request, response); - } else if (action.equals("editBookmark")) { + this.actionRemoveBookmark(request, response, user); + } else if (action.equals("editBookmark") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionEditBookmark"); } - this.actionEditBookmark(request, response); - } else if (action.equals("orderAsc")) { + this.actionEditBookmark(request, response, user); + } else if (action.equals("orderAsc") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionOrderAsc"); } - this.actionOrderAsc(request, response); - } else if (action.equals("orderDesc")) { + this.actionOrderAsc(request, response, user); + } else if (action.equals("orderDesc") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionOrderDesc"); } - this.actionOrderDesc(request, response); - } else if (action.equals("addClick")) { + this.actionOrderDesc(request, response, user); + } else if (action.equals("addClick") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionAddClic"); } this.actionAddClick(request, response); } else { - user = null; if (log.isDebugEnabled()) { log.debug("Going to home"); } request.getRequestDispatcher("home.jsp").forward(request, response); } } else { - user = null; if (log.isDebugEnabled()) { log.debug("Going to home"); } request.getRequestDispatcher("home.jsp").forward(request, response); } request.setAttribute("errorMessage", error); -// } catch (Exception eee) { -// request.getRequestDispatcher("error.jsp").forward(request, response); -// } + } catch (Exception eee) { + request.getRequestDispatcher("error.jsp").forward(request, response); + } } + protected void actionLogout(HttpServletRequest request, HttpServletResponse response, HttpSession session) + throws IOException, ServletException { + session.invalidate(); + request.getRequestDispatcher("home.jsp").forward(request, response); + } protected void actionAddClick(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { @@ -167,7 +173,7 @@ } } - protected void actionOrderAsc(HttpServletRequest request, HttpServletResponse response) + protected void actionOrderAsc(HttpServletRequest request, HttpServletResponse response, User user) throws IOException, ServletException { String type = request.getParameter("type"); if (type != null && !type.isEmpty()) { @@ -197,7 +203,7 @@ request.getRequestDispatcher("search.jsp").forward(request, response); } - protected void actionOrderDesc(HttpServletRequest request, HttpServletResponse response) + protected void actionOrderDesc(HttpServletRequest request, HttpServletResponse response, User user) throws IOException, ServletException { String type = request.getParameter("type"); if (type != null && !type.isEmpty()) { @@ -227,7 +233,7 @@ request.getRequestDispatcher("search.jsp").forward(request, response); } - protected void actionEditBookmark(HttpServletRequest request, HttpServletResponse response) + protected void actionEditBookmark(HttpServletRequest request, HttpServletResponse response, User user) throws IOException, ServletException { String nameAndTags = request.getParameter("nameAndTags"); String bookmarkId = request.getParameter("bookmarkId"); @@ -250,7 +256,7 @@ request.getRequestDispatcher("search.jsp").forward(request, response); } - protected void actionRemoveBookmark(HttpServletRequest request, HttpServletResponse response) + protected void actionRemoveBookmark(HttpServletRequest request, HttpServletResponse response, User user) throws IOException, ServletException { String bookmarkId = request.getParameter("bookmarkId"); if (bookmarkId != null && !bookmarkId.isEmpty()) { @@ -266,7 +272,7 @@ request.getRequestDispatcher("search.jsp").forward(request, response); } - protected void actionDeleteTag(HttpServletRequest request, HttpServletResponse response) + protected void actionDeleteTag(HttpServletRequest request, HttpServletResponse response, User user) throws IOException, ServletException { String bookmarkId = request.getParameter("bookmarkId"); String tag = request.getParameter("tag"); @@ -294,65 +300,80 @@ * @param response servlet response * @throws ServletException if a servlet error occurs */ - protected void actionGenerateToken(HttpServletRequest request, HttpServletResponse response) + protected void actionGenerateToken(HttpServletRequest request, HttpServletResponse response, User user) throws IOException, ServletException, NoSuchAlgorithmException { WikittyProxy proxy = model.getProxy(); + Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, user.getEmail()).criteria(); + Token currentToken = proxy.findByCriteria(Token.class, criteria); + if (currentToken != null) { + proxy.delete(currentToken.getWikittyId()); + } String token = tokenActions.generateToken(); // Generate an encoding MD5 token - Criteria criteria = Search.query().eq(Token.FQ_FIELD_TOKEN, token).criteria(); + criteria = Search.query().eq(Token.FQ_FIELD_TOKEN, token).criteria(); if (proxy.findByCriteria(Token.class, criteria) == null) { // Check if the token already exists TokenImpl newToken = new TokenImpl(); newToken.setToken(token); newToken.setEmail(user.getEmail()); proxy.store((Token) newToken); // If the token doesn't exist, it is stored - tokenActions.setToken(token); + tokenActions.setPermanentToken(token); } else { - tokenActions.setToken(""); + tokenActions.setPermanentToken(""); } - request.getRequestDispatcher("generateToken.jsp").forward(request, response); + request.getRequestDispatcher("search.jsp").forward(request, response); } /* @param request servlet request * @param response servlet response * @throws ServletException if a servlet error occurs */ - protected void actionAddUrl(HttpServletRequest request, HttpServletResponse response) + protected void actionAddUrl(HttpServletRequest request, HttpServletResponse response, HttpSession session) throws IOException, ServletException { + String token = request.getParameter("token"); // token or not + if (token != null && !token.isEmpty()) { + User user = checkToken(token, session); + addUrl(request, user); + } + else { + User user = (User) session.getAttribute("user"); + if (user != null) { + addUrl(request, user); + actionSearch(request, response, user); + } + } + } + + protected void addUrl(HttpServletRequest request, User user) { String url = request.getParameter("url"); // url of the website String nameAndTags = request.getParameter("nameAndTags"); // name and tags - String token = request.getParameter("token"); // token or not - if (url != null && nameAndTags != null) { - if (user == null) { // If the user is null, it's maybe a bookmark addition by token - user = checkToken(url, nameAndTags, token); + Bookmark bookmark = bookmarkActions.createBookmark(url, nameAndTags, user); + if (bookmark != null) { + WikittyProxy proxy = model.getProxy(); + proxy.store(bookmark); // store the bookmark if all is Ok + if (log.isDebugEnabled()) { + log.debug("Adding URL"); } - if (user != null) { - if (!url.isEmpty() && !nameAndTags.isEmpty()) { - Bookmark bookmark = bookmarkActions.createBookmark(url, nameAndTags, user); - if (bookmark != null) { - WikittyProxy proxy = model.getProxy(); - proxy.store(bookmark); // store the bookmark if all is Ok - if (log.isDebugEnabled()) { - log.debug("Adding URL"); - } - if (token == null) { - this.actionSearch(request, response); - } - } - } - } } } - /* @param url String which contains the bookmark url - * @param nameAndTags String which contains the name and the tags of the - bookmark separated by '|' ==> name|tag1 tag2... - * @param token String which contains the MD5 encoding token + + protected User checkToken(String token, HttpSession session) { + if (checkTemporaryToken(token, session) == true) { + User user = (User) session.getAttribute("user"); + return user; + } + User user = checkPermanentToken(token); + return user; + } + + + /* @param token String which contains the MD5 encoding token * @return null the token doesn't exist * @return User the token owner */ - protected User checkToken(String url, String nameAndTags, String token) { - if (url != null && nameAndTags != null && token != null) { + protected User checkPermanentToken(String token) { + if (token != null) { WikittyProxy proxy = model.getProxy(); Criteria criteria = Search.query().eq(Token.FQ_FIELD_TOKEN, token).criteria(); Token DbToken = proxy.findByCriteria(Token.class, criteria); @@ -365,11 +386,22 @@ return null; } + protected boolean checkTemporaryToken(String token, HttpSession session) { + String temporaryToken = (String) session.getAttribute("temporaryToken"); + if (temporaryToken != null) { + if (temporaryToken.equals(token)) { + return true; + } + } + return false; + + } + /* @param request servlet request * @param response servlet response * @throws ServletException if a servlet error occurs */ - protected void actionClickOnTag(HttpServletRequest request, HttpServletResponse response) + protected void actionClickOnTag(HttpServletRequest request, HttpServletResponse response, User user) throws IOException, ServletException { WikittyProxy proxy = model.getProxy(); String tag = request.getParameter("tag"); @@ -393,7 +425,7 @@ * @param response servlet response * @throws ServletException if a servlet error occurs */ - protected void actionSearch(HttpServletRequest request, HttpServletResponse response) + protected void actionSearch(HttpServletRequest request, HttpServletResponse response, User user) throws IOException, ServletException { WikittyProxy proxy = model.getProxy(); String words = request.getParameter("words"); // retrieve informations taping in the search field @@ -418,8 +450,8 @@ * @param response servlet response * @throws ServletException if a servlet error occurs */ - protected void actionRegister(HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException { + protected void actionRegister(HttpServletRequest request, HttpServletResponse response, HttpSession session) + throws IOException, ServletException, NoSuchAlgorithmException { String email = request.getParameter("email"); String password = request.getParameter("password"); if (this.checkRegister(email, password)) { // check if all is well @@ -429,12 +461,25 @@ UserImpl newUser = new UserImpl(); newUser.setPassword(request.getParameter("password")); newUser.setEmail(request.getParameter("email")); - this.user = proxy.store((User) newUser); // store the new user - if (user == null) { + User login = proxy.store((User) newUser); // store the new user + if (login == null) { request.getRequestDispatcher("error.jsp").forward(request, response); } else { - this.actionSearch(request, response); - error="Email already exist"; + session.setAttribute("user", login); + Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, login.getEmail()).criteria(); + Token token = proxy.findByCriteria(Token.class, criteria); + if (token == null) { + token = new TokenImpl(); + String newToken = tokenActions.generateToken(); + token.setToken(newToken); + token.setEmail(login.getEmail()); + proxy.store(token); + } + tokenActions.setPermanentToken(token.getToken()); + String temporaryToken = tokenActions.generateToken(); + tokenActions.setTemporaryToken(temporaryToken); + session.setAttribute("temporaryToken", temporaryToken); + this.actionSearch(request, response, login); } } } @@ -443,15 +488,29 @@ * @param response servlet response * @throws ServletException if a servlet error occurs */ - protected void actionLogin(HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException { + protected void actionLogin(HttpServletRequest request, HttpServletResponse response, HttpSession session) + throws IOException, ServletException, NoSuchAlgorithmException { String email = request.getParameter("email"); String password = request.getParameter("password"); User login = this.checkLogin(email, password); // check if the user exists if (login != null) { - this.user = login; - this.actionSearch(request, response); + WikittyProxy proxy = model.getProxy(); + session.setAttribute("user", login); + Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, login.getEmail()).criteria(); + Token token = proxy.findByCriteria(Token.class, criteria); + if (token == null) { + token = new TokenImpl(); + String newToken = tokenActions.generateToken(); + token.setToken(newToken); + token.setEmail(login.getEmail()); + proxy.store(token); + } + tokenActions.setPermanentToken(token.getToken()); + String temporaryToken = tokenActions.generateToken(); + tokenActions.setTemporaryToken(temporaryToken); + session.setAttribute("temporaryToken", temporaryToken); + this.actionSearch(request, response, login); } else { error = "Unknow email or incorrect password"; request.getRequestDispatcher("home.jsp").forward(request, response); @@ -497,11 +556,4 @@ return true; } - public void setUser(User user) { - this.user = user; - } - - public User getUser() { - return user; - } } Modified: trunk/src/main/java/org/chorem/bow/TokenActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/TokenActions.java 2010-05-14 09:52:06 UTC (rev 24) +++ trunk/src/main/java/org/chorem/bow/TokenActions.java 2010-05-14 15:09:05 UTC (rev 25) @@ -14,12 +14,17 @@ public class TokenActions { - String token = ""; + String temporaryToken = ""; + String permanentToken = ""; - public String getToken() { - return token; + public String getPermanentToken() { + return permanentToken; } + public String getTemporaryToken() { + return temporaryToken; + } + public String generateToken() throws NoSuchAlgorithmException { Double rand = Math.random() * 1000000; @@ -29,7 +34,11 @@ return tokenGenerated; // return the generate token } - public void setToken(String token) { - this.token = token; + public void setPermanentToken(String token) { + permanentToken = token; } + + public void setTemporaryToken(String token) { + temporaryToken = token; + } } Modified: trunk/src/main/webapp/search.jsp =================================================================== --- trunk/src/main/webapp/search.jsp 2010-05-14 09:52:06 UTC (rev 24) +++ trunk/src/main/webapp/search.jsp 2010-05-14 15:09:05 UTC (rev 25) @@ -8,12 +8,25 @@ <%@ page import="java.util.Set" %> <%@ page import="java.util.ArrayList" %> <%@ page import="java.util.List" %> +<%@ page import="org.chorem.bow.TokenActions" %> -<%BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions");%> +<% + TokenActions tokenActions = (TokenActions) request.getAttribute("tokenActions"); + String temporaryToken = tokenActions.getTemporaryToken(); + String permanentToken = tokenActions.getPermanentToken(); + BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions"); +%> + <html> <body> <a href="bow?action=logout">Logout</a><br/> + <a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='http://localhost:8080/bow/bow?action=addUrl&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);">Temporary token</a> + <br/> + <a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='http://localhost:8080/bow/bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);">Permanent token</a> + <br/> + <a href="bow?action=generateToken">Generate Permanent Token</a><br/><br/> + <h1>Search</h1> <form method="POST" action="bow?action=addUrl"> @@ -106,7 +119,7 @@ <IMG style="border:none" SRC="img/delete.png" ALT="Delete tag" TITLE="Delete" /> </a> <% - } + } %> </td> <td>

1 0

r24 - in trunk/src/main: java/org/chorem/bow resources webapp xmi
by bbrossaud＠users.chorem.org May 14, 2010

May 14, 2010

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)

1 0