Author: bbrossaud Date: 2010-05-06 11:52:18 +0200 (Thu, 06 May 2010) New Revision: 9 Url: http://chorem.org/repositories/revision/bow/9 Log: The URL addition works if the syntax is good Removed: trunk/src/main/java/org/chorem/bow/Bookmark.java trunk/src/main/java/org/chorem/bow/Token.java trunk/src/main/java/org/chorem/bow/User.java Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/webapp/search.jsp Deleted: trunk/src/main/java/org/chorem/bow/Bookmark.java =================================================================== --- trunk/src/main/java/org/chorem/bow/Bookmark.java 2010-05-06 08:58:08 UTC (rev 8) +++ trunk/src/main/java/org/chorem/bow/Bookmark.java 2010-05-06 09:52:18 UTC (rev 9) @@ -1,16 +0,0 @@ -import java.util.List; -import java.util.Date; - -public class Bookmark { - - public String link; - - public String description; - - public List tags; - - public Date date; - - public String email; - -} \ No newline at end of file Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-05-06 08:58:08 UTC (rev 8) +++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-05-06 09:52:18 UTC (rev 9) @@ -6,7 +6,9 @@ import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @@ -16,6 +18,7 @@ public class BookmarkActions { List<Bookmark> bookmarks = new ArrayList<Bookmark>(); + Map<String, Integer> tagsCloud = new HashMap<String, Integer>(); public Bookmark createBookmark(String query, User user) { Bookmark bookmark = (Bookmark) new BookmarkImpl(); @@ -44,4 +47,16 @@ public List<Bookmark> getBookmarks() { return bookmarks; } + + public void createTagsCloud() { + ; + } + + public Map<String, Integer> getTagsCloud() { + return tagsCloud; + } + + public void setBookmarks(List<Bookmark> bookmarksList) { + bookmarks = bookmarksList; + } } Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-06 08:58:08 UTC (rev 8) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-06 09:52:18 UTC (rev 9) @@ -17,7 +17,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.sharengo.wikitty.Criteria; -import org.sharengo.wikitty.WikittyException; import org.sharengo.wikitty.WikittyProxy; import org.sharengo.wikitty.search.Search; @@ -28,6 +27,7 @@ private BookmarkActions bookmarkActions = new BookmarkActions(); private User user = null; + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { String action = request.getParameter("action"); @@ -44,6 +44,7 @@ } } + @Override public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { String action = request.getParameter("action"); @@ -59,11 +60,11 @@ } else if (action.equals("addUrl")) { log.debug("Going to actionAddUrl"); this.actionAddUrl(request, response); - } else if (action.equals("addUrl")) { + } else if (action.equals("check")) { log.debug("Going to actionSearch"); this.actionSearch(request, response); } else { - log.debug("Default"); + log.debug("Going to home"); request.getRequestDispatcher("home.jsp").forward(request, response); } } else { @@ -75,17 +76,21 @@ throws IOException, ServletException { if (request.getParameter("url") != null) { + bookmarkActions.getBookmarks().clear(); Bookmark bookmark = bookmarkActions.createBookmark(request.getParameter("url"), user); model.getProxy().store(bookmark); - request.getRequestDispatcher("error.jsp").forward(request, response); + log.debug("Adding URL"); + request.getRequestDispatcher("search.jsp").forward(request, response); } } private void actionSearch(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { if (bookmarkActions.getBookmarks().isEmpty()) { - + bookmarkActions.setBookmarks(model.getProxy().findAllByCriteria(Bookmark.class, null).getAll()); + } + log.debug("ListSize = {"+String.valueOf(bookmarkActions.getBookmarks().size())+"}"); } private void actionRegister(HttpServletRequest request, HttpServletResponse response) @@ -118,11 +123,11 @@ User user = this.checkLogin(request, response); if (user != null) { - log.debug("User is different from null"); + log.debug("User exists"); this.user = user; request.getRequestDispatcher("search.jsp").forward(request, response); } else { - log.debug("The user doesn't exist"); + log.debug("User doesn't exist"); request.getRequestDispatcher("home.jsp").forward(request, response); } } catch (Exception eee) { @@ -139,8 +144,6 @@ if (!email.isEmpty() && !password.isEmpty()) { WikittyProxy proxy = model.getProxy(); - log.debug("email={"+email+"}"); - log.debug("password={"+password+"}"); Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, email).eq(User.FQ_FIELD_PASSWORD, password).criteria(); return proxy.findByCriteria(User.class, criteria); } Deleted: trunk/src/main/java/org/chorem/bow/Token.java =================================================================== --- trunk/src/main/java/org/chorem/bow/Token.java 2010-05-06 08:58:08 UTC (rev 8) +++ trunk/src/main/java/org/chorem/bow/Token.java 2010-05-06 09:52:18 UTC (rev 9) @@ -1,7 +0,0 @@ -public class Token { - - public String token; - - public String email; - -} \ No newline at end of file Deleted: trunk/src/main/java/org/chorem/bow/User.java =================================================================== --- trunk/src/main/java/org/chorem/bow/User.java 2010-05-06 08:58:08 UTC (rev 8) +++ trunk/src/main/java/org/chorem/bow/User.java 2010-05-06 09:52:18 UTC (rev 9) @@ -1,7 +0,0 @@ -public class User { - - public String password; - - public String email; - -} \ No newline at end of file Modified: trunk/src/main/webapp/search.jsp =================================================================== --- trunk/src/main/webapp/search.jsp 2010-05-06 08:58:08 UTC (rev 8) +++ trunk/src/main/webapp/search.jsp 2010-05-06 09:52:18 UTC (rev 9) @@ -9,7 +9,7 @@ <form method="POST" action="search?action=check"> <input type="text" name="words" size="20"><br /> - <input type="submit" value="OK"> + <input type="submit" value="Find"> </form> </body>