Author: dward
Date: 2007-10-26 00:35:25 +0200 (Fri, 26 Oct 2007)
New Revision: 5504
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/Constants.java
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/queries/LuceneAssetQuery.java
Log:
- CURRIKI-1083
- Exclude items marked as hide_from_search from search results.
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/Constants.java
===================================================================
---
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/Constants.java
2007-10-25 18:47:46 UTC (rev 5503)
+++
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/Constants.java
2007-10-25 22:35:25 UTC (rev 5504)
@@ -56,6 +56,7 @@
public static final String ASSET_TITLE_PROPERTY = "title";
public static final String ASSET_RIGHTS_PROPERTY = "rights";
public static final String ASSET_TRACKING_PROPERTY = "tracking";
+ public static final String ASSET_HIDE_FROM_SEARCH_PROPERTY =
"hide_from_search";
public static final String ASSET_CAPTION_DESCRIPTION_PROPERTY =
"caption_desc";
public static final String ASSET_ALT_DESCRIPTION_PROPERTY = "alt_desc";
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/queries/LuceneAssetQuery.java
===================================================================
---
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/queries/LuceneAssetQuery.java
2007-10-25 18:47:46 UTC (rev 5503)
+++
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/queries/LuceneAssetQuery.java
2007-10-25 22:35:25 UTC (rev 5504)
@@ -28,8 +28,11 @@
{
public void doSearch(int start, int count)
{
- searchTerms = "XWiki.AssetClass."+
Constants.ASSET_FW_ITEMS_PROPERTY+":FW_masterFramework.WebHome AND " +
searchTerms;
- searchTerms += " AND NOT XWiki.TextAssetClass.type:2 AND NOT
web:AssetTemp AND NOT web:Coll_Templates AND NOT name:WebHome AND NOT
name:WebPreferences AND NOT name:MyCollections AND NOT name:SpaceIndex";
+ searchTerms = Constants.ASSET_CLASS+"."+
Constants.ASSET_FW_ITEMS_PROPERTY+":"+Constants.ASSET_FW_ITEMS_DEFAULT+" AND
"+searchTerms;
+ searchTerms += " AND NOT
"+Constants.TEXTASSET_CLASS+"."+Constants.TEXTASSET_TYPE_PROPERTY+":"+Constants.TEXTASSET_TYPE_DIRECTION;
+ searchTerms += " AND NOT web:AssetTemp AND NOT
web:"+Constants.TEMPLATES_SPACE;
+ searchTerms += " AND NOT name:WebHome AND NOT name:WebPreferences AND
NOT name:MyCollections AND NOT name:SpaceIndex";
+ searchTerms += " AND NOT
"+Constants.ASSET_CLASS+"."+Constants.ASSET_HIDE_FROM_SEARCH_PROPERTY+":1";
super.doSearch(start, count);
}
}
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
