Author: jvelociter
Date: 2007-12-20 18:27:10 +0100 (Thu, 20 Dec 2007)
New Revision: 6446
Modified:
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/data/DataManager.java
xwiki-products/xwiki-watch/trunk/wiki/src/main/resources/WatchCode/PressReview
xwiki-products/xwiki-watch/trunk/wiki/src/main/resources/WatchCode/TagCloud
xwiki-products/xwiki-watch/trunk/wiki/src/main/resources/WatchSheets/KeywordSheet
Log:
XWATCH-90: All queries involving keyword matching were converted to execute
lowercase comparisons.
Modified:
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/data/DataManager.java
===================================================================
---
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/data/DataManager.java
2007-12-20 15:07:45 UTC (rev 6445)
+++
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/data/DataManager.java
2007-12-20 17:27:10 UTC (rev 6446)
@@ -331,10 +331,10 @@
}
}
- if ((filterStatus.getKeyword()
!=null)&&(!filterStatus.getKeyword().trim().equals(""))) {
- wheresql += " and (feedentry.title like '%" + skeyword + "%' "
- + " or feedentry.content like '%" + skeyword + "%' "
- + " or feedentry.fullContent like '%" + skeyword + "%') ";
+ if ((skeyword != null) && (!skeyword.trim().equals(""))) {
+ wheresql += " and (lower(feedentry.title) like '%" +
skeyword.toLowerCase() + "%' "
+ + " or lower(feedentry.content) like '%" +
skeyword.toLowerCase() + "%' "
+ + " or lower(feedentry.fullContent) like '%" +
skeyword.toLowerCase() + "%') ";
}
if (filterStatus.getFlagged() ==1) {
Modified:
xwiki-products/xwiki-watch/trunk/wiki/src/main/resources/WatchCode/PressReview
===================================================================
---
xwiki-products/xwiki-watch/trunk/wiki/src/main/resources/WatchCode/PressReview
2007-12-20 15:07:45 UTC (rev 6445)
+++
xwiki-products/xwiki-watch/trunk/wiki/src/main/resources/WatchCode/PressReview
2007-12-20 17:27:10 UTC (rev 6446)
@@ -39,7 +39,7 @@
String sql = ", BaseObject as obj, XWiki.FeedEntryClass as feedentry ";
String wheresql = "where doc.fullName=obj.name and
obj.className='XWiki.FeedEntryClass' and obj.id=feedentry.id ";
if (!(skeyword.trim()=="")) {
- wheresql += " and (feedentry.title like '%" + skeyword + "%' or
feedentry.content like '%" + skeyword + "%' or feedentry.fullContent like '%" +
skeyword + "%') ";
+ wheresql += " and (lower(feedentry.title) like '%" +
skeyword.toLowerCase() + "%' or lower(feedentry.content) like '%" +
skeyword.toLowerCase() + "%' or lower(feedentry.fullContent) like '%" +
skeyword.toLowerCase() + "%') ";
}
if (request.flagged=="1") {
Modified:
xwiki-products/xwiki-watch/trunk/wiki/src/main/resources/WatchCode/TagCloud
===================================================================
--- xwiki-products/xwiki-watch/trunk/wiki/src/main/resources/WatchCode/TagCloud
2007-12-20 15:07:45 UTC (rev 6445)
+++ xwiki-products/xwiki-watch/trunk/wiki/src/main/resources/WatchCode/TagCloud
2007-12-20 17:27:10 UTC (rev 6446)
@@ -72,7 +72,7 @@
String sql = ", BaseObject as obj, XWiki.FeedEntryClass as feedentry ";
String wheresql = "where doc.fullName=obj.name and
obj.className='XWiki.FeedEntryClass' and obj.id=feedentry.id ";
if (!(skeyword.trim()=="")) {
- wheresql += " and (feedentry.title like '%" + skeyword + "%' or
feedentry.content like '%" + skeyword + "%' or feedentry.fullContent like '%" +
skeyword + "%') ";
+ wheresql += " and (lower(feedentry.title) like '%" +
skeyword.toLowerCase() + "%' or lower(feedentry.content) like '%" +
skeyword.toLowerCase() + "%' or lower(feedentry.fullContent) like '%" +
skeyword.toLowerCase() + "%') ";
}
if (request.flagged=="1") {
Modified:
xwiki-products/xwiki-watch/trunk/wiki/src/main/resources/WatchSheets/KeywordSheet
===================================================================
---
xwiki-products/xwiki-watch/trunk/wiki/src/main/resources/WatchSheets/KeywordSheet
2007-12-20 15:07:45 UTC (rev 6445)
+++
xwiki-products/xwiki-watch/trunk/wiki/src/main/resources/WatchSheets/KeywordSheet
2007-12-20 17:27:10 UTC (rev 6446)
@@ -66,7 +66,7 @@
#set($keywordGroupEsc = $keywordGroup.replaceAll("'", "''"))
#set($groupQuery = " and feedentry.feedurl in (select feed.url from
XWiki.AggregatorURLClass as feed, BaseObject as obj, XWiki.AggregatorGroupClass
as groupProp where obj.name in elements(feed.group) and obj.id = groupProp.id
and groupProp.name='${keywordGroupEsc}')")
#end
- #set($articlesQuery = ", BaseObject as obj, XWiki.FeedEntryClass as
feedentry where doc.fullName = obj.name and obj.className =
'XWiki.FeedEntryClass' and obj.id = feedentry.id and (feedentry.title like
'%${keywordValueEsc}%' or feedentry.content like '%${keywordValueEsc}%' or
feedentry.fullContent like '%${keywordValueEsc}%') ${groupQuery}")
+ #set($articlesQuery = ", BaseObject as obj, XWiki.FeedEntryClass as
feedentry where doc.fullName = obj.name and obj.className =
'XWiki.FeedEntryClass' and obj.id = feedentry.id and (lower(feedentry.title)
like '%${keywordValueEsc.toLowerCase()}%' or lower(feedentry.content) like
'%${keywordValueEsc.toLowerCase()}%' or lower(feedentry.fullContent) like
'%${keywordValueEsc.toLowerCase()}%') ${groupQuery}")
#set($list = $xwiki.searchDocuments($articlesQuery))
#set($parList = $xwiki.arrayList)
#set($dispose = $parList.add($keywordValue))
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
