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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

32
source/java/org/alfresco/cmis/dictionary/CMISBasePropertyDefinition.java
View File

@@ -38,14 +38,6 @@ import org.alfresco.repo.dictionary.IndexTokenisationMode;
import org.alfresco.repo.dictionary.constraint.ListOfValuesConstraint;
import org.alfresco.repo.dictionary.constraint.NumericRangeConstraint;
import org.alfresco.repo.dictionary.constraint.StringLengthConstraint;
import org.alfresco.repo.search.impl.lucene.analysis.DateAnalyser;
import org.alfresco.repo.search.impl.lucene.analysis.DateTimeAnalyser;
import org.alfresco.repo.search.impl.lucene.analysis.DoubleAnalyser;
import org.alfresco.repo.search.impl.lucene.analysis.FloatAnalyser;
import org.alfresco.repo.search.impl.lucene.analysis.IntegerAnalyser;
import org.alfresco.repo.search.impl.lucene.analysis.LongAnalyser;
import org.alfresco.repo.search.impl.lucene.analysis.PathAnalyser;
import org.alfresco.repo.search.impl.lucene.analysis.VerbatimAnalyser;
import org.alfresco.service.cmr.dictionary.Constraint;
import org.alfresco.service.cmr.dictionary.ConstraintDefinition;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
@@ -172,21 +164,19 @@ public class CMISBasePropertyDefinition implements CMISPropertyDefinition, Seria
break;
case TRUE:
default:
String analyserClassName = propDef.resolveAnalyserClassName();
if (propDef.getDataType().getName().equals(DataTypeDefinition.BOOLEAN))
if (propDef.getDataType().getName().equals(DataTypeDefinition.BOOLEAN)
|| propDef.getDataType().getName().equals(DataTypeDefinition.DATE)
|| propDef.getDataType().getName().equals(DataTypeDefinition.DATETIME)
|| propDef.getDataType().getName().equals(DataTypeDefinition.DOUBLE)
|| propDef.getDataType().getName().equals(DataTypeDefinition.FLOAT)
|| propDef.getDataType().getName().equals(DataTypeDefinition.INT)
|| propDef.getDataType().getName().equals(DataTypeDefinition.LONG)
|| propDef.getDataType().getName().equals(DataTypeDefinition.PATH)
)
{
orderable = true;
} else if (analyserClassName.equals(DateTimeAnalyser.class.getCanonicalName())
|| analyserClassName.equals(DateAnalyser.class.getCanonicalName())
|| analyserClassName.equals(DoubleAnalyser.class.getCanonicalName())
|| analyserClassName.equals(FloatAnalyser.class.getCanonicalName())
|| analyserClassName.equals(IntegerAnalyser.class.getCanonicalName())
|| analyserClassName.equals(LongAnalyser.class.getCanonicalName())
|| analyserClassName.equals(PathAnalyser.class.getCanonicalName())
|| analyserClassName.equals(VerbatimAnalyser.class.getCanonicalName()))
{
orderable = true;
} else
}
else
{
orderable = false;
}