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

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

Browse Source 
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

174
source/java/org/alfresco/repo/jscript/People.java
View File

@@ -582,7 +582,8 @@ public class People extends BaseScopableProcessorExtension implements Initializi
pagingRequest.setMaxItems(maxResults);
}
if (useCQ)
// In order to use a SOLR/Lucene search, we must have a non-empty filter string - see ALF-18876
if ((filter == null || filter.trim().isEmpty()) || useCQ)
{
persons = getPeopleImplDB(filter, pagingRequest, sortBy, sortAsc);
}
@@ -698,89 +699,93 @@ public class People extends BaseScopableProcessorExtension implements Initializi
if (t.countTokens() == 1)
{
// single word with no field will go against _PERSON and expand
// fts-alfresco property search i.e. location:"maidenhead"
query.append(term.substring(0, propIndex+1))
.append('"')
.append(term.substring(propIndex+1));
if (propIndex > 0)
{
query.append('"');
}
else
{
query.append("*\"");
}
}
else
{
// scan for non-fts-alfresco property search tokens
int nonFtsTokens = 0;
while (t.hasMoreTokens())
{
if (t.nextToken().indexOf(':') == -1) nonFtsTokens++;
}
t = new StringTokenizer(term, " ");
// multiple terms supplied - look for first and second name etc.
// assume first term is first name, any more are second i.e. "Fraun van de Wiels"
// also allow fts-alfresco property search to reduce results
params.setDefaultOperator(SearchParameters.Operator.AND);
boolean firstToken = true;
boolean tokenSurname = false;
boolean propertySearch = false;
while (t.hasMoreTokens())
// single word with no field will go against _PERSON and expand
// fts-alfresco property search i.e. location:"maidenhead"
query.append(term.substring(0, propIndex + 1)).append('"')
.append(term.substring(propIndex + 1));
if (propIndex > 0)
{
query.append('"');
}
else
{
query.append("*\"");
}
}
else
{
// scan for non-fts-alfresco property search tokens
int nonFtsTokens = 0;
while (t.hasMoreTokens())
{
if (t.nextToken().indexOf(':') == -1)
nonFtsTokens++;
}
t = new StringTokenizer(term, " ");
// multiple terms supplied - look for first and second name etc.
// also allow fts-alfresco property search to reduce results
params.setDefaultOperator(SearchParameters.Operator.AND);
boolean propertySearch = false;
StringBuilder multiPartNames = new StringBuilder(term.length());
int numOfTokens = t.countTokens();
int counter = 1;
while (t.hasMoreTokens())
{
term = t.nextToken();
if (!propertySearch && term.indexOf(':') == -1)
{
if (nonFtsTokens == 1)
{
// simple search: first name, last name and username
// starting with term
query.append("_PERSON:\"");
query.append(term);
query.append("*\" ");
}
else
{
// ALF-11311, in order to support multi-part firstNames/lastNames,
// we need to use the whole tokenized term for both
// firstName and lastName
if (term.endsWith("*"))
{
term = t.nextToken();
if (!propertySearch && term.indexOf(':') == -1)
{
if (nonFtsTokens == 1)
{
// simple search: first name, last name and username starting with term
query.append("_PERSON:\"");
query.append(term);
query.append("*\" ");
}
else
{
if (firstToken)
{
query.append("firstName:\"");
query.append(term);
query.append("*\" ");
firstToken = false;
}
else
{
if (tokenSurname)
{
query.append("OR ");
}
query.append("lastName:\"");
query.append(term);
query.append("*\" ");
tokenSurname = true;
}
}
}
else
{
// fts-alfresco property search i.e. "location:maidenhead"
propIndex = term.lastIndexOf(':');
query.append(term.substring(0, propIndex+1))
.append('"')
.append(term.substring(propIndex+1))
.append('"')
.append(' ');
propertySearch = true;
}
}
}
query.append(")");
term = term.substring(0, term.lastIndexOf("*"));
}
multiPartNames.append("\"");
multiPartNames.append(term);
multiPartNames.append("*\"");
if (numOfTokens > counter)
{
multiPartNames.append(' ');
}
counter++;
}
}
else
{
// fts-alfresco property search i.e. "location:maidenhead"
propIndex = term.lastIndexOf(':');
query.append(term.substring(0, propIndex + 1)).append('"')
.append(term.substring(propIndex + 1)).append('"').append(' ');
propertySearch = true;
}
}
// ALF-11311, in order to support multi-part firstNames/lastNames,
// we need to use the whole tokenized term for both firstName and lastName.
// e.g. "john junior lewis martinez", where "john junior" is the first
// name and "lewis martinez" is the last name.
if (multiPartNames.length() > 0)
{
query.append("firstName:");
query.append(multiPartNames);
query.append(" OR lastName:");
query.append(multiPartNames);
}
}
query.append(")");
// define the search parameters
params.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
@@ -861,12 +866,11 @@ public class People extends BaseScopableProcessorExtension implements Initializi
private List<NodeRef> getSortedPeopleObjects(List<NodeRef> peopleRefs, final String sortBy, Boolean sortAsc)
{
if(sortBy == null)
if (sortBy == null)
{
return peopleRefs;
}
//make copy of peopleRefs because it can be unmodifiable list.
List<NodeRef> sortedPeopleRefs = new ArrayList<NodeRef>(peopleRefs);
final Collator col = Collator.getInstance(I18NUtil.getLocale());