Author: bbrossaud Date: 2010-07-15 10:43:11 +0200 (Thu, 15 Jul 2010) New Revision: 83 Url: http://chorem.org/repositories/revision/bow/83 Log: resolved problem with alias Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java trunk/src/main/webapp/bookmark.jsp Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-07-15 08:03:27 UTC (rev 82) +++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-07-15 08:43:11 UTC (rev 83) @@ -152,10 +152,12 @@ public static void addUrlToBookmark(String url, Bookmark bookmark) { if (url != null && !url.isEmpty()) { String link = url.trim(); - if (!link.contains("://")) { + if (!link.contains("http://")) { link = "http://" + link; } bookmark.setLink(link); + } else { + bookmark.setLink(""); } } @@ -192,21 +194,13 @@ } 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(""); - } + + addTagsToBookmark(tags, bookmark); + + addUrlToBookmark(url, bookmark); + bookmark.setClick(0); + bookmark.setEmail(user.getEmail()); // set the email (user name) if (date == null) { date = new Date(); @@ -228,27 +222,14 @@ } } - public static void updateBookmark(Bookmark bookmark, String name, String link, String str, String alias) { + public static void updateBookmark(Bookmark bookmark, String name, String link, String tags, String alias) { if (name != null) { name = name.trim(); bookmark.setDescription(name); } - if (link != null) { - link = link.trim(); - bookmark.setLink(link); - } - if (str != null) { - bookmark.clearTags(); - if (!str.isEmpty()) { - str = str.trim(); - String[] tags = str.split("\\s+"); - for (int i = 0; i < tags.length; i++) { - if (bookmark.getTags() == null || !bookmark.getTags().contains(tags[i])) { - bookmark.addTags(tags[i]); - } - } - } - } + addUrlToBookmark(link, bookmark); + bookmark.clearTags(); + addTagsToBookmark(tags, bookmark); if (alias != null) { alias = alias.trim(); bookmark.setAlias(alias); Modified: trunk/src/main/webapp/bookmark.jsp =================================================================== --- trunk/src/main/webapp/bookmark.jsp 2010-07-15 08:03:27 UTC (rev 82) +++ trunk/src/main/webapp/bookmark.jsp 2010-07-15 08:43:11 UTC (rev 83) @@ -26,7 +26,7 @@ <div class="bookmark"> <div class="bookmarkhead clearfix"> - <a class="alias" href="<%=url + bookmark.getAlias()%>" title="<%=url + bookmark.getAlias()%>" target="_blank"> + <a class="alias" href="<%=url + "alias/" + bookmark.getAlias()%>" title="<%=bookmark.getLink()%>" target="_blank"> <%=bookmark.getAlias()%> </a> <p class="date"> (<%=sdf.format(bookmark.getDate())%>)</p>