inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restored 'title' search to SiteService.listSites() that I had "over optimized" out - but removed *term* expansion for fields already tokenized.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13799 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-04-01 21:21:24 +00:00
parent b1380aca02
commit 3ba8f25ab0
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/java/org/alfresco/repo/site/SiteServiceImpl.java
View File

@@ -574,8 +574,8 @@ public class SiteServiceImpl implements SiteService, SiteModel
if (nameFilter != null && nameFilter.length() != 0) if (nameFilter != null && nameFilter.length() != 0)
{ {
String escNameFilter = LuceneQueryParser.escape(nameFilter.replace('"', ' ')); String escNameFilter = LuceneQueryParser.escape(nameFilter.replace('"', ' '));
// Perform a Lucene search under the Site parent node using *name* and *description* search query // Perform a Lucene search under the Site parent node using *name*, title and description search query
QueryParameterDefinition[] params = new QueryParameterDefinition[2]; QueryParameterDefinition[] params = new QueryParameterDefinition[3];
params[0] = new QueryParameterDefImpl( params[0] = new QueryParameterDefImpl(
ContentModel.PROP_NAME, ContentModel.PROP_NAME,
dictionaryService.getDataType( dictionaryService.getDataType(
@@ -584,6 +584,13 @@ public class SiteServiceImpl implements SiteService, SiteModel
escNameFilter); escNameFilter);
params[1] = new QueryParameterDefImpl( params[1] = new QueryParameterDefImpl(
ContentModel.PROP_TITLE,
dictionaryService.getDataType(
DataTypeDefinition.TEXT),
true,
escNameFilter);
params[2] = new QueryParameterDefImpl(
ContentModel.PROP_DESCRIPTION, ContentModel.PROP_DESCRIPTION,
dictionaryService.getDataType( dictionaryService.getDataType(
DataTypeDefinition.TEXT), DataTypeDefinition.TEXT),
@@ -593,7 +600,9 @@ public class SiteServiceImpl implements SiteService, SiteModel
// get the sites that match the specified names // get the sites that match the specified names
StringBuilder query = new StringBuilder(128); StringBuilder query = new StringBuilder(128);
query.append("+PARENT:\"").append(siteRoot.toString()) query.append("+PARENT:\"").append(siteRoot.toString())
.append("\" +(@cm\\:name:\"*${cm:name}*\" @cm\\:description:\"*${cm:description}*\")"); .append("\" +(@cm\\:name:\"*${cm:name}*\"")
.append(" @cm\\:title:\"${cm:title}\"")
.append(" @cm\\:description:\"${cm:description}\")");
ResultSet results = this.searchService.query( ResultSet results = this.searchService.query(
siteRoot.getStoreRef(), siteRoot.getStoreRef(),
SearchService.LANGUAGE_LUCENE, SearchService.LANGUAGE_LUCENE,