X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.jcr%2Fsrc%2Forg%2Fargeo%2Fcms%2Fjcr%2Facr%2FBasicSearchToQom.java;h=40005d692a7dec987e09aa0b22bab8181530d232;hb=41b3ea51a9fb6ed1ccb4e13897bcca3fbba00754;hp=72940705a0f07aa2f1ce0bcb828cfa025375a50d;hpb=d58ef68ac546bc3d9874834f5345e67dbe9b6835;p=gpl%2Fargeo-jcr.git

diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/BasicSearchToQom.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/BasicSearchToQom.java
index 7294070..40005d6 100644
--- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/BasicSearchToQom.java
+++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/BasicSearchToQom.java
@@ -1,8 +1,11 @@
 package org.argeo.cms.jcr.acr;
 
+import static javax.jcr.query.qom.QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO;
+
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.jcr.Property;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.query.QueryManager;
@@ -15,13 +18,21 @@ import javax.jcr.query.qom.StaticOperand;
 import javax.xml.namespace.QName;
 
 import org.apache.jackrabbit.commons.query.sql2.QOMFormatter;
+import org.argeo.api.acr.DName;
 import org.argeo.api.acr.NamespaceUtils;
 import org.argeo.api.acr.search.BasicSearch;
 import org.argeo.api.acr.search.Constraint;
 import org.argeo.api.acr.search.ContentFilter;
-import org.argeo.api.acr.search.ContentFilter.Eq;
-import org.argeo.api.acr.search.ContentFilter.IsContentClass;
-import org.argeo.api.acr.search.ContentFilter.Not;
+import org.argeo.api.acr.search.Eq;
+import org.argeo.api.acr.search.Gt;
+import org.argeo.api.acr.search.Gte;
+import org.argeo.api.acr.search.IsContentClass;
+import org.argeo.api.acr.search.IsDefined;
+import org.argeo.api.acr.search.Like;
+import org.argeo.api.acr.search.Lt;
+import org.argeo.api.acr.search.Lte;
+import org.argeo.api.acr.search.Not;
+import org.argeo.api.acr.search.PropertyValueContraint;
 import org.argeo.api.cms.CmsLog;
 
 /** Convert an ACR basic search to a JCR query. */
@@ -63,9 +74,9 @@ class BasicSearchToQom {
 		Selector source = factory.selector(NamespaceUtils.toPrefixedName(contentClass), selectorName);
 
 		QueryObjectModel qom = factory.createQuery(source, qomConstraint, null, null);
-		if (log.isDebugEnabled()) {
+		if (log.isTraceEnabled()) {
 			String sql2 = QOMFormatter.format(qom);
-			log.debug("JCR query:\n" + sql2 + "\n");
+			log.trace("JCR query:\n" + sql2 + "\n");
 		}
 		return qom;
 	}
@@ -113,15 +124,50 @@ class BasicSearchToQom {
 				return currQomConstraint;
 			}
 
-		} else if (constraint instanceof Eq comp) {
-			DynamicOperand dynamicOperand = factory.propertyValue(selectorName,
-					NamespaceUtils.toPrefixedName(comp.getProp()));
+		} else if (constraint instanceof PropertyValueContraint comp) {
+			QName prop = comp.getProp();
+			if (DName.creationdate.equals(prop))
+				prop = JcrName.created.qName();
+			else if (DName.getlastmodified.equals(prop))
+				prop = JcrName.lastModified.qName();
+
+			DynamicOperand dynamicOperand = factory.propertyValue(selectorName, NamespaceUtils.toPrefixedName(prop));
 			// TODO better convert attribute value
 			StaticOperand staticOperand = factory
-					.literal(session.getValueFactory().createValue(comp.getValue().toString()));
-			return factory.comparison(dynamicOperand, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, staticOperand);
+					.literal(JcrContent.convertSingleObject(session.getValueFactory(), comp.getValue()));
+			javax.jcr.query.qom.Constraint res;
+			if (comp instanceof Eq)
+				res = factory.comparison(dynamicOperand, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO,
+						staticOperand);
+			else if (comp instanceof Lt)
+				res = factory.comparison(dynamicOperand, QueryObjectModelConstants.JCR_OPERATOR_LESS_THAN,
+						staticOperand);
+			else if (comp instanceof Lte)
+				res = factory.comparison(dynamicOperand, QueryObjectModelConstants.JCR_OPERATOR_LESS_THAN_OR_EQUAL_TO,
+						staticOperand);
+			else if (comp instanceof Gt)
+				res = factory.comparison(dynamicOperand, QueryObjectModelConstants.JCR_OPERATOR_GREATER_THAN,
+						staticOperand);
+			else if (comp instanceof Gte)
+				res = factory.comparison(dynamicOperand,
+						QueryObjectModelConstants.JCR_OPERATOR_GREATER_THAN_OR_EQUAL_TO, staticOperand);
+			else if (comp instanceof Like)
+				res = factory.comparison(dynamicOperand, QueryObjectModelConstants.JCR_OPERATOR_LIKE, staticOperand);
+			else
+				throw new UnsupportedOperationException("Constraint of type " + comp.getClass() + " is not supported");
+			return res;
 		} else if (constraint instanceof Not not) {
 			return factory.not(toQomConstraint(not.getNegated()));
+		} else if (constraint instanceof IsDefined comp) {
+			QName prop = comp.getProp();
+			if (DName.checkedIn.equals(prop) || DName.checkedOut.equals(prop)) {
+				DynamicOperand dynamicOperand = factory.propertyValue(selectorName, Property.JCR_IS_CHECKED_OUT);
+				StaticOperand staticOperand = factory
+						.literal(session.getValueFactory().createValue(DName.checkedOut.equals(prop)));
+				return factory.comparison(dynamicOperand, JCR_OPERATOR_EQUAL_TO, staticOperand);
+			} else {
+				return factory.propertyExistence(selectorName, NamespaceUtils.toPrefixedName(prop));
+			}
 		} else {
 			throw new IllegalArgumentException("Constraint " + constraint.getClass() + " is not supported");
 		}