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-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
70682: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      69736: ACE-1615: Fixed the search result to return empty arrays for field facets, when no facet queries are available.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70914 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Draper
2014-05-19 12:49:53 +00:00
parent 98e88f9d65
commit 13c1057ba7
2 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/java/org/alfresco/repo/jscript/Search.java
View File

@@ -938,6 +938,14 @@ public class Search extends BaseScopableProcessorExtension implements Initializi
facetMeta.put(ff.getField(), facets);
}
// Start of bucketing
// ACE-1615: Populate the facetMeta map with empty lists. If there is a
// facet query with >0 hits, the relevant list will be populated
// with the results, otherwise the list remains empty.
for(String bucketedField : solrFacetHelper.getBucketedFieldFacets())
{
facetMeta.put(bucketedField, new ArrayList<ScriptFacetResult>());
}
Set<Entry<String, Integer>> facetQueries = results.getFacetQueries().entrySet();
for(Entry<String, Integer> entry : facetQueries)
{
@@ -954,18 +962,17 @@ public class Search extends BaseScopableProcessorExtension implements Initializi
List<ScriptFacetResult> fqs = facetMeta.get(qName);
if (fqs == null)
{
fqs = new ArrayList<>();
// Shouldn't be here
throw new AlfrescoRuntimeException("Field facet [" + qName + "] has"
+ " not been registerd with SolrFacetHelper.BUCKETED_FIELD_FACETS.");
}
FacetLabelDisplayHandler handler = solrFacetHelper.getDisplayHandler(qName);
FacetLabel facetLabel = (handler == null) ? new FacetLabel(qName, key.substring(qName.length(),
key.length()), -1) : handler.getDisplayLabel(key);
fqs.add(new ScriptFacetResult(facetLabel.getValue(), facetLabel.getLabel(), facetLabel.getLabelIndex(), entry.getValue()));
// store facet query results per field
facetMeta.put(qName, fqs);
}
}
}// End of bucketing
meta.put("facets", facetMeta);
}
catch (Throwable err)