[Bow-commits] r106 - trunk/src/main/java/org/chorem/bow

28 Jul 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

    

[Bow-commits] r106 - trunk/src/main/java/org/chorem/bow

bbrossaud＠users.chorem.org