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 searchbcr (5.2.1) to 5.2.N (5.2.1)

Browse Source 
135512 gjames: SEARCH-339: Adding enhanced date parsing facet interval requests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@136082 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2017-03-24 13:13:52 +00:00
parent cc6cee0aca
commit 9a9e731bb4
5 changed files with 138 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,19 +25,25 @@
*/
package org.alfresco.repo.search.impl.solr;
import static org.alfresco.util.SearchDateConversion.parseDateInterval;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.opencmis.dictionary.CMISStrictDictionaryService;
import org.alfresco.repo.admin.RepositoryState;
import org.alfresco.repo.dictionary.NamespaceDAO;
import org.alfresco.repo.domain.node.NodeDAO;
import org.alfresco.repo.index.shard.Floc;
import org.alfresco.repo.index.shard.ShardInstance;
import org.alfresco.repo.index.shard.ShardRegistry;
import org.alfresco.repo.search.impl.QueryParserUtils;
import org.alfresco.repo.search.impl.lucene.JSONResult;
import org.alfresco.repo.search.impl.lucene.LuceneQueryParserException;
import org.alfresco.repo.search.impl.lucene.SolrJSONResultSet;
import org.alfresco.repo.search.impl.lucene.SolrJsonProcessor;
import org.alfresco.repo.search.impl.lucene.SolrStatsResult;
import org.alfresco.repo.tenant.TenantService;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.dictionary.PropertyDefinition;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
@@ -105,6 +111,8 @@ public class SolrQueryHTTPClient implements BeanFactoryAware, InitializingBean
{
static Log s_logger = LogFactory.getLog(SolrQueryHTTPClient.class);
private DictionaryService dictionaryService;
private NodeService nodeService;
private PermissionService permissionService;
@@ -141,6 +149,8 @@ public class SolrQueryHTTPClient implements BeanFactoryAware, InitializingBean
private int defaultShardedFacetLimit = 20;
private NamespaceDAO namespaceDAO;
public SolrQueryHTTPClient()
{
}
@@ -153,7 +163,8 @@ public class SolrQueryHTTPClient implements BeanFactoryAware, InitializingBean
PropertyCheck.mandatory(this, "LanguageMappings", languageMappings);
PropertyCheck.mandatory(this, "StoreMappings", storeMappings);
PropertyCheck.mandatory(this, "RepositoryState", repositoryState);
PropertyCheck.mandatory(this, "namespaceDAO", namespaceDAO);
PropertyCheck.mandatory(this, "dictionaryService", dictionaryService);
}
public void setAlternativeDictionary(String alternativeDictionary)
@@ -192,6 +203,16 @@ public class SolrQueryHTTPClient implements BeanFactoryAware, InitializingBean
this.tenantService = tenantService;
}
public void setDictionaryService(DictionaryService dictionaryService)
{
this.dictionaryService = dictionaryService;
}
public void setNamespaceDAO(NamespaceDAO namespaceDAO)
{
this.namespaceDAO = namespaceDAO;
}
public void setShardRegistry(ShardRegistry shardRegistry)
{
this.shardRegistry = shardRegistry;
@@ -810,6 +831,15 @@ public class SolrQueryHTTPClient implements BeanFactoryAware, InitializingBean
{
url.append("&facet.interval=");
String intervalField = interval.getField();
boolean isDate = false;
PropertyDefinition propertyDef = QueryParserUtils.matchPropertyDefinition(searchParameters.getNamespace(),
namespaceDAO, dictionaryService, interval.getField());
if (propertyDef.getDataType().getName().equals(DataTypeDefinition.DATETIME)
|| propertyDef.getDataType().getName().equals(DataTypeDefinition.DATE))
{
isDate = true;
}
if (interval.getLabel() != null && !interval.getLabel().isEmpty())
{
@@ -822,7 +852,8 @@ public class SolrQueryHTTPClient implements BeanFactoryAware, InitializingBean
{
for (IntervalSet aSet:interval.getSets())
{
url.append("&").append(encoder.encode("f."+intervalField+".facet.interval.set", "UTF-8")).append("=").append(encoder.encode(aSet.toParam(), "UTF-8"));
IntervalSet validated = parseDateInterval(aSet,isDate);
url.append("&").append(encoder.encode("f."+intervalField+".facet.interval.set", "UTF-8")).append("=").append(encoder.encode(validated.toParam(), "UTF-8"));
}
}
}