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

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

Browse Source 
136958 gjames: SEARCH-340: Fixing range tags


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137075 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2017-06-01 11:12:54 +00:00
parent 7b2503b73d
commit 6ab77f9459
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
View File

@@ -860,7 +860,21 @@ public class SolrQueryHTTPClient implements BeanFactoryAware, InitializingBean
boolean endInc = facetRange.isRangeEndInclusive(); boolean endInc = facetRange.isRangeEndInclusive();
IntervalSet rangeSet = parseDateInterval(new IntervalSet(facetRange.getStart(), facetRange.getEnd(), facetRange.getGap(), startIncl, endInc), isDate); IntervalSet rangeSet = parseDateInterval(new IntervalSet(facetRange.getStart(), facetRange.getEnd(), facetRange.getGap(), startIncl, endInc), isDate);
url.append("&facet.range=").append(encoder.encode(facetRange.getField(), "UTF-8")); url.append("&facet.range=");
if(!facetRange.getTags().isEmpty())
{
url.append(encoder.encode("{!", "UTF-8"));
for(String tag:facetRange.getTags())
{
url.append(encoder.encode(String.format("tag=%s ",tag), "UTF-8"));
}
url.append(encoder.encode("}", "UTF-8"));
}
url.append(encoder.encode(facetRange.getField(), "UTF-8"));
//Check if date and if inclusive or not //Check if date and if inclusive or not
url.append(String.format("&f.%s.facet.range.start=",fieldName)).append(encoder.encode(""+ rangeSet.getStart(), "UTF-8")); url.append(String.format("&f.%s.facet.range.start=",fieldName)).append(encoder.encode(""+ rangeSet.getStart(), "UTF-8"));
url.append(String.format("&f.%s.facet.range.end=",fieldName)).append(encoder.encode(""+ rangeSet.getEnd(), "UTF-8")); url.append(String.format("&f.%s.facet.range.end=",fieldName)).append(encoder.encode(""+ rangeSet.getEnd(), "UTF-8"));
@@ -901,14 +915,6 @@ public class SolrQueryHTTPClient implements BeanFactoryAware, InitializingBean
} }
} }
if(!facetRange.getTags().isEmpty())
{
for(String tag:facetRange.getTags())
{
url.append(String.format("&fq={!tag=%1$s}%1$s",tag));
}
}
} }
} }
} }