Author: bbrossaud Date: 2010-05-25 16:21:33 +0200 (Tue, 25 May 2010) New Revision: 34 Url: http://chorem.org/repositories/revision/bow/34 Log: addition a tag area and a name area for the bookmark addition Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/webapp/css/styles.css 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-25 13:16:43 UTC (rev 33) +++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-05-25 14:21:33 UTC (rev 34) @@ -55,11 +55,10 @@ } tags = tags.trim(); String[] tagsTab = tags.split("\\s+"); // put the tags in an array - if (tagsTab.length == 0) { - return null; - } for (int i = 0; i < tagsTab.length; ++i) { - bookmark.addTags(tagsTab[i]); // Added tag for each rank (one tag by rank) + if (!tagsTab[i].isEmpty()) { + bookmark.addTags(tagsTab[i]); // Added tag for each rank (one tag by rank) + } } if (url != null && !url.isEmpty()) { @@ -75,25 +74,50 @@ return bookmark; } - 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 + public static Bookmark createBookmark(String url, String name, String tags, User user) { + Bookmark bookmark = (Bookmark) new BookmarkImpl(); + if (name != null) { name = name.trim(); - bookmark.setDescription(name); // set the description (website name) + bookmark.setDescription(name); } + else { + bookmark.setDescription(""); + } + 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]); + } + } + } + if (url != null) { + bookmark.setLink(url); + } else { + bookmark.setLink(""); + } + bookmark.setClick(0); + bookmark.setEmail(user.getEmail()); // set the email (user name) + bookmark.setDate(new Date()); // set the date + return bookmark; + } - String tags = nameAndTags; - if (nameIndex >= 0) { - tags = nameAndTags.substring(nameIndex + 1); // get tags, +1 because of '|' + public static void updateBookmarkName(Bookmark bookmark, String name) { + if (name != null) { + name = name.trim(); + bookmark.setDescription(name); } - tags = tags.trim(); - String[] tagsTab = tags.split("\\s+"); // put the tags in an array - if (tagsTab.length != 0) { + } + + 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])) { + if (!tagList.contains(tagsTab[i]) && !tagsTab[i].isEmpty()) { bookmark.addTags(tagsTab[i]); // Added tag for each rank (one tag by rank) } } @@ -101,6 +125,16 @@ } } + public static String getBookmarkTagsString(Bookmark bookmark) { + if (bookmark != null) { + Set<String> tags = bookmark.getTags(); + if (tags != null) { + return StringUtil.join(tags, " ", true); + } + } + return ""; + } + public void createTagsCloud() { tagCloud.clear(); deleteBookmarkBySearch(); Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-25 13:16:43 UTC (rev 33) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-25 14:21:33 UTC (rev 34) @@ -295,16 +295,16 @@ protected void actionEditBookmark(HttpServletRequest request, HttpServletResponse response, User user) throws IOException, ServletException { - String nameAndTags = request.getParameter("nameAndTags"); + String tags = request.getParameter("tags"); + String name = request.getParameter("name"); String bookmarkId = request.getParameter("bookmarkId"); - if (nameAndTags != null && bookmarkId != null) { - if (!nameAndTags.isEmpty() && !bookmarkId.isEmpty()) { - WikittyProxy proxy = model.getProxy(); - Bookmark bookmark = proxy.restore(Bookmark.class, bookmarkId); - if (bookmark != null) { - BookmarkActions.updateBookmark(bookmark, nameAndTags); - proxy.store(bookmark); - } + if (bookmarkId != null && !bookmarkId.isEmpty()) { + WikittyProxy proxy = model.getProxy(); + Bookmark bookmark = proxy.restore(Bookmark.class, bookmarkId); + if (bookmark != null) { + BookmarkActions.updateBookmarkName(bookmark, name); + BookmarkActions.updateBookmarkTags(bookmark, tags); + proxy.store(bookmark); } } String searchLine = request.getParameter("searchLine"); @@ -378,13 +378,25 @@ protected void actionAddUrl(HttpServletRequest request, HttpServletResponse response, User user) throws IOException, ServletException { addUrl(request, user); - 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 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); + String name = request.getParameter("name"); + Bookmark bookmark = null; + if (name != null) { + String tags = request.getParameter("tags"); // tags + bookmark = BookmarkActions.createBookmark(url, name, tags, user); + } else { + String nameAndTags = request.getParameter("nameAndTags"); + bookmark = BookmarkActions.createBookmark(url, nameAndTags, user); + } if (bookmark != null) { WikittyProxy proxy = model.getProxy(); proxy.store(bookmark); // store the bookmark if all is Ok Modified: trunk/src/main/webapp/css/styles.css =================================================================== --- trunk/src/main/webapp/css/styles.css 2010-05-25 13:16:43 UTC (rev 33) +++ trunk/src/main/webapp/css/styles.css 2010-05-25 14:21:33 UTC (rev 34) @@ -1,7 +1,7 @@ table.result { border:3px solid #6495ed; border-collapse:collapse; - width:750px; + width:900px; margin:auto; } table.actions { @@ -22,7 +22,7 @@ } .edit { - width:30%; + width:36%; } .name { @@ -34,11 +34,11 @@ } .date { - width:12%; + width:13%; } .tags { - width:19%; + width:12%; } td.result { Modified: trunk/src/main/webapp/home.jsp =================================================================== --- trunk/src/main/webapp/home.jsp 2010-05-25 13:16:43 UTC (rev 33) +++ trunk/src/main/webapp/home.jsp 2010-05-25 14:21:33 UTC (rev 34) @@ -159,8 +159,10 @@ <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 /> + Name<br /> + <input type="text" name="name" size="20" value="name" /><br /> + Tags<br /> + <input type="text" name="tags" size="20" value="tag1 tag2..." /><br /> <input type="submit" value="add" /> </form> </div> Modified: trunk/src/main/webapp/search.jsp =================================================================== --- trunk/src/main/webapp/search.jsp 2010-05-25 13:16:43 UTC (rev 33) +++ trunk/src/main/webapp/search.jsp 2010-05-25 14:21:33 UTC (rev 34) @@ -104,7 +104,8 @@ </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="text" name="name" size="35" value="<%=bookmark.getDescription()%>" /> + <input type="text" name="tags" size="35" value="<%=BookmarkActions.getBookmarkTagsString(bookmark)%>" /> <input type="image" src="img/edit.png" title="Edit"/> </form> </td> @@ -134,11 +135,13 @@ </ul> </div> <div class="menu"> - <form method="POST" action="bow?action=addUrl"> + <form method="POST" action="bow?action=addUrl&searchLine=<%=searchLine%>"> 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 /> + Name<br /> + <input type="text" name="name" size="20" value="name" /><br /> + Tags<br /> + <input type="text" name="tags" size="20" value="tag1 tag2..." /><br /> <input type="submit" value="add" /> </form> </div> @@ -159,7 +162,7 @@ %> <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" /> + <input style="float: left" type="submit" value="Find" /> </form> </div> </div>