inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
136312 gjames: SEARCH-339: Fixing afts filterquery


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2017-06-01 11:06:29 +00:00
parent 64a0f743a2
commit 747c899312
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSet.java
View File

@@ -193,17 +193,6 @@ public class SolrJSONResultSet implements ResultSet, JSONResult
}
}
Map<String, String> intervalMappings = new HashMap<>();
if(json.has("_interval_mappings_"))
{
JSONObject interval_mappings = json.getJSONObject("_interval_mappings_");
for(Iterator it = interval_mappings.keys(); it.hasNext(); /**/)
{
String original = (String) it.next();
intervalMappings.put(interval_mappings.getString(original), original);
}
}
//Process hightlight response
if(json.has("highlighting"))
{
@@ -279,8 +268,6 @@ public class SolrJSONResultSet implements ResultSet, JSONResult
{
String fieldName = (String)it.next();
JSONObject intervals = facet_intervals.getJSONObject(fieldName);
//TODO: Handle a label
String fieldkey = intervalMappings.containsKey(fieldName)?intervalMappings.get(fieldName):fieldName;
ArrayList<Pair<String, Integer>> intervalValues = new ArrayList<Pair<String, Integer>>(intervals.length());
for(Iterator itk = intervals.keys(); itk.hasNext(); /**/)
@@ -289,7 +276,7 @@ public class SolrJSONResultSet implements ResultSet, JSONResult
Integer count = Integer.parseInt(intervals.getString(key));
intervalValues.add(new Pair<String, Integer>(key, count));
}
facetIntervals.put(fieldkey,intervalValues);
facetIntervals.put(fieldName,intervalValues);
}
}
if(facet_counts.has("facet_pivot"))