Author: bpoussin Date: 2010-12-19 15:15:36 +0100 (Sun, 19 Dec 2010) New Revision: 138 Url: http://chorem.org/repositories/revision/bow/138 Log: change action '' ':' 't:' 'f:' 'a:' change preference label (doc) for search engine Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java 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-12-17 13:49:56 UTC (rev 137) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-12-19 14:15:36 UTC (rev 138) @@ -369,12 +369,53 @@ String searchLine = request.getParameter("searchLine"); if (searchLine != null && searchLine.matches("^http://[^ ]*")) { response.sendRedirect(searchLine); - } else if (searchLine != null && searchLine.startsWith(":")) { - searchLine = searchLine.substring(1); // suppress first ":" + } else if (searchLine != null + && (searchLine.startsWith(":") || searchLine.startsWith("t:")) ) { + // on fait une recherche sur les tags + int index = searchLine.indexOf(":"); + searchLine = searchLine.substring(index+1); // suppress first ":" + + session.setAttribute("user", user); + initializeToken(session, user); WikittyProxy proxy = BowProxy.getInstance(); + Criteria criteria = getBookmarkListCriteriaByUser(user, searchLine); + criteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); + 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); + request.getRequestDispatcher("search.jsp").forward(request, response); + } else if (searchLine != null && searchLine.startsWith("f:")) { + // recherche fulltext dans bow + String fullText = searchLine.substring(2); + + session.setAttribute("user", user); + initializeToken(session, user); + WikittyProxy proxy = BowProxy.getInstance(); + Criteria criteria; + if (!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); + request.setAttribute("token", token); + request.getRequestDispatcher("search.jsp").forward(request, response); + } else if (searchLine != null && searchLine.startsWith("a:")) { + // on redirige vers l'alias demande + searchLine = searchLine.substring(2); + response.sendRedirect(BowConfig.getInstance().getAliasUrl() + searchLine); + } else { + // on fait une recherche sur le moteur de recherche configurer + 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(); @@ -384,19 +425,6 @@ searchEngineURL = response.encodeRedirectURL(searchEngineURL); response.sendRedirect(searchEngineURL); - } else if (searchLine != null && searchLine.startsWith("a:")) { //Alias - response.sendRedirect(BowConfig.getInstance().getAliasUrl() + searchLine.substring(2)); - } else { - session.setAttribute("user", user); - initializeToken(session, user); - WikittyProxy proxy = BowProxy.getInstance(); - Criteria criteria = getBookmarkListCriteriaByUser(user, searchLine); - criteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); - 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); - request.getRequestDispatcher("search.jsp").forward(request, response); } } Modified: trunk/src/main/webapp/preferences.jsp =================================================================== --- trunk/src/main/webapp/preferences.jsp 2010-12-17 13:49:56 UTC (rev 137) +++ trunk/src/main/webapp/preferences.jsp 2010-12-19 14:15:36 UTC (rev 138) @@ -99,7 +99,7 @@ <input type="text" name="bookmarks" id="bookmarks" value="<%=preference.getBookmarks()%>"/><br /> <label for="searchEngineUrlSuggestions">Search Engine URL Suggestions</label><br /> <input type="text" name="searchEngineUrlSuggestions" id="searchEngineUrlSuggestions" value="<%=preference.getSearchEngineUrlSuggestions()%>"/><br /> - <label for="searchEngineUrlResults">Search Engine URL Results</label><br /> + <label for="searchEngineUrlResults">Search Engine URL Results ({searchTerms} will be replaced by your text)</label><br /> <input type="text" name="searchEngineUrlResults" id="searchEngineUrlResults" value="<%=preference.getSearchEngineUrlResults()%>"/><br /> <input type="submit" value="Change" /> <br /><br />