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

Merge branch 'feature/SEARCH-2151_DateFunctionsSelect' of git.alfresco.com:search_discovery/insightengine into feature/SEARCH-2166_DateFunctionWhere

Browse Source
This commit is contained in:
eliaporciani
2020-05-18 10:45:48 +02:00
parent e25374e0a7 f6a10e4ec3
commit b86665412d
2 changed files with 5 additions and 5 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
+4 -4
View File
@@ -1041,7 +1041,7 @@ public class AlfrescoSolrDataModel implements QueryConstants
}
public String getDateDerivedFIeld(QName propertyQName)
public String getDateDerivedField(QName propertyQName)
{
PropertyDefinition propertyDefinition = getPropertyDefinition(propertyQName);
return "part@sd@" + propertyDefinition.getName().toString();
@@ -1652,10 +1652,10 @@ public class AlfrescoSolrDataModel implements QueryConstants
}
if ((propertyDef.getDataType().getName().equals(DataTypeDefinition.DATETIME)
|| propertyDef.getDataType().getName().equals(DataTypeDefinition.DATE) &&
!isDerivedDateField(fieldNameAndEnding.getSecond())))
|| propertyDef.getDataType().getName().equals(DataTypeDefinition.DATE)) &&
isDerivedDateField(fieldNameAndEnding.getSecond()))
{
return getDateDerivedFIeld(propertyDef.getName()) + fieldNameAndEnding.getSecond();
return getDateDerivedField(propertyDef.getName()) + fieldNameAndEnding.getSecond();
}
else if (propertyDef.getDataType().getName().equals(DataTypeDefinition.TEXT))
{
search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java
+1 -1
View File
@@ -4232,7 +4232,7 @@ public class Solr4QueryParser extends QueryParser implements QueryConstants
{
return subQueryBuilder.getQuery(
AlfrescoSolrDataModel.getInstance()
.getDateDerivedFIeld(propertyQName) + fieldNameAndEnding.getSecond(),
.getDateDerivedField(propertyQName) + fieldNameAndEnding.getSecond(),
queryText, analysisMode, luceneFunction);
}
}