From 95cdff81f51d82ee4149d8e77857cbfea1995f8e Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Mon, 17 Jan 2011 10:01:29 +0000 Subject: [PATCH] Merged V3.4 to HEAD 24322: Fix for ALF-5311 - People search by properties is not handling tokenized fields correctly 24407: Merged V3.3 to V3.4 24406: Merged PATCHES/V3.3.4 to V3.3 24405: Fix for ALF-6098 - links display issue encoding link url 24706: Merged V3.4-BUG-FIX to V3.4 24705: Fix for ALF-6365, ALF-6335 24709: Missing first/last name handling. 24711: Merged V3.3 to V3.4 24710: ALF-5535 - Fix to correctly format json number values (not as numeric human readable strings) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24871 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/repo/jscript/People.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/source/java/org/alfresco/repo/jscript/People.java b/source/java/org/alfresco/repo/jscript/People.java index e2ad589f0b..a856cf64db 100644 --- a/source/java/org/alfresco/repo/jscript/People.java +++ b/source/java/org/alfresco/repo/jscript/People.java @@ -510,7 +510,8 @@ public final class People extends BaseScopableProcessorExtension implements Init StringTokenizer t = new StringTokenizer(term, " "); if (t.countTokens() == 1) { - if (term.indexOf(':') == -1) + int propIndex = term.indexOf(':'); + if (propIndex == -1) { // simple search: first name, last name and username starting with term query.append("firstName:\""); @@ -523,8 +524,11 @@ public final class People extends BaseScopableProcessorExtension implements Init } else { - // fts-alfresco property search i.e. "location:maidenhead" - query.append(term); + // fts-alfresco property search i.e. location:"maidenhead" + query.append(term.substring(0, propIndex+1)) + .append('"') + .append(term.substring(propIndex+1)) + .append('"'); } } else @@ -587,7 +591,11 @@ public final class People extends BaseScopableProcessorExtension implements Init else { // fts-alfresco property search i.e. "location:maidenhead" - query.append(term); + int propIndex = term.indexOf(':'); + query.append(term.substring(0, propIndex+1)) + .append('"') + .append(term.substring(propIndex+1)) + .append('"'); propertySearch = true; }