Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)

62931: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62696: ACE-480  Split Data-Model into Lucene Independent and Legacy Lucene Project


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62986 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-20 14:59:18 +00:00
parent 3e55fd9ca1
commit 9dca412a8c
31 changed files with 327 additions and 347 deletions

View File

@@ -20,8 +20,7 @@ package org.alfresco.cmis.mapping;
import java.io.Serializable;
import org.alfresco.repo.search.impl.lucene.LuceneQueryParserAdaptor;
import org.alfresco.repo.search.impl.lucene.analysis.DateTimeAnalyser;
import org.alfresco.repo.search.adaptor.lucene.LuceneQueryParserAdaptor;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.PropertyDefinition;
@@ -101,11 +100,7 @@ public class DirectProperty extends AbstractSimpleProperty
}
else if (propertyDef.getDataType().getName().equals(DataTypeDefinition.DATETIME))
{
String analyserClassName = propertyDef.resolveAnalyserClassName();
if (analyserClassName.equals(DateTimeAnalyser.class.getCanonicalName()))
{
field = field + ".sort";
}
field = lqpa.getDatetimeSortField(field, propertyDef);
}
return field;