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

r47 - in trunk: . src/main/java/org/chorem/bow src/main/webapp
by bbrossaud＠users.chorem.org 31 May '10

31 May '10

Author: bbrossaud Date: 2010-05-31 18:04:07 +0200 (Mon, 31 May 2010) New Revision: 47 Url: http://chorem.org/repositories/revision/bow/47 Log: fulltext research seems to work Modified: trunk/TODO.txt 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/TODO.txt =================================================================== --- trunk/TODO.txt 2010-05-31 13:58:55 UTC (rev 46) +++ trunk/TODO.txt 2010-05-31 16:04:07 UTC (rev 47) @@ -27,3 +27,5 @@ ===> dans class user = String SearchEngine; ===> openSearch ==> proposer des url + +===> facetisations Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-05-31 13:58:55 UTC (rev 46) +++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-05-31 16:04:07 UTC (rev 47) @@ -22,6 +22,7 @@ */ public class BookmarkActions { + protected String fullTextLine = ""; 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 @@ -228,7 +229,29 @@ return ""; } - public void createTagsCloud() { + public void fullText(String line) { + fullTextLine = line; + String[] fullText = line.split("\\s+"); + List<Bookmark> save = new ArrayList<Bookmark>(bookmarks); + for (Bookmark bookmark : save) { + boolean delete = true; + Set<String> tags = bookmark.getTags(); + String name = bookmark.getDescription(); + for (String word : fullText) { + if (tags != null && tags.contains(word)) { + delete = false; + } + if (name.contains(word)) { + delete = false; + } + } + if (delete == true) { + bookmarks.remove(bookmark); + } + } + } + + public void createTagCloud() { tagCloud.clear(); deleteBookmarkBySearch(); createTagClougByBookmarks(); @@ -389,4 +412,8 @@ public int getTmax() { return tmax; } + + public String getFullTextLine() { + return fullTextLine; + } } Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-31 13:58:55 UTC (rev 46) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-31 16:04:07 UTC (rev 47) @@ -207,6 +207,12 @@ log.debug("Going to actionOpenSearchResult"); } this.actionOpenSearchResult(request, response, user, token); + } else if (action.equals("fullText") && user != null) { + if (log.isDebugEnabled()) { + log.debug("Going to actionFullText"); + } + this.actionFullText(request, user); + request.getRequestDispatcher("search.jsp").forward(request, response); } else { if (user != null) { request.getRequestDispatcher("error.jsp").forward(request, response); @@ -361,8 +367,12 @@ } } String searchLine = request.getParameter("searchLine"); + String fullText = request.getParameter("fullTextLine"); + if (fullText == null) { + fullText = ""; + } if (searchLine != null) { - response.sendRedirect("bow?action=search&searchLine=" + searchLine); + response.sendRedirect("bow?action=search&searchLine=" + searchLine + "&fullTextLine=" + fullText); } else { response.sendRedirect("bow?action=home"); } @@ -379,8 +389,12 @@ } } String searchLine = request.getParameter("searchLine"); + String fullText = request.getParameter("fullTextLine"); + if (fullText == null) { + fullText = ""; + } if (searchLine != null) { - response.sendRedirect("bow?action=search&searchLine=" + searchLine); + response.sendRedirect("bow?action=search&searchLine=" + searchLine + "&fullTextLine=" + fullText); } else { response.sendRedirect("bow?action=home"); } @@ -401,8 +415,12 @@ } } String searchLine = request.getParameter("searchLine"); + String fullText = request.getParameter("fullTextLine"); + if (fullText == null) { + fullText = ""; + } if (searchLine != null) { - response.sendRedirect("bow?action=search&searchLine=" + searchLine); + response.sendRedirect("bow?action=search&searchLine=" + searchLine + "&fullTextLine=" + fullText); } else { response.sendRedirect("bow?action=home"); } @@ -436,7 +454,16 @@ tokenActions.setPermanentToken(""); } } - response.sendRedirect("bow?action=home"); + String searchLine = request.getParameter("searchLine"); + String fullText = request.getParameter("fullTextLine"); + if (fullText == null) { + fullText = ""; + } + if (searchLine != null) { + response.sendRedirect("bow?action=search&searchLine=" + searchLine + "&fullTextLine=" + fullText); + } else { + response.sendRedirect("bow?action=home"); + } } /* @param request servlet request @@ -533,17 +560,25 @@ } protected BookmarkActions createBookmarkActions(HttpServletRequest request, List<Bookmark> bookList) { - String words = request.getParameter("searchLine"); // retrieve informations taping in the search field + String fullText = request.getParameter("fullTextLine"); + String searchLine = request.getParameter("searchLine"); // retrieve informations taping in the search field BookmarkActions bookmarkActions = new BookmarkActions(); if (bookList != null) { bookmarkActions.setBookmarks(bookList); } - bookmarkActions.addTags(words); // add the new tags - String tag = request.getParameter("addTag"); - if (tag != null && !tag.isEmpty()) { - bookmarkActions.addTag(tag); + if (fullText != null && !fullText.isEmpty()) { + log.debug("toto"); + bookmarkActions.fullText(fullText); + bookmarkActions.createTagClougByBookmarks(); + bookmarkActions.defineTValues(); + } else { + bookmarkActions.addTags(searchLine); // add the new tags + String tag = request.getParameter("addTag"); + if (tag != null && !tag.isEmpty()) { + bookmarkActions.addTag(tag); + } + bookmarkActions.createTagCloud(); // create the tags cloud with the new informations } - bookmarkActions.createTagsCloud(); // create the tags cloud with the new informations return bookmarkActions; } @@ -702,7 +737,12 @@ } } } - response.sendRedirect("bow?action=home"); + String searchLine = request.getParameter("searchLine"); + if (searchLine != null) { + response.sendRedirect("bow?action=search&searchLine=" + searchLine); + } else { + response.sendRedirect("bow?action=home"); + } } protected void parseHtmlToBookmarks(NodeList list, User user, List<Bookmark> bookmarks, List<String> tagList) @@ -782,4 +822,13 @@ response.sendRedirect("bow?action=home"); } } + + protected void actionFullText(HttpServletRequest request, User user) { + 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(); + BookmarkActions bookmarkActions = createBookmarkActions(request, bookList); + log.debug(bookmarkActions.getBookmarks().size()); + request.setAttribute("bookmarkActions", bookmarkActions); + } } Modified: trunk/src/main/webapp/home.jsp =================================================================== --- trunk/src/main/webapp/home.jsp 2010-05-31 13:58:55 UTC (rev 46) +++ trunk/src/main/webapp/home.jsp 2010-05-31 16:04:07 UTC (rev 47) @@ -245,7 +245,14 @@ </div> </div> <div class="menu"> - <form method="post" action="bow?action=importBookmarks" enctype="multipart/form-data"> + <form method="POST" action="bow?action=fullText" style="text-align: center;"> + Full text research + <input style="float: left" type="text" name="fullTextLine" size="15" value="<%=bookmarkActions.getFullTextLine()%>"/> + <input style="float: left;" type="submit" value="Find" /> + </form> + </div> + <div class="menu"> + <form method="POST" action="bow?action=importBookmarks" enctype="multipart/form-data"> Import Bookmarks <input type="file" name="upfile" /> <input type="submit" value="Import"/> Modified: trunk/src/main/webapp/search.jsp =================================================================== --- trunk/src/main/webapp/search.jsp 2010-05-31 13:58:55 UTC (rev 46) +++ trunk/src/main/webapp/search.jsp 2010-05-31 16:04:07 UTC (rev 47) @@ -17,6 +17,7 @@ String temporaryToken = tokenActions.getTemporaryToken(); String permanentToken = tokenActions.getPermanentToken(); String searchLine = bookmarkActions.getSearchLine(); + String fullText = bookmarkActions.getFullTextLine(); String url = (String) request.getAttribute("bowUrl"); String version = (String) request.getAttribute("version"); %> @@ -41,29 +42,29 @@ <th class="result remove">Remove</th> <th class="result date"> Date - <a style="text-decoration:none" href="bow?action=orderAsc&type=date&searchLine=<%=searchLine%>" > + <a style="text-decoration:none" href="bow?action=orderAsc&type=date&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>" > <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%>"> + <a style="text-decoration:none" href="bow?action=orderDesc&type=date&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> <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%>"> + <a style="text-decoration:none" href="bow?action=orderAsc&type=name&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> <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%>"> + <a style="text-decoration:none" href="bow?action=orderDesc&type=name&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" /> </a> </th> <th class ="result tags">Tags</th> <th class=" result click"> Click - <a style="text-decoration:none" href="bow?action=orderAsc&type=click&searchLine=<%=searchLine%>"> + <a style="text-decoration:none" href="bow?action=orderAsc&type=click&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> <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%>"> + <a style="text-decoration:none" href="bow?action=orderDesc&type=click&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" /> </a> </th> @@ -74,7 +75,7 @@ %> <tr class="result"> <td class="result"> - <a style="border:none;" href="bow?action=removeBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>"> + <a style="border:none;" href="bow?action=removeBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> <IMG style="border:none;" SRC="img/remove.png" ALT="Remove bookmark" TITLE="Remove" /> </a> </td> @@ -89,11 +90,11 @@ %> <td class="result"> <a title ="<%=alias%>" href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a> - <form method="POST" action="bow?action=addAlias&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>" style="display: inline"> + <form method="POST" action="bow?action=addAlias&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>" style="display: inline"> <input type="text" name="alias" size="10" value="<%=bookmark.getAlias()%>" /> <input style="display: inline;" type="submit" value="Add alias" /> </form> - <form method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>"> + <form method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> <input type="text" name="name" size="35" value="<%=bookmark.getDescription()%>" /> <input type="image" src="img/edit.png" title="Edit"/> </form> @@ -105,7 +106,7 @@ for (String tag : tagList) { %> <div style="display: inline"> - <a style="text-decoration:none" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>&searchLine=<%=searchLine%>"> + <a style="text-decoration:none" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> <IMG style="border:none" SRC="img/delete.png" ALT="Delete tag" TITLE="Delete" /> </a> <%=tag%> @@ -114,7 +115,7 @@ } } %> - <form method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>"> + <form method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> <input type="text" name="tags" size="35" value="<%=BookmarkActions.getBookmarkTagsString(bookmark)%>" /> <input type="image" src="img/edit.png" title="Edit"/> </form> @@ -142,10 +143,11 @@ <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%>&fullTextLine=<%=fullText%>">Regenerate permanent token</a></li> </ul> </div> <div class="menu"> - <form method="POST" action="bow?action=addUrl&searchLine=<%=searchLine%>"> + <form method="POST" action="bow?action=addUrl&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> URL<br /> <input type="text" name="url" size="20" value="URL" /><br /> Name<br /> @@ -175,6 +177,22 @@ <input style="float: left" type="submit" value="Find" /> </form> </div> + <div class="menu"> + <form method="POST" action="bow?action=fullText" style="text-align: center;"> + Full text research + <input style="float: left" type="text" name="fullTextLine" size="15" value="<%=bookmarkActions.getFullTextLine()%>" /> + <input style="float: left;" type="submit" value="Find" /> + </form> + </div> + <div class="menu"> + <form method="post" action="bow?action=importBookmarks&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>" enctype="multipart/form-data"> + Import Bookmarks + <input type="file" name="upfile" /> + <input type="submit" value="Import"/> + </form> + <br /> + <a href="bow?action=exportBookmarks&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">Export bookmarks</a> + </div> </div> </div> <div class="Index" id="footer">

1 0

r46 - trunk/src/main/java/org/chorem/bow
by bbrossaud＠users.chorem.org 31 May '10

31 May '10

Author: bbrossaud Date: 2010-05-31 15:58:55 +0200 (Mon, 31 May 2010) New Revision: 46 Url: http://chorem.org/repositories/revision/bow/46 Log: remove bugs on opensearch Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-31 13:54:19 UTC (rev 45) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-31 13:58:55 UTC (rev 46) @@ -207,7 +207,6 @@ log.debug("Going to actionOpenSearchResult"); } this.actionOpenSearchResult(request, response, user, token); - request.getRequestDispatcher("openSearchResult.jsp").forward(request, response); } else { if (user != null) { request.getRequestDispatcher("error.jsp").forward(request, response);

1 0

r45 - trunk/src/main/java/org/chorem/bow
by bbrossaud＠users.chorem.org 31 May '10

31 May '10

Author: bbrossaud Date: 2010-05-31 15:54:19 +0200 (Mon, 31 May 2010) New Revision: 45 Url: http://chorem.org/repositories/revision/bow/45 Log: the opensearch now suggest the url if there are less than 5 bookmarks Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/java/org/chorem/bow/OpenSearchActions.java Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-31 10:21:08 UTC (rev 44) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-31 13:54:19 UTC (rev 45) @@ -12,7 +12,6 @@ import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.Arrays; -import java.util.Date; import java.util.Iterator; import java.util.List; import javax.servlet.ServletException; @@ -182,7 +181,6 @@ 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"); @@ -228,13 +226,19 @@ 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(); - BookmarkActions bookmarkActions = createBookmarkActions(request, bookList); - request.setAttribute("bookmarkActions", bookmarkActions); - request.setAttribute("token", token); + String searchLine = request.getParameter("searchLine"); + if (searchLine != null && searchLine.matches("^http://[^ ]*") && !searchLine.contains(" ")) { + response.sendRedirect(searchLine); + } else { + 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(); + BookmarkActions bookmarkActions = createBookmarkActions(request, bookList); + request.setAttribute("bookmarkActions", bookmarkActions); + request.setAttribute("token", token); + request.getRequestDispatcher("openSearchResult.jsp").forward(request, response); + } } protected void actionOpenSearchSuggestion(HttpServletRequest request, HttpServletResponse response, User user) @@ -244,16 +248,23 @@ 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); String[] words = search.split("\\s+"); List<String> searchLine = new ArrayList<String>(Arrays.asList(words)); if (search.charAt(search.length() - 1) == ' ') { searchLine.add(""); } + Criteria criteria = null; + if (searchLine.size() > 1) { + List<String> cpy = new ArrayList<String>(searchLine); + cpy.remove(cpy.size() - 1); + criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()). + contains(Bookmark.FQ_FIELD_TAGS, cpy).criteria(); + } else { + criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(); + } + List<Bookmark> bookList = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); + openSearchActions.setBookmarkList(bookList); openSearchActions.findSuggestions(searchLine); - log.debug("result={" + openSearchActions.getJsonResult() + "}"); request.setAttribute("openSearchAction", openSearchActions); } } @@ -276,8 +287,8 @@ ++click; bookmark.setClick(click); proxy.store(bookmark); - String url = bookmark.getLink(); - response.sendRedirect(url); + String link = bookmark.getLink(); + response.sendRedirect(link); } } } @@ -445,15 +456,15 @@ } protected void addUrl(HttpServletRequest request, User user) { - String url = request.getParameter("url"); // url of the website + String link = request.getParameter("url"); // url of the website String name = request.getParameter("name"); Bookmark bookmark = null; if (name != null) { String tags = request.getParameter("tags"); // tags - bookmark = BookmarkActions.createBookmark(url, name, tags, user, null); + bookmark = BookmarkActions.createBookmark(link, name, tags, user, null); } else { String nameAndTags = request.getParameter("nameAndTags"); - bookmark = BookmarkActions.createBookmark(url, nameAndTags, user); + bookmark = BookmarkActions.createBookmark(link, nameAndTags, user); } if (bookmark != null) { WikittyProxy proxy = model.getProxy(); @@ -520,7 +531,6 @@ bookmarkActions.emptySearchline(); } request.setAttribute("bookmarkActions", bookmarkActions); - } protected BookmarkActions createBookmarkActions(HttpServletRequest request, List<Bookmark> bookList) { Modified: trunk/src/main/java/org/chorem/bow/OpenSearchActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/OpenSearchActions.java 2010-05-31 10:21:08 UTC (rev 44) +++ trunk/src/main/java/org/chorem/bow/OpenSearchActions.java 2010-05-31 13:54:19 UTC (rev 45) @@ -26,28 +26,20 @@ 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 < (search.length - 1); ++i) { - List<Bookmark> newList = new ArrayList<Bookmark>(bookmarkList); - for (Bookmark bookmark : newList) { - if (!bookmarkHasTag(bookmark, search[i])) { - bookmarkList.remove(bookmark); - } - } - } - fieldSuggestionList(search[i], searchLine); - } + fieldSuggestionList(search[size - 1], searchLine); } protected void fieldSuggestionList(String word, List<String> searchLine) { if (bookmarkList != null) { Map<String, Integer> map = new HashMap<String, Integer>(); - for (Bookmark bookmark : bookmarkList) { + List<Bookmark> save = new ArrayList<Bookmark>(bookmarkList); + for (Bookmark bookmark : save) { Set<String> tagList = bookmark.getTags(); + boolean contain = false; if (tagList != null) { for (String tag : tagList) { if (tag.indexOf(word) == 0 && !searchLine.contains(tag)) { + contain = true; if (map.containsKey(tag)) { Integer count = map.get(tag); ++count; @@ -58,6 +50,9 @@ } } } + if (contain == false) { + bookmarkList.remove(bookmark); + } } Set<String> keys = map.keySet(); for (String key : keys) { @@ -114,6 +109,11 @@ str += ","; } } + if (bookmarkList.size() <= 5 && suggestions.size() > 0) { + for (Bookmark bookmark : bookmarkList) { + str += ",\"" + bookmark.getLink() + "\""; + } + } str += "]"; return str; }

1 0

r44 - in trunk: . src/main/java/org/chorem/bow
by bbrossaud＠users.chorem.org 31 May '10

31 May '10

Author: bbrossaud Date: 2010-05-31 12:21:08 +0200 (Mon, 31 May 2010) New Revision: 44 Url: http://chorem.org/repositories/revision/bow/44 Log: addition tag works if bookmard doesn't have tag, importation adds the folder name as a tag to the bookmark tagList Modified: trunk/TODO.txt trunk/src/main/java/org/chorem/bow/BookmarkActions.java trunk/src/main/java/org/chorem/bow/ControllerServlet.java Modified: trunk/TODO.txt =================================================================== --- trunk/TODO.txt 2010-05-28 15:09:08 UTC (rev 43) +++ trunk/TODO.txt 2010-05-31 10:21:08 UTC (rev 44) @@ -9,4 +9,21 @@ -> le && pour le nuage de tag (11 mai) OK -> gestion des sessions (14 mai) OK -> javascript ==> (11 mai) OK --> Mise en forme (28 mai) \ No newline at end of file +-> Mise en forme (28 mai) + + +===> corriger ajout de tag quand vide + +===> ajout des tags par repertoire + +===> seeks.fr + champs pour recherche + +===> champ recherche fulltext + +===> class bokkmarkFile = Id proprietaire, list<userID> writer, list<userId> reader; + +===> class bookmark = idBookmarkFile a la place de UserID; + +===> dans class user = String SearchEngine; + +===> openSearch ==> proposer des url Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-05-28 15:09:08 UTC (rev 43) +++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-05-31 10:21:08 UTC (rev 44) @@ -30,6 +30,14 @@ protected int tmax = -1; protected int tmin = -1; + public static Bookmark createBookmarkFromHtml(String html, String name, User user) { + String link = getUrlFromHtml(html); + String tags = getTagsFromHtml(html); + Date date = getDateFromHtml(html); + Bookmark bookmark = createBookmark(link, name, tags, user, date); + return bookmark; + } + public static Date getDateFromHtml(String html) { Date date = null; if (html != null) { @@ -140,17 +148,37 @@ } public static void addTagsToBookmark(String tags, Bookmark bookmark) { - if (tags != null) { + if (tags != null && !tags.isEmpty()) { tags = tags.trim(); String[] tagsTab = tags.split("\\s+"); // put the tags in an array for (int i = 0; i < tagsTab.length; ++i) { - if (!tagsTab[i].isEmpty()) { - bookmark.addTags(tagsTab[i]); // Added tag for each rank (one tag by rank) + Set<String> tagList = bookmark.getTags(); + if (tagList != null) { + if (!tagList.contains(tagsTab[i]) && !tagsTab[i].isEmpty()) { + bookmark.addTags(tagsTab[i]); // Added tag for each rank (one tag by rank) + } + } else { + bookmark.addTags(tagsTab[i]); } } } } + public static void addTagsToBookmark(List<String> tagList, Bookmark bookmark) { + if (tagList != null && !tagList.isEmpty()) { + for (String tag : tagList) { + Set<String> bookmarTags = bookmark.getTags(); + if (bookmarTags != null) { + if (!bookmarTags.contains(tag) && !tag.isEmpty()) { + bookmark.addTags(tag); // Added tag for each rank (one tag by rank) + } + } else if (!tag.isEmpty()) { + bookmark.addTags(tag); + } + } + } + } + public static Bookmark createBookmark(String url, String name, String tags, User user, Date date) { Bookmark bookmark = (Bookmark) new BookmarkImpl(); if (name != null) { @@ -190,21 +218,6 @@ } } - public static void updateBookmarkTags(Bookmark bookmark, String tags) { - if (tags != null && !tags.isEmpty()) { - tags = tags.trim(); - String[] tagsTab = tags.split("\\s+"); // put the tags in an array - for (int i = 0; i < tagsTab.length; ++i) { - Set<String> tagList = bookmark.getTags(); - if (tagList != null) { - if (!tagList.contains(tagsTab[i]) && !tagsTab[i].isEmpty()) { - bookmark.addTags(tagsTab[i]); // Added tag for each rank (one tag by rank) - } - } - } - } - } - public static String getBookmarkTagsString(Bookmark bookmark) { if (bookmark != null) { Set<String> tags = bookmark.getTags(); Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-28 15:09:08 UTC (rev 43) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-31 10:21:08 UTC (rev 44) @@ -221,7 +221,8 @@ request.getRequestDispatcher("login.jsp").forward(request, response); } } catch (Exception eee) { - request.getRequestDispatcher("error.jsp").forward(request, response); + throw new ServletException("msg", eee); + // request.getRequestDispatcher("error.jsp").forward(request, response); } } @@ -345,7 +346,7 @@ Bookmark bookmark = proxy.restore(Bookmark.class, bookmarkId); if (bookmark != null) { BookmarkActions.updateBookmarkName(bookmark, name); - BookmarkActions.updateBookmarkTags(bookmark, tags); + BookmarkActions.addTagsToBookmark(tags, bookmark); proxy.store(bookmark); } } @@ -687,7 +688,7 @@ Parser parser = new Parser(content); NodeList list = parser.parse(null); List<Bookmark> bookmarks = new ArrayList<Bookmark>(); - parseHtmlToBookmarks(list, user, bookmarks); + parseHtmlToBookmarks(list, user, bookmarks, new ArrayList<String>()); proxy.store(bookmarks); } } @@ -695,28 +696,39 @@ response.sendRedirect("bow?action=home"); } - protected void parseHtmlToBookmarks(NodeList list, User user, List<Bookmark> bookmarks) + protected void parseHtmlToBookmarks(NodeList list, User user, List<Bookmark> bookmarks, List<String> tagList) throws ParserException { if (list != null) { + boolean isFolder = false; SimpleNodeIterator it = list.elements(); while (it.hasMoreNodes()) { Node node = it.nextNode(); String plainText = node.toPlainTextString(); String text = node.getText(); - if (text != null && text.contains("A HREF")) { - String url = BookmarkActions.getUrlFromHtml(text); - String tags = BookmarkActions.getTagsFromHtml(text); - Date date = BookmarkActions.getDateFromHtml(text); - Bookmark bookmark = BookmarkActions.createBookmark(url, plainText, tags, user, date); + if (text != null && text.startsWith("H3")) { + log.debug(text); + if (plainText != null && !plainText.isEmpty()) { + tagList.add(plainText); + isFolder = true; + } + } else if (text != null && text.startsWith("A HREF")) { + Bookmark bookmark = BookmarkActions.createBookmarkFromHtml(text, plainText, user); + BookmarkActions.addTagsToBookmark(tagList, bookmark); if (bookmark != null) { bookmarks.add(bookmark); } } NodeList children = node.getChildren(); if (children != null) { - parseHtmlToBookmarks(children, user, bookmarks); + parseHtmlToBookmarks(children, user, bookmarks, tagList); } } + if (isFolder == true) { + int index = tagList.size() - 1; + if (index > -1) { + tagList.remove(index); + } + } } }

1 0

r43 - trunk/src/main/java/org/chorem/bow
by bbrossaud＠users.chorem.org 28 May '10

28 May '10

Author: bbrossaud Date: 2010-05-28 17:09:08 +0200 (Fri, 28 May 2010) New Revision: 43 Url: http://chorem.org/repositories/revision/bow/43 Log: remove debug Modified: trunk/src/main/java/org/chorem/bow/AliasServlet.java trunk/src/main/java/org/chorem/bow/ControllerServlet.java Modified: trunk/src/main/java/org/chorem/bow/AliasServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/AliasServlet.java 2010-05-28 15:01:26 UTC (rev 42) +++ trunk/src/main/java/org/chorem/bow/AliasServlet.java 2010-05-28 15:09:08 UTC (rev 43) @@ -4,14 +4,11 @@ */ package org.chorem.bow; -import com.sun.tools.javac.resources.version; import java.io.IOException; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ArgumentsParserException; import org.nuiton.wikitty.Criteria; @@ -24,9 +21,8 @@ */ public class AliasServlet extends HttpServlet { - private static final Log log = LogFactory.getLog(AliasServlet.class); protected Model model = new Model(); - protected String bowUrl = ""; + protected String bowUrl = ""; public AliasServlet() throws ArgumentsParserException { ApplicationConfig config = new ApplicationConfig(); Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-28 15:01:26 UTC (rev 42) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-28 15:09:08 UTC (rev 43) @@ -646,7 +646,7 @@ return true; } - private void actionHome(HttpServletRequest request, User user) { + protected 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); @@ -666,7 +666,7 @@ request.setAttribute("bookmarkActions", bookmarkActions); } - private void actionImportBookmarks(HttpServletRequest request, HttpServletResponse response, User user) + protected void actionImportBookmarks(HttpServletRequest request, HttpServletResponse response, User user) throws IOException, FileUploadException, ParserException { // Check that we have a file upload request boolean isMultipart = ServletFileUpload.isMultipartContent(request); @@ -695,7 +695,7 @@ response.sendRedirect("bow?action=home"); } - private void parseHtmlToBookmarks(NodeList list, User user, List<Bookmark> bookmarks) + protected void parseHtmlToBookmarks(NodeList list, User user, List<Bookmark> bookmarks) throws ParserException { if (list != null) { SimpleNodeIterator it = list.elements(); @@ -720,7 +720,7 @@ } } - private void actionExportBookmarks(HttpServletResponse response, User user) + protected void actionExportBookmarks(HttpServletResponse response, User user) throws IOException { WikittyProxy proxy = model.getProxy(); Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(); @@ -736,7 +736,7 @@ op.close(); } - private void actionAddAlias(HttpServletRequest request, HttpServletResponse response) + protected void actionAddAlias(HttpServletRequest request, HttpServletResponse response) throws IOException { String alias = request.getParameter("alias"); if (alias != null && !alias.isEmpty()) {

1 0

r42 - trunk/src/main/webapp
by bbrossaud＠users.chorem.org 28 May '10

28 May '10

Author: bbrossaud Date: 2010-05-28 17:01:26 +0200 (Fri, 28 May 2010) New Revision: 42 Url: http://chorem.org/repositories/revision/bow/42 Log: remove bugs in jsp Modified: trunk/src/main/webapp/home.jsp trunk/src/main/webapp/search.jsp Modified: trunk/src/main/webapp/home.jsp =================================================================== --- trunk/src/main/webapp/home.jsp 2010-05-28 14:43:51 UTC (rev 41) +++ trunk/src/main/webapp/home.jsp 2010-05-28 15:01:26 UTC (rev 42) @@ -67,8 +67,14 @@ <td class="result"> <%=sdf.format(bookmark.getDate())%> </td> + <% + String alias = bookmark.getAlias(); + if (alias != null && !alias.isEmpty()) { + alias = url + "alias/" + alias; + } + %> <td class="result" style="text-align: left"> - <a href="bow?action=addAlias&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a> + <a title ="<%=alias%>" href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a> <form method="POST" action="bow?action=addAlias&bookmarkId=<%=bookmark.getWikittyId()%>" style="display: inline"> <input type="text" name="alias" size="10" value="<%=bookmark.getAlias()%>" /> <input style="display: inline;" type="submit" value="Add alias" /> @@ -80,9 +86,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 style="display: inline"> <a style="text-decoration:none" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>"> @@ -91,8 +97,8 @@ <%=tag%> </div> <% + } } - } %> <form method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>"> <input type="text" name="tags" size="35" value="<%=BookmarkActions.getBookmarkTagsString(bookmark)%>" /> @@ -131,7 +137,7 @@ </th> </tr> <% - for (Bookmark bookmark : lastBookmarks) { + for (Bookmark bookmark : lastBookmarks) { %> <tr class="result"> <td class="result"> @@ -142,8 +148,14 @@ <td class="result"> <%=sdf.format(bookmark.getDate())%> </td> + <% + String alias = bookmark.getAlias(); + if (alias != null && !alias.isEmpty()) { + alias = url + "alias/" + alias; + } + %> <td class="result" style="text-align: left"> - <a href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a> + <a title ="<%=alias%>" href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a> <form method="POST" action="bow?action=addAlias&bookmarkId=<%=bookmark.getWikittyId()%>" style="display: inline"> <input type="text" name="alias" size="10" value="<%=bookmark.getAlias()%>" /> <input style="display: inline;" type="submit" value="Add alias" /> @@ -155,9 +167,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 style="display: inline"> <a style="text-decoration:none" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>"> @@ -166,8 +178,8 @@ <%=tag%> </div> <% + } } - } %> <form method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>"> <input type="text" name="tags" size="35" value="<%=BookmarkActions.getBookmarkTagsString(bookmark)%>" /> @@ -179,7 +191,7 @@ </td> </tr> <% - } + } %> </table> <% Modified: trunk/src/main/webapp/search.jsp =================================================================== --- trunk/src/main/webapp/search.jsp 2010-05-28 14:43:51 UTC (rev 41) +++ trunk/src/main/webapp/search.jsp 2010-05-28 15:01:26 UTC (rev 42) @@ -81,8 +81,14 @@ <td class="result"> <%=sdf.format(bookmark.getDate())%> </td> + <% + String alias = bookmark.getAlias(); + if (alias != null && !alias.isEmpty()) { + alias = url + "alias/" + alias; + } + %> <td class="result"> - <a href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a> + <a title ="<%=alias%>" href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a> <form method="POST" action="bow?action=addAlias&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>" style="display: inline"> <input type="text" name="alias" size="10" value="<%=bookmark.getAlias()%>" /> <input style="display: inline;" type="submit" value="Add alias" />

1 0

r41 - in trunk/src/main: java/org/chorem/bow resources webapp
by bbrossaud＠users.chorem.org 28 May '10

28 May '10

Author: bbrossaud Date: 2010-05-28 16:43:51 +0200 (Fri, 28 May 2010) New Revision: 41 Url: http://chorem.org/repositories/revision/bow/41 Log: add bow url in properties file Added: trunk/src/main/java/org/chorem/bow/AliasServlet.java trunk/src/main/resources/bow.properties Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/webapp/home.jsp trunk/src/main/webapp/login.jsp trunk/src/main/webapp/openSearchResult.jsp trunk/src/main/webapp/register.jsp trunk/src/main/webapp/search.jsp Added: trunk/src/main/java/org/chorem/bow/AliasServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/AliasServlet.java (rev 0) +++ trunk/src/main/java/org/chorem/bow/AliasServlet.java 2010-05-28 14:43:51 UTC (rev 41) @@ -0,0 +1,74 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package org.chorem.bow; + +import com.sun.tools.javac.resources.version; +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.ArgumentsParserException; +import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.search.Search; + +/** + * + * @author bbrossaud + */ +public class AliasServlet extends HttpServlet { + + private static final Log log = LogFactory.getLog(AliasServlet.class); + protected Model model = new Model(); + protected String bowUrl = ""; + + public AliasServlet() throws ArgumentsParserException { + ApplicationConfig config = new ApplicationConfig(); + config.setConfigFileName("bow.properties"); + config.parse(new String[]{}); + bowUrl = config.getOption("bow.url"); + } + + @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 { + try { + String url = request.getRequestURL().toString(); + int index = url.indexOf("alias"); + index += 5; + String alias = url.substring(index); + if (alias != null && !alias.isEmpty()) { + alias = alias.substring(1); + WikittyProxy proxy = model.getProxy(); + Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_ALIAS, alias).criteria(); + Bookmark bookmark = proxy.findByCriteria(Bookmark.class, criteria); + if (bookmark != null) { + String redirect = bookmark.getLink(); + response.sendRedirect(redirect); + } else { + response.sendRedirect(bowUrl); + } + } else { + response.sendRedirect(bowUrl); + } + } catch (Exception eee) { + request.getRequestDispatcher("error.jsp").forward(request, response); + } + } +} Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-28 14:12:51 UTC (rev 40) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-28 14:43:51 UTC (rev 41) @@ -47,12 +47,20 @@ private static final Log log = LogFactory.getLog(ControllerServlet.class); protected Model model = new Model(); protected String version = ""; + protected String url = ""; - public ControllerServlet() throws ArgumentsParserException { + public ControllerServlet() throws ArgumentsParserException, Exception { ApplicationConfig config = new ApplicationConfig(); config.setConfigFileName("bow.properties"); config.parse(new String[]{}); version = config.getOption("application.version"); + url = config.getOption("bow.url"); + if (url == null) { + throw new Exception("No bow.url=\"SERVER URL\" in bow.properties"); + } + if (url.charAt(url.length() - 1) != '/') { + url += '/'; + } } @Override @@ -70,6 +78,7 @@ throws IOException, ServletException { try { request.setAttribute("version", version); + request.setAttribute("bowUrl", url); HttpSession session = request.getSession(true); User user = (User) session.getAttribute("user"); String token = request.getParameter("token"); // token or not Added: trunk/src/main/resources/bow.properties =================================================================== --- trunk/src/main/resources/bow.properties (rev 0) +++ trunk/src/main/resources/bow.properties 2010-05-28 14:43:51 UTC (rev 41) @@ -0,0 +1,2 @@ +application.version=${project.version} +bow.url=http://localhost:8080/bow/ Modified: trunk/src/main/webapp/home.jsp =================================================================== --- trunk/src/main/webapp/home.jsp 2010-05-28 14:12:51 UTC (rev 40) +++ trunk/src/main/webapp/home.jsp 2010-05-28 14:43:51 UTC (rev 41) @@ -16,9 +16,7 @@ if (tokenActions != null && bookmarkActions != null) { String temporaryToken = tokenActions.getTemporaryToken(); String permanentToken = tokenActions.getPermanentToken(); - String url = request.getRequestURL().toString(); - int index = url.indexOf("home.jsp"); - url = url.substring(0, index); + String url = (String) request.getAttribute("bowUrl"); String version = (String) request.getAttribute("version"); %> Modified: trunk/src/main/webapp/login.jsp =================================================================== --- trunk/src/main/webapp/login.jsp 2010-05-28 14:12:51 UTC (rev 40) +++ trunk/src/main/webapp/login.jsp 2010-05-28 14:43:51 UTC (rev 41) @@ -1,7 +1,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> <% String error = (String) request.getAttribute("msgError"); - String url = request.getRequestURL().toString(); + String url = (String) request.getAttribute("bowUrl"); String version = (String) request.getAttribute("version"); %> Modified: trunk/src/main/webapp/openSearchResult.jsp =================================================================== --- trunk/src/main/webapp/openSearchResult.jsp 2010-05-28 14:12:51 UTC (rev 40) +++ trunk/src/main/webapp/openSearchResult.jsp 2010-05-28 14:43:51 UTC (rev 41) @@ -16,9 +16,7 @@ if (bookmarkActions != null) { searchLine = bookmarkActions.getSearchLine(); } - String url = request.getRequestURL().toString(); - int index = url.indexOf("openSearchResult.jsp"); - url = url.substring(0, index); + String url = (String) request.getAttribute("bowUrl"); %> <html> Modified: trunk/src/main/webapp/register.jsp =================================================================== --- trunk/src/main/webapp/register.jsp 2010-05-28 14:12:51 UTC (rev 40) +++ trunk/src/main/webapp/register.jsp 2010-05-28 14:43:51 UTC (rev 41) @@ -1,9 +1,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> <% String error = (String) request.getAttribute("msgError"); - String url = request.getRequestURL().toString(); - int index = url.indexOf("register.jsp"); - url = url.substring(0, index); + String url = (String) request.getAttribute("bowUrl"); String version = (String) request.getAttribute("version"); %> <html> Modified: trunk/src/main/webapp/search.jsp =================================================================== --- trunk/src/main/webapp/search.jsp 2010-05-28 14:12:51 UTC (rev 40) +++ trunk/src/main/webapp/search.jsp 2010-05-28 14:43:51 UTC (rev 41) @@ -17,9 +17,7 @@ String temporaryToken = tokenActions.getTemporaryToken(); String permanentToken = tokenActions.getPermanentToken(); String searchLine = bookmarkActions.getSearchLine(); - String url = request.getRequestURL().toString(); - int index = url.indexOf("search.jsp"); - url = url.substring(0, index); + String url = (String) request.getAttribute("bowUrl"); String version = (String) request.getAttribute("version"); %>

1 0

r40 - in trunk/src/main: java/org/chorem/bow webapp
by bbrossaud＠users.chorem.org 28 May '10

28 May '10

Author: bbrossaud Date: 2010-05-28 16:12:51 +0200 (Fri, 28 May 2010) New Revision: 40 Url: http://chorem.org/repositories/revision/bow/40 Log: addition link on home Modified: 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/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-28 13:49:55 UTC (rev 39) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-28 14:12:51 UTC (rev 40) @@ -48,7 +48,6 @@ protected Model model = new Model(); protected String version = ""; - public ControllerServlet() throws ArgumentsParserException { ApplicationConfig config = new ApplicationConfig(); config.setConfigFileName("bow.properties"); @@ -76,7 +75,6 @@ String token = request.getParameter("token"); // token or not if (token != null && !token.isEmpty()) { user = checkToken(token, session); - log.debug(session.getAttribute("user")); } String action = request.getParameter("action"); if (action != null) { @@ -204,14 +202,17 @@ this.actionOpenSearchResult(request, response, user, token); request.getRequestDispatcher("openSearchResult.jsp").forward(request, response); } else { - request.getRequestDispatcher("error.jsp").forward(request, response); + if (user != null) { + request.getRequestDispatcher("error.jsp").forward(request, response); + } else { + request.getRequestDispatcher("login.jsp").forward(request, response); + } } } else { request.getRequestDispatcher("login.jsp").forward(request, response); } } catch (Exception eee) { - throw new ServletException("DO GET ERROR", eee); -// request.getRequestDispatcher("error.jsp").forward(request, response); + request.getRequestDispatcher("error.jsp").forward(request, response); } } @@ -726,7 +727,7 @@ op.close(); } - private void actionAddAlias(HttpServletRequest request, HttpServletResponse response) + private void actionAddAlias(HttpServletRequest request, HttpServletResponse response) throws IOException { String alias = request.getParameter("alias"); if (alias != null && !alias.isEmpty()) { Modified: trunk/src/main/webapp/home.jsp =================================================================== --- trunk/src/main/webapp/home.jsp 2010-05-28 13:49:55 UTC (rev 39) +++ trunk/src/main/webapp/home.jsp 2010-05-28 14:12:51 UTC (rev 40) @@ -28,7 +28,10 @@ <link rel="search" type="application/opensearchdescription+xml" title="bowPermanentSearchEngine" href="<%=url%>bow?action=permanentXml" /> <body> <div id="table"> - <h1 class="result">Home</h1> + <h1 class="result"> + <a style="float: left;font-size: 12px; margin-left: 10px;" href="<%=url%>bow?action=home">home</a> + Home + </h1> <% if (bookmarkActions != null) { List<Bookmark> bookmarkList = bookmarkActions.getBookmarks(); Modified: trunk/src/main/webapp/search.jsp =================================================================== --- trunk/src/main/webapp/search.jsp 2010-05-28 13:49:55 UTC (rev 39) +++ trunk/src/main/webapp/search.jsp 2010-05-28 14:12:51 UTC (rev 40) @@ -12,17 +12,15 @@ <% 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); - String version = (String) request.getAttribute("version"); + if (tokenActions != null && bookmarkActions != null) { + String temporaryToken = tokenActions.getTemporaryToken(); + String permanentToken = tokenActions.getPermanentToken(); + String searchLine = bookmarkActions.getSearchLine(); + String url = request.getRequestURL().toString(); + int index = url.indexOf("search.jsp"); + url = url.substring(0, index); + String version = (String) request.getAttribute("version"); %> <html> @@ -31,11 +29,14 @@ <link rel="search" type="application/opensearchdescription+xml" title="bowPermanentSearchEngine" href="<%=url%>bow?action=permanentXml" /> <body> <div id="table"> - <h1 class="result">My Bookmarks</h1> + <h1 class="result"> + <a style="float: left;font-size: 12px; margin-left: 10px;" href="<%=url%>bow?action=home">home</a> + My Bookmarks + </h1> <% - if (bookmarkActions != null) { - List<Bookmark> bookmarkList = bookmarkActions.getBookmarks(); - if (!bookmarkList.isEmpty()) { + if (bookmarkActions != null) { + List<Bookmark> bookmarkList = bookmarkActions.getBookmarks(); + if (!bookmarkList.isEmpty()) { %> <table class="result"> <tr class="result"> @@ -70,8 +71,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"> @@ -84,7 +85,7 @@ </td> <td class="result"> <a href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a> - <form method="POST" action="bow?action=addAlias&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>" style="display: inline"> + <form method="POST" action="bow?action=addAlias&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>" style="display: inline"> <input type="text" name="alias" size="10" value="<%=bookmark.getAlias()%>" /> <input style="display: inline;" type="submit" value="Add alias" /> </form> @@ -95,9 +96,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 style="display: inline"> <a style="text-decoration:none" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>&searchLine=<%=searchLine%>"> @@ -106,8 +107,8 @@ <%=tag%> </div> <% + } } - } %> <form method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>"> <input type="text" name="tags" size="35" value="<%=BookmarkActions.getBookmarkTagsString(bookmark)%>" /> @@ -119,15 +120,15 @@ </td> </tr> <% - } + } %> </table> <% - } else { + } else { %> <h2 class="result">No Bookmarks</h2> <% } - } + } %> </div> <div id="menu"> @@ -154,16 +155,16 @@ <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); + 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="15" value="<%=searchLine%>" /> @@ -182,4 +183,5 @@ <a shape="rect" href="http://list.chorem.org/cgi-bin/mailman/listinfo/bow-users">Support utilisateur</a> </div> </body> -</html> \ No newline at end of file +</html> +<%}%> \ No newline at end of file

1 0

r39 - trunk/src/main/webapp
by bbrossaud＠users.chorem.org 28 May '10

28 May '10

Author: bbrossaud Date: 2010-05-28 15:49:55 +0200 (Fri, 28 May 2010) New Revision: 39 Url: http://chorem.org/repositories/revision/bow/39 Log: remove bug on javascript Modified: trunk/src/main/webapp/home.jsp Modified: trunk/src/main/webapp/home.jsp =================================================================== --- trunk/src/main/webapp/home.jsp 2010-05-28 13:46:00 UTC (rev 38) +++ trunk/src/main/webapp/home.jsp 2010-05-28 13:49:55 UTC (rev 39) @@ -194,8 +194,8 @@ <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);if%20(nameAndTags!=(document.title+'|')){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);if%20(nameAndTags!=(document.title+'|')){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="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+'|');if%20(nameAndTags!=(document.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+'|');if%20(nameAndTags!=(document.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">Regenerate permanent token</a></li> </ul> </div>

1 0

r38 - in trunk/src/main: java/org/chorem/bow webapp
by bbrossaud＠users.chorem.org 28 May '10

28 May '10

Author: bbrossaud Date: 2010-05-28 15:46:00 +0200 (Fri, 28 May 2010) New Revision: 38 Url: http://chorem.org/repositories/revision/bow/38 Log: remove bug on javascript Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/webapp/home.jsp Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-28 12:47:46 UTC (rev 37) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-28 13:46:00 UTC (rev 38) @@ -76,6 +76,7 @@ String token = request.getParameter("token"); // token or not if (token != null && !token.isEmpty()) { user = checkToken(token, session); + log.debug(session.getAttribute("user")); } String action = request.getParameter("action"); if (action != null) { @@ -209,7 +210,8 @@ request.getRequestDispatcher("login.jsp").forward(request, response); } } catch (Exception eee) { - request.getRequestDispatcher("error.jsp").forward(request, response); + throw new ServletException("DO GET ERROR", eee); +// request.getRequestDispatcher("error.jsp").forward(request, response); } } Modified: trunk/src/main/webapp/home.jsp =================================================================== --- trunk/src/main/webapp/home.jsp 2010-05-28 12:47:46 UTC (rev 37) +++ trunk/src/main/webapp/home.jsp 2010-05-28 13:46:00 UTC (rev 38) @@ -12,13 +12,14 @@ <% TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); - String temporaryToken = tokenActions.getTemporaryToken(); - String permanentToken = tokenActions.getPermanentToken(); BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions"); - String url = request.getRequestURL().toString(); - int index = url.indexOf("home.jsp"); - url = url.substring(0, index); - String version = (String) request.getAttribute("version"); + if (tokenActions != null && bookmarkActions != null) { + String temporaryToken = tokenActions.getTemporaryToken(); + String permanentToken = tokenActions.getPermanentToken(); + String url = request.getRequestURL().toString(); + int index = url.indexOf("home.jsp"); + url = url.substring(0, index); + String version = (String) request.getAttribute("version"); %> <html> @@ -29,9 +30,9 @@ <div id="table"> <h1 class="result">Home</h1> <% - if (bookmarkActions != null) { - List<Bookmark> bookmarkList = bookmarkActions.getBookmarks(); - if (!bookmarkList.isEmpty()) { + if (bookmarkActions != null) { + List<Bookmark> bookmarkList = bookmarkActions.getBookmarks(); + if (!bookmarkList.isEmpty()) { %> <h2 class="result">The most used bookmarks</h2> <table class="result"> @@ -53,8 +54,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"> @@ -102,12 +103,12 @@ </td> </tr> <% - } + } %> </table> <% - List<Bookmark> lastBookmarks = bookmarkActions.getLastBookmarks(); - if (!lastBookmarks.isEmpty()) { + List<Bookmark> lastBookmarks = bookmarkActions.getLastBookmarks(); + if (!lastBookmarks.isEmpty()) { %> <h2 class="result">The last addition bookmarks</h2> <table class="result"> @@ -181,20 +182,20 @@ %> </table> <% - } - } else { + } + } 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="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);if%20(nameAndTags!=(document.title+'|')){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);if%20(nameAndTags!=(document.title+'|')){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">Regenerate permanent token</a></li> </ul> </div> @@ -213,16 +214,16 @@ <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); + 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%>" 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="15" /> @@ -250,4 +251,5 @@ <a shape="rect" href="http://list.chorem.org/cgi-bin/mailman/listinfo/bow-users">Support utilisateur</a> </div> </body> -</html> \ No newline at end of file +</html> +<%}%> \ No newline at end of file

1 0