branch develop updated (07d2743 -> b36a9f5)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository bow. See http://git.chorem.org/bow.git from 07d2743 add markdown processor to process bookmark description (in safeMode) new 3ef8aca fixes #1274: add support for more complexe query for fulltext bookmark search new ab9fc2a add some FIXME and debug new b36a9f5 add link to shared user to go home page The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b36a9f5cbe929244eb13441a1d3d7d9e6a714528 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Thu Jul 30 19:51:12 2015 +0200 add link to shared user to go home page commit ab9fc2ae635a12472129fa17ed5763e4c42e7aa8 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Thu Jul 30 19:47:42 2015 +0200 add some FIXME and debug commit 3ef8aca24f735ffd53f27449ad7671bfbf70742e Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Thu Jul 30 19:46:39 2015 +0200 fixes #1274: add support for more complexe query for fulltext bookmark search Summary of changes: bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java | 14 +++++++++++++- .../java/org/chorem/bow/action/bookmark/HomeAction.java | 1 + .../java/org/chorem/bow/action/group/GroupEditAction.java | 6 ++++++ .../chorem/bow/action/sharedUser/SharedUserEditAction.java | 13 ++++--------- bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp | 6 ++++++ 5 files changed, 30 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit 3ef8aca24f735ffd53f27449ad7671bfbf70742e Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Thu Jul 30 19:46:39 2015 +0200 fixes #1274: add support for more complexe query for fulltext bookmark search --- bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java b/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java index 963a53c..9444ee9 100644 --- a/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java +++ b/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java @@ -45,6 +45,7 @@ import org.jsoup.nodes.Document; import org.nuiton.wikitty.entities.Element; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; +import org.nuiton.wikitty.query.WikittyQueryParser; import org.nuiton.wikitty.services.WikittyServiceAuthorisation; public class BookmarkUtils { @@ -52,6 +53,15 @@ public class BookmarkUtils { /** Logger. */ public static Log log = LogFactory.getLog(BookmarkUtils.class); + protected final static WikittyQueryParser queryParser = new WikittyQueryParser(); + static { + queryParser.addAlias("tag:", BowBookmark.FQ_FIELD_WIKITTYLABEL_LABELS + "=" ); + queryParser.addAlias("date:([^ $]+)", + BowBookmark.FQ_FIELD_BOWBOOKMARK_CREATIONDATE + "=[date($1/DAY) TO date($1/DAY+1DAY)]"); + queryParser.addAlias("before:([^ $]+)", BowBookmark.FQ_FIELD_BOWBOOKMARK_CREATIONDATE + "<date($1)"); + queryParser.addAlias("after:([^ $]+)", BowBookmark.FQ_FIELD_BOWBOOKMARK_CREATIONDATE + ">date($1)"); + } + /** * Title is first sentence of description, or link if no description * @param b @@ -105,6 +115,7 @@ public class BookmarkUtils { String order, int first) { WikittyQueryMaker search = new WikittyQueryMaker().and(); + search.exteq(BowBookmark.EXT_BOWBOOKMARK); addEqUser(search, user.getWikittyId()); if (CollectionUtils.isNotEmpty(listId)) { @@ -112,7 +123,8 @@ public class BookmarkUtils { } if (StringUtils.isNotBlank(fullTextLine)) { - search.keyword(fullTextLine); + WikittyQuery query = queryParser.parseQuery(fullTextLine); + search.condition(query.getCondition()); } if (StringUtils.isNotBlank(tagLine)) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit ab9fc2ae635a12472129fa17ed5763e4c42e7aa8 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Thu Jul 30 19:47:42 2015 +0200 add some FIXME and debug --- .../java/org/chorem/bow/action/bookmark/HomeAction.java | 1 + .../java/org/chorem/bow/action/group/GroupEditAction.java | 6 ++++++ .../chorem/bow/action/sharedUser/SharedUserEditAction.java | 13 ++++--------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/HomeAction.java b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/HomeAction.java index 7161053..0303227 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/HomeAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/HomeAction.java @@ -98,6 +98,7 @@ public class HomeAction extends BowBaseAction { WikittyQueryResult<BowBookmark> result = proxy.findAllByQuery(BowBookmark.class, criteria); + log.debug("******** query was: " + result.getQueryString()); searchResult = new BowSearchResult(result, tagLine); } diff --git a/bow-ui/src/main/java/org/chorem/bow/action/group/GroupEditAction.java b/bow-ui/src/main/java/org/chorem/bow/action/group/GroupEditAction.java index 1edca93..acf8e01 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/group/GroupEditAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/group/GroupEditAction.java @@ -178,6 +178,8 @@ public class GroupEditAction extends BowBaseAction { } if (result == SUCCESS && CollectionUtils.isEmpty(getGroup().getMembers())) { addActionMessage(t("bow.group.delete.no.member")); + // FIXME poussin 20150730 convert all tag '@<group>' to '<group>' + // when group is destroy proxy.delete(group); } else { // force admin to group all time @@ -206,6 +208,10 @@ public class GroupEditAction extends BowBaseAction { try { BowSession session = getBowSession(); BowProxy proxy = session.getProxy(); + + // FIXME poussin 20150730 convert all tag '@<group>' to '<group>' + // when group is destroy + proxy.delete(group); } catch (Exception eee) { diff --git a/bow-ui/src/main/java/org/chorem/bow/action/sharedUser/SharedUserEditAction.java b/bow-ui/src/main/java/org/chorem/bow/action/sharedUser/SharedUserEditAction.java index 5631b92..df2e381 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/sharedUser/SharedUserEditAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/sharedUser/SharedUserEditAction.java @@ -20,10 +20,6 @@ */ package org.chorem.bow.action.sharedUser; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -34,11 +30,6 @@ import org.chorem.bow.BowSession; import org.chorem.bow.BowUser; import org.chorem.bow.BowUtils; import org.chorem.bow.action.BowBaseAction; -import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.entities.WikittyUserHelper; -import org.nuiton.wikitty.query.WikittyQuery; -import org.nuiton.wikitty.query.WikittyQueryMaker; -import org.nuiton.wikitty.query.WikittyQueryResult; /** * Handles RSS flux demande @@ -135,6 +126,10 @@ public class SharedUserEditAction extends BowBaseAction { try { BowSession session = getBowSession(); BowProxy proxy = session.getProxy(); + + // FIXME poussin 20150730 convert all tag '#<user>' to '<user>' + // when user is destroy + proxy.delete(sharedUserId); } catch (Exception eee) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit b36a9f5cbe929244eb13441a1d3d7d9e6a714528 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Thu Jul 30 19:51:12 2015 +0200 add link to shared user to go home page --- bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp index d92dde8..6414cf4 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp @@ -65,6 +65,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <s:param name="tagLine" value="%{'#' + #sharedUser.login}" /> </s:url> <a class="atom" href="${atom}">atom</a> + + <s:url var="web" action="home" escapeAmp="true"> + <s:param name="token" value="%{#sharedUser.permanentToken}" /> + <s:param name="tagLine" value="%{'#' + #sharedUser.login}" /> + </s:url> + <a class="web" href="${web}">web</a> </span> </li> </s:iterator> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm