Merged searchrep (5.2.1) to 5.2.N (5.2.1)

137028 gjames: SEARCH-456: quoting filter queries where possible


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137092 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2017-06-01 11:25:11 +00:00
parent 4f24842830
commit 9c06cb249e
2 changed files with 4 additions and 3 deletions

View File

@@ -483,7 +483,7 @@ public class SolrJSONResultSet implements ResultSet, JSONResult
nested.addAll(rangefacets); nested.addAll(rangefacets);
} }
GenericBucket buck = new GenericBucket(value, field+":"+value, null, metrics, nested); GenericBucket buck = new GenericBucket(value, field+":\""+value+"\"", null, metrics, nested);
List<GenericBucket> listBucks = pivotBuckets.containsKey(field)?pivotBuckets.get(field):new ArrayList<>(); List<GenericBucket> listBucks = pivotBuckets.containsKey(field)?pivotBuckets.get(field):new ArrayList<>();
listBucks.add(buck); listBucks.add(buck);
pivotBuckets.put(field, listBucks); pivotBuckets.put(field, listBucks);

View File

@@ -137,8 +137,9 @@ public class RangeResultMapper
facet.remove(GenericFacetResponse.LABEL); facet.remove(GenericFacetResponse.LABEL);
filterQ.append(facetField).append(":") filterQ.append(facetField).append(":")
.append(startFilterQuery) .append(startFilterQuery)
.append(start).append(" TO ") .append("\"").append(start).append("\"")
.append(end) .append(" TO ")
.append("\"").append(end).append("\"")
.append(endFilterQuery); .append(endFilterQuery);
Set<Metric> metrics = new HashSet<Metric>( Set<Metric> metrics = new HashSet<Metric>(