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

For ACE-1513, additional fix for cm:name to hopefully benefit from default site creation behaviour

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68120 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2014-04-28 10:24:51 +00:00
parent e6e3814951
commit 798e3af1a0
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -837,21 +837,26 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
query.append(" AND (");
String escNameFilter = SearchLanguageConversion.escapeLuceneQuery(filter.replace('"', ' '));
String[] tokenizedFilter = SearchLanguageConversion.tokenizeString(escNameFilter);
query.append(" cm:name:\"" + StringUtils.trimAllWhitespace(escNameFilter) + "*\"")
.append(" OR ")
//cm:name
query.append(" cm:name:\" ");
for( int i = 0; i < tokenizedFilter.length; i++)
{
if (i!=0) //Not first element
{
query.append("?");
}
query.append(tokenizedFilter[i].toLowerCase());
}
query.append("*\"");
//cm:title
query.append(" OR ")
.append(" cm:title: (");
for (String token: tokenizedFilter)
{
query.append("\""+token+"*\" ");
}
// for( int i = 0; i < tokenizedFilter.length; i++)
// {
// if (i!=0) //Not first element
// {
// query.append(" AND |");
// }
// query.append(tokenizedFilter[i]+"*");
// }
query.append(")");
query.append(" OR cm:description:\"" + escNameFilter + "\"");
@@ -867,7 +872,12 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
sp.setLimit(size);
sp.setLimitBy(LimitBy.FINAL_SIZE);
}
if(logger.isDebugEnabled())
{
logger.debug("Search parameters are: " + sp);
}
ResultSet results = this.searchService.query(sp);
try
{