Merge from SEAMIST3

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2025-08-07 17:49:17 +00:00 · 2008-09-04 11:22:17 +00:00
parent 41b5618d1d
commit a6625b1c61
63 changed files with 5450 additions and 962 deletions
--- a/source/java/org/alfresco/cmis/property/SimplePropertyAccessor.java
+++ b/source/java/org/alfresco/cmis/property/SimplePropertyAccessor.java
@@ -25,20 +25,27 @@
 package org.alfresco.cmis.property;

 import java.io.Serializable;
+import java.util.Collection;

 import org.alfresco.repo.search.impl.lucene.LuceneQueryParser;
 import org.alfresco.repo.search.impl.lucene.ParseException;
+import org.alfresco.repo.search.impl.querymodel.PredicateMode;
 import org.alfresco.service.cmr.dictionary.PropertyDefinition;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.namespace.QName;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.MatchAllDocsQuery;
 import org.apache.lucene.search.Query;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.BooleanClause.Occur;
 import org.springframework.beans.factory.InitializingBean;

 /**
 * A simple 1-1 property mapping from a CMIS property name to an alfresco property
+ * 
 * @author andyh
- *
 */
 public class SimplePropertyAccessor extends AbstractNamedPropertyAccessor implements InitializingBean
 {
@@ -61,37 +68,211 @@ public class SimplePropertyAccessor extends AbstractNamedPropertyAccessor implem
        propertyQname = QName.resolveToQName(getServiceRegistry().getNamespaceService(), mapping);
    }

-    /* (non-Javadoc)
-     * @see org.alfresco.cmis.property.GenericPropertyAccessor#buildLuceneEquality(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.lang.String, java.io.Serializable)
-     */
-    public Query buildLuceneEquality(LuceneQueryParser lqp, String propertyName, Serializable value) throws ParseException
+    private String getLuceneFieldName()
    {
-        StringBuilder field = new StringBuilder();
+        StringBuilder field = new StringBuilder(64);
        field.append("@");
        field.append(propertyQname);
-        
-        // Check type conversion 
-        
+        return field.toString();
+    }
+
+    private String getValueAsString(Serializable value)
+    {
        PropertyDefinition pd = getServiceRegistry().getDictionaryService().getProperty(propertyQname);
        Object converted = DefaultTypeConverter.INSTANCE.convert(pd.getDataType(), value);
-        String asString =  DefaultTypeConverter.INSTANCE.convert(String.class, converted);
-        
-        return lqp.getFieldQuery(field.toString(), asString);
+        String asString = DefaultTypeConverter.INSTANCE.convert(String.class, converted);
+        return asString;
    }
-    
-    /* (non-Javadoc)
-     * @see org.alfresco.cmis.property.GenericPropertyAccessor#buildLuceneExists(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.lang.String, java.lang.Boolean)
-     */
-    public Query buildLuceneExists(LuceneQueryParser lqp, String propertyName, Boolean not) throws ParseException
-    {

-        if(not)
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.alfresco.cmis.property.NamedPropertyAccessor#buildLuceneEquality(org.alfresco.repo.search.impl.lucene.LuceneQueryParser,
+     *      java.lang.String, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode)
+     */
+    public Query buildLuceneEquality(LuceneQueryParser lqp, String xxxx, Serializable value, PredicateMode mode) throws ParseException
+    {
+        String field = getLuceneFieldName();
+        String stringValue = getValueAsString(value);
+        return lqp.getFieldQuery(field, stringValue);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.alfresco.cmis.property.NamedPropertyAccessor#buildLuceneExists(org.alfresco.repo.search.impl.lucene.LuceneQueryParser,
+     *      java.lang.String, java.lang.Boolean)
+     */
+    public Query buildLuceneExists(LuceneQueryParser lqp, String xxxx, Boolean not) throws ParseException
+    {
+        if (not)
        {
            return lqp.getFieldQuery("ISNULL", propertyQname.toString());
        }
        else
        {
            return lqp.getFieldQuery("ISNOTNULL", propertyQname.toString());
-        }   
+        }
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.alfresco.cmis.property.NamedPropertyAccessor#buildLuceneGreaterThan(org.alfresco.repo.search.impl.lucene.LuceneQueryParser,
+     *      java.lang.String, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode)
+     */
+    public Query buildLuceneGreaterThan(LuceneQueryParser lqp, String xxxx, Serializable value, PredicateMode mode) throws ParseException
+    {
+        String field = getLuceneFieldName();
+        String stringValue = getValueAsString(value);
+        return lqp.getRangeQuery(field, stringValue, "\uFFFF", false, true);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.alfresco.cmis.property.NamedPropertyAccessor#buildLuceneGreaterThanOrEquals(org.alfresco.repo.search.impl.lucene.LuceneQueryParser,
+     *      java.lang.String, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode)
+     */
+    public Query buildLuceneGreaterThanOrEquals(LuceneQueryParser lqp, String xxxx, Serializable value, PredicateMode mode) throws ParseException
+    {
+        String field = getLuceneFieldName();
+        String stringValue = getValueAsString(value);
+        return lqp.getRangeQuery(field, stringValue, "\uFFFF", true, true);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.alfresco.cmis.property.NamedPropertyAccessor#buildLuceneIn(org.alfresco.repo.search.impl.lucene.LuceneQueryParser,
+     *      java.lang.String, java.util.Collection, java.lang.Boolean,
+     *      org.alfresco.repo.search.impl.querymodel.PredicateMode)
+     */
+    public Query buildLuceneIn(LuceneQueryParser lqp, String xxxx, Collection<Serializable> values, Boolean not, PredicateMode mode) throws ParseException
+    {
+        String field = getLuceneFieldName();
+        PropertyDefinition pd = getServiceRegistry().getDictionaryService().getProperty(propertyQname);
+
+        // Check type conversion
+
+        @SuppressWarnings("unused")
+        Object converted = DefaultTypeConverter.INSTANCE.convert(pd.getDataType(), values);
+        Collection<String> asStrings = DefaultTypeConverter.INSTANCE.convert(String.class, values);
+
+        if (asStrings.size() == 0)
+        {
+            if (not)
+            {
+                return new MatchAllDocsQuery();
+            }
+            else
+            {
+                return new TermQuery(new Term("NO_TOKENS", "__"));
+            }
+        }
+        else if (asStrings.size() == 1)
+        {
+            String value = asStrings.iterator().next();
+            if (not)
+            {
+                return lqp.getDoesNotMatchFieldQuery(field, value);
+            }
+            else
+            {
+                return lqp.getFieldQuery(field, value);
+            }
+        }
+        else
+        {
+            BooleanQuery booleanQuery = new BooleanQuery();
+            if (not)
+            {
+                booleanQuery.add(new MatchAllDocsQuery(), Occur.MUST);
+            }
+            for (String value : asStrings)
+            {
+                Query any = lqp.getFieldQuery(field, value);
+                if (not)
+                {
+                    booleanQuery.add(any, Occur.MUST_NOT);
+                }
+                else
+                {
+                    booleanQuery.add(any, Occur.SHOULD);
+                }
+            }
+            return booleanQuery;
+        }
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.alfresco.cmis.property.NamedPropertyAccessor#buildLuceneInequality(org.alfresco.repo.search.impl.lucene.LuceneQueryParser,
+     *      java.lang.String, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode)
+     */
+    public Query buildLuceneInequality(LuceneQueryParser lqp, String xxxx, Serializable value, PredicateMode mode) throws ParseException
+    {
+        String field = getLuceneFieldName();
+        String stringValue = getValueAsString(value);
+        return lqp.getDoesNotMatchFieldQuery(field, stringValue);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.alfresco.cmis.property.NamedPropertyAccessor#buildLuceneLessThan(org.alfresco.repo.search.impl.lucene.LuceneQueryParser,
+     *      java.lang.String, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode)
+     */
+    public Query buildLuceneLessThan(LuceneQueryParser lqp, String xxxx, Serializable value, PredicateMode mode) throws ParseException
+    {
+        String field = getLuceneFieldName();
+        String stringValue = getValueAsString(value);
+        return lqp.getRangeQuery(field, "\u0000", stringValue, true, false);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.alfresco.cmis.property.NamedPropertyAccessor#buildLuceneLessThanOrEquals(org.alfresco.repo.search.impl.lucene.LuceneQueryParser,
+     *      java.lang.String, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode)
+     */
+    public Query buildLuceneLessThanOrEquals(LuceneQueryParser lqp, String xxx, Serializable value, PredicateMode mode) throws ParseException
+    {
+        String field = getLuceneFieldName();
+        String stringValue = getValueAsString(value);
+        return lqp.getRangeQuery(field, "\u0000", stringValue, true, true);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.alfresco.cmis.property.NamedPropertyAccessor#buildLuceneLike(org.alfresco.repo.search.impl.lucene.LuceneQueryParser,
+     *      java.lang.String, java.io.Serializable, java.lang.Boolean)
+     */
+    public Query buildLuceneLike(LuceneQueryParser lqp, String xxxx, Serializable value, Boolean not) throws ParseException
+    {
+        String field = getLuceneFieldName();
+        String stringValue = getValueAsString(value);
+
+        if (not)
+        {
+            BooleanQuery booleanQuery = new BooleanQuery();
+            booleanQuery.add(new MatchAllDocsQuery(), Occur.MUST);
+            booleanQuery.add(lqp.getLikeQuery(field, stringValue), Occur.MUST_NOT);
+            return booleanQuery;
+        }
+        else
+        {
+            return lqp.getLikeQuery(field, stringValue);
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.cmis.property.NamedPropertyAccessor#getLuceneSortField(java.lang.String)
+     */
+    public String getLuceneSortField(String propertyName)
+    {
+        return getLuceneFieldName();
    }
 }