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 BRANCHES/DEV/V4.0-BUG-FIX to HEAD

Browse Source 
35833: Fix for ALF-13881 - Unable to search against custom properties or any props requiring other than cm: namespace default in Share Person Search

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@35834 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2012-04-27 13:51:52 +00:00
parent 14bb26158d
commit 26af16e331
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -533,7 +533,7 @@ public final class People extends BaseScopableProcessorExtension implements Init
{ {
String term = filter.replace("\\", "").replace("\"", ""); String term = filter.replace("\\", "").replace("\"", "");
StringTokenizer t = new StringTokenizer(term, " "); StringTokenizer t = new StringTokenizer(term, " ");
int propIndex = term.indexOf(':'); int propIndex = term.lastIndexOf(':');
int wildPosition = term.indexOf('*'); int wildPosition = term.indexOf('*');
if ((t.countTokens() == 1) && (propIndex == -1) && ((wildPosition == -1) || (wildPosition == (term.length() - 1) ))) if ((t.countTokens() == 1) && (propIndex == -1) && ((wildPosition == -1) || (wildPosition == (term.length() - 1) )))
@@ -573,13 +573,13 @@ public final class People extends BaseScopableProcessorExtension implements Init
query.append(term.substring(0, propIndex+1)) query.append(term.substring(0, propIndex+1))
.append('"') .append('"')
.append(term.substring(propIndex+1)); .append(term.substring(propIndex+1));
if(propIndex > 0) if (propIndex > 0)
{ {
query.append('"'); query.append('"');
} }
else else
{ {
query.append("*\""); query.append("*\"");
} }
} }
else else
@@ -638,7 +638,7 @@ public final class People extends BaseScopableProcessorExtension implements Init
else else
{ {
// fts-alfresco property search i.e. "location:maidenhead" // fts-alfresco property search i.e. "location:maidenhead"
propIndex = term.indexOf(':'); propIndex = term.lastIndexOf(':');
query.append(term.substring(0, propIndex+1)) query.append(term.substring(0, propIndex+1))
.append('"') .append('"')
.append(term.substring(propIndex+1)) .append(term.substring(propIndex+1))