inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Search-679, handle schema mapping correctly for sort

Browse Source
This commit is contained in:
Michael
2018-01-12 13:48:18 +00:00
parent 9567b3cffd
commit 8096bc5369
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoSolrDataModel.java
+18 -4
View File
@@ -1940,7 +1940,13 @@ public class AlfrescoSolrDataModel implements QueryConstants
ContextAwareQuery contextAwareQuery = new ContextAwareQuery(luceneQuery, Boolean.TRUE.equals(isFilter) ? null : searchParameters);
return contextAwareQuery;
}
private PropertyDefinition getPropertyDefinition(String identifier)
{
return QueryParserUtils.matchPropertyDefinition(NamespaceService.CONTENT_MODEL_1_0_URI,
getNamespaceDAO(),
getDictionaryService(CMISStrictDictionaryService.DEFAULT),
identifier);
}
/**
*
* @param potentialProperty String
@@ -1976,9 +1982,17 @@ public class AlfrescoSolrDataModel implements QueryConstants
Pair<String, String> fieldNameAndEnding = QueryParserUtils.extractFieldNameAndEnding(potentialProperty);
String luceneField = functionContext.getLuceneFieldName(fieldNameAndEnding.getFirst());
PropertyDefinition propertyDef = QueryParserUtils.matchPropertyDefinition(NamespaceService.CONTENT_MODEL_1_0_URI, getNamespaceDAO(), getDictionaryService(CMISStrictDictionaryService.DEFAULT), fieldNameAndEnding.getFirst());
PropertyDefinition propertyDef = getPropertyDefinition(fieldNameAndEnding.getFirst());
//Retry scan using luceneField.
if(propertyDef == null)
{
if(luceneField.contains("@"))
{
int index = luceneField.lastIndexOf("@");
propertyDef = getPropertyDefinition(luceneField.substring(index +1));
}
}
String solrSortField = null;
if(propertyDef != null)
{