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

r106 - trunk/src/main/java/org/chorem/bow
by bbrossaud＠users.chorem.org July 28, 2010

July 28, 2010

Author: bbrossaud Date: 2010-07-28 18:27:02 +0200 (Wed, 28 Jul 2010) New Revision: 106 Url: http://chorem.org/repositories/revision/bow/106 Log: remove bug fulltext 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-07-28 13:52:36 UTC (rev 105) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-28 16:27:02 UTC (rev 106) @@ -552,10 +552,12 @@ WikittyProxy proxy = BowProxy.getInstance(); Bookmark bookmark = proxy.restore(Bookmark.class, id); if (bookmark != null) { - Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_ALIAS, alias).criteria(); - if (proxy.findByCriteria(Bookmark.class, criteria) != null) { - alias = bookmark.getAlias(); - } + if (alias != null && !alias.isEmpty()) { + Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_ALIAS, alias).criteria(); + if (proxy.findByCriteria(Bookmark.class, criteria) != null) { + alias = bookmark.getAlias(); + } + } BookmarkActions.updateBookmark(bookmark, name, link, tags, alias); proxy.store(bookmark); } @@ -660,20 +662,28 @@ protected void actionSearch(HttpServletRequest request, User user) throws IOException, ServletException { String searchLine = request.getParameter("searchLine"); - String tag = request.getParameter("addTag"); - if (tag != null && !tag.isEmpty()) { - if (searchLine == null || searchLine.isEmpty()) { - searchLine = tag; - } else { - searchLine += " " + tag; - } + if (searchLine == null) { + searchLine = ""; } - WikittyProxy proxy = BowProxy.getInstance(); - Criteria criteria = getBookmarkListCriteriaByUser(user, searchLine); - criteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); - PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); // select all bookmarks by user - BookmarkActions bookmarkActions = createBookmarkActions(request, result, searchLine); - request.setAttribute("bookmarkActions", bookmarkActions); + String fulltext = request.getParameter("fullTextLine"); + if (fulltext != null && !fulltext.isEmpty() && searchLine.isEmpty()) { + actionFullText(request, user); + } else { + String tag = request.getParameter("addTag"); + if (tag != null && !tag.isEmpty()) { + if (searchLine == null || searchLine.isEmpty()) { + searchLine = tag; + } else { + searchLine += " " + tag; + } + } + WikittyProxy proxy = BowProxy.getInstance(); + Criteria criteria = getBookmarkListCriteriaByUser(user, searchLine); + criteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); + PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); // select all bookmarks by user + BookmarkActions bookmarkActions = createBookmarkActions(request, result, searchLine); + request.setAttribute("bookmarkActions", bookmarkActions); + } } /* @param request servlet request @@ -1012,21 +1022,25 @@ * @throws ServletException if a servlet error occurs * @description retrieve bookmark for the full text research */ - protected void actionFullText(HttpServletRequest request, User user) { + protected void actionFullText(HttpServletRequest request, User user) throws IOException, ServletException { String fullText = request.getParameter("fullTextLine"); - WikittyProxy proxy = BowProxy.getInstance(); - Criteria criteria = null; - if (fullText != null && !fullText.isEmpty()) { - criteria = Search.query().keyword(fullText). - eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(). - addFacetField(Bookmark.FQ_FIELD_TAGS); - + if (fullText == null || fullText.isEmpty()) { + actionSearch(request, user); } else { - criteria = getBookmarkListCriteriaByUser(user, null); + WikittyProxy proxy = BowProxy.getInstance(); + Criteria criteria = null; + if (fullText != null && !fullText.isEmpty()) { + criteria = Search.query().keyword(fullText). + eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(). + addFacetField(Bookmark.FQ_FIELD_TAGS); + + } else { + criteria = getBookmarkListCriteriaByUser(user, null); + } + PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); + BookmarkActions bookmarkActions = createBookmarkActions(request, result, null); + request.setAttribute("bookmarkActions", bookmarkActions); } - PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); - BookmarkActions bookmarkActions = createBookmarkActions(request, result, null); - request.setAttribute("bookmarkActions", bookmarkActions); } /* @param request servlet request

1 0

r105 - in trunk/src/main: java/org/chorem/bow webapp
by bbrossaud＠users.chorem.org July 28, 2010

July 28, 2010

Author: bbrossaud Date: 2010-07-28 15:52:36 +0200 (Wed, 28 Jul 2010) New Revision: 105 Url: http://chorem.org/repositories/revision/bow/105 Log: addition permanent token to the bow link and bowLink works in preferences and admin Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/webapp/admin.jsp trunk/src/main/webapp/bookmarkHome.jsp trunk/src/main/webapp/bookmarkSearch.jsp trunk/src/main/webapp/preferences.jsp Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-28 09:23:31 UTC (rev 104) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-28 13:52:36 UTC (rev 105) @@ -138,12 +138,11 @@ log.debug("Going to actionLogout"); } this.actionLogout(request, response, session); - } else if (action.equals("home") && user != null) { + } else if (action.equals("home")) { if (log.isDebugEnabled()) { log.debug("Going to actionHome.jsp"); } - this.actionHome(request, user); - request.getRequestDispatcher("main.jsp").forward(request, response); + this.actionHome(request, response, session); } else if (action.equals("addUrl") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionAddUrl"); @@ -455,7 +454,7 @@ } String searchLine = request.getParameter("searchLine"); if (searchLine == null) { - actionHome(request, user); + initHomePage(request, user); } else { actionSearch(request, user); } @@ -727,12 +726,8 @@ if (login == null) { request.getRequestDispatcher("error.jsp").forward(request, response); } else { - session.setAttribute("user", login); - Preference preference = proxy.restore(Preference.class, login.getWikittyId()); - session.setAttribute("preference", preference); - initializeToken(session, login); - actionHome(request, login); - checkAdmin(email, session); + initSession(session, login); + initHomePage(request, login); sendMail(email, password); request.getRequestDispatcher("main.jsp").forward(request, response); } @@ -752,13 +747,8 @@ password = StringUtil.encodeMD5(password); User login = this.checkLogin(email, password); // check if the user exists if (login != null) { - WikittyProxy proxy = BowProxy.getInstance(); - session.setAttribute("user", login); - Preference preference = proxy.restore(Preference.class, login.getWikittyId()); - session.setAttribute("preference", preference); - initializeToken(session, login); - checkAdmin(email, session); - actionHome(request, login); + initSession(session, login); + initHomePage(request, login); request.getRequestDispatcher("main.jsp").forward(request, response); } else { @@ -843,13 +833,9 @@ return true; } - /* @param request servlet request - * @param user User user - * @description initialize all for the home page - */ - protected void actionHome(HttpServletRequest request, User user) { - WikittyProxy proxy = BowProxy.getInstance(); - Criteria criteria = getBookmarkListCriteriaByUser(user, null); + protected void initHomePage(HttpServletRequest request, User user) { + WikittyProxy proxy = BowProxy.getInstance(); + Criteria criteria = getBookmarkListCriteriaByUser(user, null); if (criteria != null) { Criteria sortCriteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, sortCriteria); // select all bookmarks by user @@ -868,6 +854,37 @@ request.setAttribute("bookmarkActions", bookmarkActions); } } + + protected void initSession(HttpSession session, User user) throws NoSuchAlgorithmException { + WikittyProxy proxy = BowProxy.getInstance(); + session.setAttribute("user", user); + Preference preference = proxy.restore(Preference.class, user.getWikittyId()); + session.setAttribute("preference", preference); + initializeToken(session, user); + checkAdmin(user.getEmail(), session); + } + + /* @param request servlet request + * @param user User user + * @description initialize all for the home page + */ + protected void actionHome(HttpServletRequest request, HttpServletResponse response, HttpSession session) + throws ServletException, IOException, NoSuchAlgorithmException { + User user = (User) session.getAttribute("user"); + if (user == null) { + String token = request.getParameter("token"); + user = checkPermanentToken(token); + if (user != null) { + initSession(session, user); + } + } + if (user != null) { + initHomePage(request, user); + request.getRequestDispatcher("main.jsp").forward(request, response); + } else { + request.getRequestDispatcher("login.jsp").forward(request, response); + } + } /* @param request servlet request * @param response servlet response Modified: trunk/src/main/webapp/admin.jsp =================================================================== --- trunk/src/main/webapp/admin.jsp 2010-07-28 09:23:31 UTC (rev 104) +++ trunk/src/main/webapp/admin.jsp 2010-07-28 13:52:36 UTC (rev 105) @@ -2,13 +2,16 @@ <%@page import="org.chorem.bow.Preference" %> <%@page import="org.chorem.bow.User" %> +<%@page import="org.chorem.bow.TokenActions" %> <% User user = (User) session.getAttribute("user"); Preference preference = (Preference) session.getAttribute("preference"); - if (user != null && preference != null) { + TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); + if (user != null && preference != null && tokenActions != null) { String url = (String) request.getAttribute("bowUrl"); String version = (String) request.getAttribute("version"); + String permanentToken = tokenActions.getPermanentToken(); String check = preference.getColors(); if (check == null) { preference.setColors(""); @@ -35,7 +38,7 @@ <div id="headback"> <div id="head"> <div id="headleft"> - <a class="logo" href="bow">bow</a> + <a class="logo" href="<%=url%>?action=home&token=<%=permanentToken%>">bow</a> </div> </div> </div> Modified: trunk/src/main/webapp/bookmarkHome.jsp =================================================================== --- trunk/src/main/webapp/bookmarkHome.jsp 2010-07-28 09:23:31 UTC (rev 104) +++ trunk/src/main/webapp/bookmarkHome.jsp 2010-07-28 13:52:36 UTC (rev 105) @@ -60,7 +60,7 @@ <div id="headback"> <div id="head"> <div id="headleft"> - <a class="logo" href="<%=url%>?action=home">bow</a>(Bookmarks On the Web) + <a class="logo" href="<%=url%>?action=home&token=<%=permanentToken%>">bow</a>(Bookmarks On the Web) </div> <div id="headright"> <form method="POST" action="bow?action=logout"> Modified: trunk/src/main/webapp/bookmarkSearch.jsp =================================================================== --- trunk/src/main/webapp/bookmarkSearch.jsp 2010-07-28 09:23:31 UTC (rev 104) +++ trunk/src/main/webapp/bookmarkSearch.jsp 2010-07-28 13:52:36 UTC (rev 105) @@ -60,7 +60,7 @@ <div id="headback"> <div id="head"> <div id="headleft"> - <a class="logo" href="<%=url%>?action=home">bow</a>(Bookmarks On the Web) + <a class="logo" href="<%=url%>?action=home&token=<%=permanentToken%>">bow</a>(Bookmarks On the Web) </div> <div id="headright"> <form method="POST" action="bow?action=logout"> Modified: trunk/src/main/webapp/preferences.jsp =================================================================== --- trunk/src/main/webapp/preferences.jsp 2010-07-28 09:23:31 UTC (rev 104) +++ trunk/src/main/webapp/preferences.jsp 2010-07-28 13:52:36 UTC (rev 105) @@ -2,13 +2,16 @@ <%@page import="org.chorem.bow.Preference" %> <%@page import="org.chorem.bow.User" %> +<%@page import="org.chorem.bow.TokenActions" %> <% User user = (User) session.getAttribute("user"); Preference preference = (Preference) session.getAttribute("preference"); - if (user != null && preference != null) { + TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); + if (user != null && preference != null && tokenActions != null) { String url = (String) request.getAttribute("bowUrl"); String version = (String) request.getAttribute("version"); + String permanentToken = tokenActions.getPermanentToken(); String check = preference.getColors(); if (check == null) { preference.setColors(""); @@ -35,7 +38,7 @@ <div id="headback"> <div id="head"> <div id="headleft"> - <a class="logo" href="bow">bow</a> + <a class="logo" href="<%=url%>?action=home&token=<%=permanentToken%>">bow</a> </div> </div> </div>

1 0

r104 - in trunk/src/main: java/org/chorem/bow resources
by bpoussin＠users.chorem.org July 28, 2010

July 28, 2010

Author: bpoussin Date: 2010-07-28 11:23:31 +0200 (Wed, 28 Jul 2010) New Revision: 104 Url: http://chorem.org/repositories/revision/bow/104 Log: add support for search in search engine (default seeks.fr) if we start with ':' in OpenSearch request Modified: trunk/src/main/java/org/chorem/bow/BowConfig.java trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/resources/bow.properties Modified: trunk/src/main/java/org/chorem/bow/BowConfig.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BowConfig.java 2010-07-27 16:14:23 UTC (rev 103) +++ trunk/src/main/java/org/chorem/bow/BowConfig.java 2010-07-28 09:23:31 UTC (rev 104) @@ -152,6 +152,15 @@ } /** + * Get default search engine + * + * @return search engine url + */ + public String getSearchEngine() { + return getOption(Option.SEARCH_ENGINE.key); + } + + /** * Get bow address from as string. * * @return addressFrom @@ -199,6 +208,8 @@ null, String.class, false, false), SERVLET_ALIAS("servlet.alias", _("bow.config.servlet.bow.description"), null, String.class, false, false), + SEARCH_ENGINE("search.engine", _("bow.config.search.engine.description"), + null, String.class, false, false), BOW_SMTPSERVER("bow.smtpServer", _("bow.config.bow.smtpServer.description"), null, String.class, false, false), BOW_ADDRESSFROM("bow.addressFrom", _("bow.config.bow.addressFrom.description"), Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-27 16:14:23 UTC (rev 103) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-28 09:23:31 UTC (rev 104) @@ -285,11 +285,27 @@ * @throws ServletException if a servlet error occurs * @description set the openSearch result */ - protected void actionOpenSearchResult(HttpServletRequest request, HttpServletResponse response, HttpSession session, User user, String token) + protected void actionOpenSearchResult(HttpServletRequest request, + HttpServletResponse response, HttpSession session, User user, String token) throws IOException, ServletException, NoSuchAlgorithmException { String searchLine = request.getParameter("searchLine"); - if (searchLine != null && searchLine.matches("^http://[^ ]*") && !searchLine.contains(" ")) { + if (searchLine != null && searchLine.matches("^http://[^ ]*")) { response.sendRedirect(searchLine); + } else if (searchLine != null && searchLine.startsWith(":")) { + searchLine = searchLine.substring(1); // suppress first ":" + + WikittyProxy proxy = BowProxy.getInstance(); + Preference pref = proxy.restore(Preference.class, user.getWikittyId()); + + String searchEngineURL = pref.getSearchEngineUrlResults(); + if (searchEngineURL == null || "".equals(searchEngineURL)) { + BowConfig config = BowConfig.getInstance(); + searchEngineURL = config.getSearchEngine(); + } + searchEngineURL = searchEngineURL.replace("{searchTerms}", searchLine); + searchEngineURL = response.encodeRedirectURL(searchEngineURL); + + response.sendRedirect(searchEngineURL); } else { session.setAttribute("user", user); initializeToken(session, user); Modified: trunk/src/main/resources/bow.properties =================================================================== --- trunk/src/main/resources/bow.properties 2010-07-27 16:14:23 UTC (rev 103) +++ trunk/src/main/resources/bow.properties 2010-07-28 09:23:31 UTC (rev 104) @@ -6,3 +6,4 @@ bow.smtpServer=smtp bow.addressFrom=bow(a)chorem.org bow.admins=brossa_b(a)epitech.net +search.engine=http://seeks.fr/search?expansion=1&action=expand&q={searchTerms}

1 0

r103 - trunk/src/main/java/org/chorem/bow
by bbrossaud＠users.chorem.org July 27, 2010

July 27, 2010

Author: bbrossaud Date: 2010-07-27 18:14:23 +0200 (Tue, 27 Jul 2010) New Revision: 103 Url: http://chorem.org/repositories/revision/bow/103 Log: remove warnings 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-07-27 16:13:51 UTC (rev 102) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-27 16:14:23 UTC (rev 103) @@ -1075,7 +1075,7 @@ } } } - return newUser; + return newUser; } protected void actionChangePreferences(HttpServletRequest request, HttpSession session, User user)

1 0

r102 - trunk/src/main/java/org/chorem/bow
by bbrossaud＠users.chorem.org July 27, 2010

July 27, 2010

Author: bbrossaud Date: 2010-07-27 18:13:51 +0200 (Tue, 27 Jul 2010) New Revision: 102 Url: http://chorem.org/repositories/revision/bow/102 Log: remove warnings Modified: trunk/src/main/java/org/chorem/bow/AliasServlet.java trunk/src/main/java/org/chorem/bow/BookmarkActions.java trunk/src/main/java/org/chorem/bow/BowProxy.java 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/AliasServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/AliasServlet.java 2010-07-27 15:30:23 UTC (rev 101) +++ trunk/src/main/java/org/chorem/bow/AliasServlet.java 2010-07-27 16:13:51 UTC (rev 102) @@ -39,7 +39,8 @@ */ public class AliasServlet extends HttpServlet { - protected String bowServletUrl = ""; + private static final long serialVersionUID = 1L; + protected String bowServletUrl = ""; public AliasServlet() throws ArgumentsParserException { BowConfig config = BowConfig.getInstance(); Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-07-27 15:30:23 UTC (rev 101) +++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-07-27 16:13:51 UTC (rev 102) @@ -343,12 +343,12 @@ } public void setBookmarks(List<Bookmark> bookmarksList) { - List<Bookmark> newList = new ArrayList(bookmarksList); + List<Bookmark> newList = new ArrayList<Bookmark>(bookmarksList); bookmarks = newList; } public void setLastBookmarks(List<Bookmark> bookmarksList) { - List<Bookmark> newList = new ArrayList(bookmarksList); + List<Bookmark> newList = new ArrayList<Bookmark>(bookmarksList); lastBookmarks = newList; } Modified: trunk/src/main/java/org/chorem/bow/BowProxy.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BowProxy.java 2010-07-27 15:30:23 UTC (rev 101) +++ trunk/src/main/java/org/chorem/bow/BowProxy.java 2010-07-27 16:13:51 UTC (rev 102) @@ -25,8 +25,6 @@ import java.util.Arrays; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyExtensionMigration; import org.nuiton.wikitty.WikittyProxy; @@ -45,8 +43,6 @@ */ public class BowProxy extends WikittyProxy { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(BowProxy.class); static protected BowProxy instance; synchronized static public BowProxy getInstance() { Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-27 15:30:23 UTC (rev 101) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-27 16:13:51 UTC (rev 102) @@ -31,7 +31,6 @@ import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.Arrays; -import java.util.Iterator; import java.util.List; import java.util.Properties; import javax.mail.Message; @@ -73,7 +72,8 @@ */ public class ControllerServlet extends HttpServlet { - private static final Log log = LogFactory.getLog(ControllerServlet.class); + private static final long serialVersionUID = 1L; + private static final Log log = LogFactory.getLog(ControllerServlet.class); protected String version = ""; protected String bowServletUrl = ""; @@ -591,7 +591,6 @@ * @description check if the token is valid and return the * token owner */ - protected User checkToken(String token, HttpSession session) { if (checkTemporaryToken(token, session) == true) { User user = (User) session.getAttribute("user"); @@ -871,10 +870,9 @@ ServletFileUpload upload = new ServletFileUpload(factory); // Process the uploaded items // Parse the request - List<FileItem> items = upload.parseRequest(request); - Iterator<FileItem> iter = items.iterator(); - while (iter.hasNext()) { - FileItem item = iter.next(); + List<?> items = upload.parseRequest(request); + for (Object obj : items) { + FileItem item = (FileItem) obj; if (!item.isFormField()) { WikittyProxy proxy = BowProxy.getInstance(); String content = item.getString(); @@ -1037,12 +1035,9 @@ return criteria; } - private void actionChangePreferences(HttpServletRequest request, HttpSession session, User user) - throws NoSuchAlgorithmException, AddressException, MessagingException { + protected Preference changePreference(HttpServletRequest request, HttpSession session) { - WikittyProxy proxy = BowProxy.getInstance(); - - Preference preference = (Preference) session.getAttribute("preference"); + Preference preference = (Preference) session.getAttribute("preference"); // Retrieve Preference fields String colors = request.getParameter("colors"); String tags = request.getParameter("tags"); @@ -1056,11 +1051,12 @@ preference.setSearchEngineUrlSuggestions(searchEngineSuggestions); preference.setSearchEngineUrlResults(searchEngineResults); - proxy.store(preference); - - User newUser = proxy.restore(User.class, user.getWikittyId()); - // Retrieve User fields - String email = request.getParameter("email"); + return preference; + } + + protected User changeUser(HttpServletRequest request, User newUser) + throws NoSuchAlgorithmException { + String email = request.getParameter("email"); String newPassword = request.getParameter("newPassword"); String currentPassword = request.getParameter("currentPassword"); String confirmNewPassword = request.getParameter("confirmNewPassword"); @@ -1079,6 +1075,19 @@ } } } + return newUser; + } + + protected void actionChangePreferences(HttpServletRequest request, HttpSession session, User user) + throws NoSuchAlgorithmException, AddressException, MessagingException { + + WikittyProxy proxy = BowProxy.getInstance(); + + Preference preference = changePreference(request, session); + proxy.store(preference); + + User newUser = proxy.restore(User.class, user.getWikittyId()); + newUser = changeUser(request, newUser); newUser = proxy.store(newUser); session.setAttribute("user", newUser); @@ -1157,7 +1166,7 @@ } } - private void actionReIndexation(HttpServletRequest request, HttpSession session, User user) { + protected void actionReIndexation(HttpServletRequest request, HttpSession session, User user) { WikittyProxy proxy = BowProxy.getInstance(); proxy.getWikittyService().syncEngin(proxy.getSecurityToken()); } Modified: trunk/src/main/java/org/chorem/bow/OpenSearchActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/OpenSearchActions.java 2010-07-27 15:30:23 UTC (rev 101) +++ trunk/src/main/java/org/chorem/bow/OpenSearchActions.java 2010-07-27 16:13:51 UTC (rev 102) @@ -84,7 +84,7 @@ public void setBookmarkList(List<Bookmark> bookmarks) { if (bookmarks != null) { - List<Bookmark> newList = new ArrayList(bookmarks); + List<Bookmark> newList = new ArrayList<Bookmark>(bookmarks); bookmarkList = newList; } }

1 0

r101 - in trunk/src/main: java/org/chorem/bow webapp
by bbrossaud＠users.chorem.org July 27, 2010

July 27, 2010

Author: bbrossaud Date: 2010-07-27 17:30:23 +0200 (Tue, 27 Jul 2010) New Revision: 101 Url: http://chorem.org/repositories/revision/bow/101 Log: remove multiple delete bookmark and logout button works Modified: trunk/src/main/java/org/chorem/bow/BowConfig.java trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/webapp/bookmarkHome.jsp trunk/src/main/webapp/bookmarkSearch.jsp Modified: trunk/src/main/java/org/chorem/bow/BowConfig.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BowConfig.java 2010-07-26 08:10:56 UTC (rev 100) +++ trunk/src/main/java/org/chorem/bow/BowConfig.java 2010-07-27 15:30:23 UTC (rev 101) @@ -26,8 +26,6 @@ import static org.nuiton.i18n.I18n._; import java.io.File; -import java.util.ArrayList; -import java.util.List; import org.apache.commons.lang.UnhandledException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-26 08:10:56 UTC (rev 100) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-27 15:30:23 UTC (rev 101) @@ -296,7 +296,7 @@ WikittyProxy proxy = BowProxy.getInstance(); Criteria criteria = getBookmarkListCriteriaByUser(user, searchLine); criteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); - PagedResult result = proxy.findAllByCriteria(Bookmark.class, criteria);// retrieve bookmarks by search + PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria);// retrieve bookmarks by search BookmarkActions bookmarkActions = createBookmarkActions(request, result, searchLine); request.setAttribute("bookmarkActions", bookmarkActions); request.setAttribute("token", token); @@ -332,7 +332,7 @@ criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()). criteria().addFacetField(Bookmark.FQ_FIELD_TAGS); } - PagedResult result = proxy.findAllByCriteria(Bookmark.class, criteria); + PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); List<Bookmark> bookList = result.getAll(); List<FacetTopic> topics = result.getTopic(Bookmark.FQ_FIELD_TAGS); openSearchActions.setBookmarkList(bookList); @@ -391,7 +391,7 @@ Criteria baseCriteria = getBookmarkListCriteriaByUser(user, searchLine); if (type != null && baseCriteria != null && !type.isEmpty()) { WikittyProxy proxy = BowProxy.getInstance(); - PagedResult result = null; + PagedResult<Bookmark> result = null; if (type.equals("ascName")) { Criteria criteria = baseCriteria.addSortAscending(Bookmark.FQ_FIELD_DESCRIPTION); result = proxy.findAllByCriteria(Bookmark.class, criteria); @@ -456,11 +456,15 @@ throws IOException, ServletException { String bookmarkId = request.getParameter("bookmarkId"); if (bookmarkId != null && !bookmarkId.isEmpty()) { - WikittyProxy proxy = BowProxy.getInstance(); - Bookmark bookmark = proxy.restore(Bookmark.class, bookmarkId); - if (bookmark != null) { - proxy.delete(bookmarkId); - } + try { + WikittyProxy proxy = BowProxy.getInstance(); + Bookmark bookmark = proxy.restore(Bookmark.class, bookmarkId); + if (bookmark != null) { + proxy.delete(bookmarkId); + } + } catch (Exception eee) { + log.error("Can't do action", eee); + } } redirectToTheGoodPage(request, response); } @@ -653,7 +657,7 @@ WikittyProxy proxy = BowProxy.getInstance(); Criteria criteria = getBookmarkListCriteriaByUser(user, searchLine); criteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); - PagedResult result = proxy.findAllByCriteria(Bookmark.class, criteria); // select all bookmarks by user + PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); // select all bookmarks by user BookmarkActions bookmarkActions = createBookmarkActions(request, result, searchLine); request.setAttribute("bookmarkActions", bookmarkActions); } @@ -664,7 +668,7 @@ * @return bookmarkActions the bookmarkAction * @description create the tagCLoud by research type */ - protected BookmarkActions createBookmarkActions(HttpServletRequest request, PagedResult result, String searchLine) { + protected BookmarkActions createBookmarkActions(HttpServletRequest request, PagedResult<Bookmark> result, String searchLine) { String fullText = request.getParameter("fullTextLine"); BookmarkActions bookmarkActions = new BookmarkActions(); bookmarkActions.setFullTextLine(fullText); @@ -833,7 +837,7 @@ Criteria criteria = getBookmarkListCriteriaByUser(user, null); if (criteria != null) { Criteria sortCriteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); - PagedResult result = proxy.findAllByCriteria(Bookmark.class, sortCriteria); // select all bookmarks by user + PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, sortCriteria); // select all bookmarks by user sortCriteria = criteria.addSortDescending(Bookmark.FQ_FIELD_DATE).setEndIndex(10); List<Bookmark> lastBookmarks = proxy.findAllByCriteria(Bookmark.class, sortCriteria).getAll(); BookmarkActions bookmarkActions = createBookmarkActions(request, result, null); @@ -868,9 +872,9 @@ // Process the uploaded items // Parse the request List<FileItem> items = upload.parseRequest(request); - Iterator iter = items.iterator(); + Iterator<FileItem> iter = items.iterator(); while (iter.hasNext()) { - FileItem item = (FileItem) iter.next(); + FileItem item = iter.next(); if (!item.isFormField()) { WikittyProxy proxy = BowProxy.getInstance(); String content = item.getString(); @@ -989,7 +993,7 @@ } else { criteria = getBookmarkListCriteriaByUser(user, null); } - PagedResult result = proxy.findAllByCriteria(Bookmark.class, criteria); + PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); BookmarkActions bookmarkActions = createBookmarkActions(request, result, null); request.setAttribute("bookmarkActions", bookmarkActions); } Modified: trunk/src/main/webapp/bookmarkHome.jsp =================================================================== --- trunk/src/main/webapp/bookmarkHome.jsp 2010-07-26 08:10:56 UTC (rev 100) +++ trunk/src/main/webapp/bookmarkHome.jsp 2010-07-27 15:30:23 UTC (rev 101) @@ -63,7 +63,7 @@ <a class="logo" href="<%=url%>?action=home">bow</a>(Bookmarks On the Web) </div> <div id="headright"> - <form action="bow?action=logout"> + <form method="POST" action="bow?action=logout"> <button>Logout</button> </form> <a href="#">Aide</a> Modified: trunk/src/main/webapp/bookmarkSearch.jsp =================================================================== --- trunk/src/main/webapp/bookmarkSearch.jsp 2010-07-26 08:10:56 UTC (rev 100) +++ trunk/src/main/webapp/bookmarkSearch.jsp 2010-07-27 15:30:23 UTC (rev 101) @@ -63,7 +63,7 @@ <a class="logo" href="<%=url%>?action=home">bow</a>(Bookmarks On the Web) </div> <div id="headright"> - <form action="bow?action=logout"> + <form method="POST" action="bow?action=logout"> <button>Logout</button> </form> <a href="#">Aide</a>

1 0

r100 - trunk/src/main/java/org/chorem/bow
by bbrossaud＠users.chorem.org July 26, 2010

July 26, 2010

Author: bbrossaud Date: 2010-07-26 10:10:56 +0200 (Mon, 26 Jul 2010) New Revision: 100 Url: http://chorem.org/repositories/revision/bow/100 Log: click incrementation addition when click on an alias link Modified: trunk/src/main/java/org/chorem/bow/AliasServlet.java Modified: trunk/src/main/java/org/chorem/bow/AliasServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/AliasServlet.java 2010-07-23 16:18:38 UTC (rev 99) +++ trunk/src/main/java/org/chorem/bow/AliasServlet.java 2010-07-26 08:10:56 UTC (rev 100) @@ -69,6 +69,9 @@ Bookmark bookmark = proxy.findByCriteria(Bookmark.class, criteria); if (bookmark != null) { String redirect = bookmark.getLink(); + int clicks = bookmark.getClick() + 1; + bookmark.setClick(clicks); + proxy.store(bookmark); response.sendRedirect(redirect); } else { response.sendRedirect(bowServletUrl);

1 0

r99 - trunk/src/main/java/org/chorem/bow
by bbrossaud＠users.chorem.org July 23, 2010

July 23, 2010

Author: bbrossaud Date: 2010-07-23 18:18:38 +0200 (Fri, 23 Jul 2010) New Revision: 99 Url: http://chorem.org/repositories/revision/bow/99 Log: removed bug with fulltext Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java trunk/src/main/java/org/chorem/bow/ControllerServlet.java Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-07-22 09:34:23 UTC (rev 98) +++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-07-23 16:18:38 UTC (rev 99) @@ -25,7 +25,6 @@ import java.util.ArrayList; import java.util.Date; -import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.regex.Matcher; @@ -264,34 +263,7 @@ } return ""; } - - 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) { - for (String tag : tags) { - if (tag.contains(word)) { - delete = false; - break; - } - } - } - if (name.contains(word)) { - delete = false; - } - } - if (delete == true) { - bookmarks.remove(bookmark); - } - } - } - + public void createTagCloud(List<FacetTopic> cpy) { setTagCloud(cpy); deleteTagBySearch(); @@ -314,27 +286,6 @@ } } - public void deleteBookmarkBySearch() { - List<Bookmark> bookmarksList = new ArrayList<Bookmark>(bookmarks); - for (Bookmark bookmark : bookmarksList) { - Iterator it = tagsSearch.iterator(); - boolean remove = false; - while (it.hasNext() && remove == false) { - String tag = (String) it.next(); - Set<String> tagList = bookmark.getTags(); - if (tagList != null && !tagList.isEmpty()) { - if (!tagList.contains(tag)) { - bookmarks.remove(bookmark); // Delete bookmark which doesn't contain the tags from the search field - remove = true; - } - } else { - bookmarks.remove(bookmark); // Delete bookmark which doesn't contain the tags from the search field - remove = true; - } - } - } - } - protected void defineTValues() { tmax = -1; // correspond to the most tag frequency in the tag cloud tmin = -1; // correspond to the less tag frequency in the tag cloud @@ -351,12 +302,6 @@ } } - public void addTag(String tag) { - if (!tagsSearch.contains(tag)) { - tagsSearch.add(tag); - } - } - public void addTags(String str) { if (str != null) { if (!str.isEmpty()) { @@ -389,6 +334,14 @@ tmin = -1; } + public void setFullTextLine(String line) { + if (line == null) { + fullTextLine = ""; + } else { + fullTextLine = line; + } + } + public void setBookmarks(List<Bookmark> bookmarksList) { List<Bookmark> newList = new ArrayList(bookmarksList); bookmarks = newList; Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-22 09:34:23 UTC (rev 98) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-23 16:18:38 UTC (rev 99) @@ -667,6 +667,7 @@ protected BookmarkActions createBookmarkActions(HttpServletRequest request, PagedResult result, String searchLine) { String fullText = request.getParameter("fullTextLine"); BookmarkActions bookmarkActions = new BookmarkActions(); + bookmarkActions.setFullTextLine(fullText); List<Bookmark> bookList = result.getAll(); if (bookList != null) { bookmarkActions.setBookmarks(bookList);

1 0

r98 - trunk/src/main/java/org/chorem/bow
by bpoussin＠users.chorem.org July 22, 2010

July 22, 2010

Author: bpoussin Date: 2010-07-22 11:34:23 +0200 (Thu, 22 Jul 2010) New Revision: 98 Url: http://chorem.org/repositories/revision/bow/98 Log: permit to add all protocol in bookmark (file://, ftp://, http://, https://, ...) Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-07-22 09:08:32 UTC (rev 97) +++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-07-22 09:34:23 UTC (rev 98) @@ -171,8 +171,7 @@ public static void addUrlToBookmark(String url, Bookmark bookmark) { if (url != null && !url.isEmpty()) { String link = url.trim(); - // FIXME poussin 20100717 how can add ftp:// in bookmarks ? - if (! (link.startsWith("http://") || link.startsWith("https://"))) { + if (! link.matches("[a-z]+://.+") ) { link = "http://" + link; } bookmark.setLink(link);

1 0

r97 - trunk
by bbrossaud＠users.chorem.org July 22, 2010

July 22, 2010

Author: bbrossaud Date: 2010-07-22 11:08:32 +0200 (Thu, 22 Jul 2010) New Revision: 97 Url: http://chorem.org/repositories/revision/bow/97 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-22 09:08:30 UTC (rev 96) +++ trunk/pom.xml 2010-07-22 09:08:32 UTC (rev 97) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>0.2</version> + <version>0.3-SNAPSHOT</version> <dependencies> @@ -98,9 +98,9 @@ </dependencies> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/bow/tags/bow-0.2</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/bow/tags/bow-0.2</developerConnection> - <url>http://www.chorem.org/repositories/browse/bow/tags/bow-0.2</url> + <connection>scm:svn:http://svn.chorem.org/svn/bow/trunk</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/bow/trunk</developerConnection> + <url>http://www.chorem.org/repositories/browse/bow/trunk</url> </scm>

1 0