unico 2004/10/05 07:04:54
Modified: src/stores/org/apache/slide/store/impl/rdbms/expression
RDBMSExpressionFactory.java
Log:
remove dependency on webdavservlet
Revision Changes Path
1.14 +16 -20
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSExpressionFactory.java
Index: RDBMSExpressionFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSExpressionFactory.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- RDBMSExpressionFactory.java 1 Oct 2004 11:22:02 -0000 1.13
+++ RDBMSExpressionFactory.java 5 Oct 2004 14:04:54 -0000 1.14
@@ -24,10 +24,9 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashSet;
import java.util.Iterator;
-import java.util.Set;
+import org.apache.slide.common.SlideException;
import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.search.BadQueryException;
import org.apache.slide.search.InvalidQueryException;
@@ -39,8 +38,6 @@
import org.apache.slide.search.basic.Literals;
import org.apache.slide.store.impl.rdbms.AbstractRDBMSStore;
import org.apache.slide.store.impl.rdbms.RDBMSComparableResourcesPool;
-import org.apache.slide.webdav.util.AclConstants;
-import org.apache.slide.webdav.util.DeltavConstants;
import org.jdom.Element;
/**
@@ -49,18 +46,9 @@
*/
public class RDBMSExpressionFactory extends BasicExpressionFactory {
- private static final Set LIVE_PROPERTIES = new HashSet();
-
- static {
- LIVE_PROPERTIES.addAll(DeltavConstants.DELTAV_PROPERTY_LIST);
- LIVE_PROPERTIES.addAll(AclConstants.ACL_PROPERTY_LIST);
- LIVE_PROPERTIES.add("lockdiscovery");
- LIVE_PROPERTIES.add("supportedlock");
- }
-
private final AbstractRDBMSStore _store;
private final RDBMSQueryContext _context;
-
+
public RDBMSExpressionFactory(AbstractRDBMSStore store) {
_store = store;
_context = new RDBMSQueryContext(new RDBMSResultSet(this));
@@ -177,7 +165,7 @@
return requestedResourcePool;
}
- public static boolean isSQLCompilableProperty(Element element) {
+ public boolean isSQLCompilableProperty(Element element) {
Element davProp = element.getChild(Literals.PROP,
NamespaceCache.DEFAULT_NAMESPACE);
if (davProp != null) {
Element property = (Element) davProp.getChildren().get(0);
@@ -186,8 +174,16 @@
return false;
}
- public static boolean isSQLCompilableProperty(String namespace, String name) {
- return "DAV:".equals(namespace) && !LIVE_PROPERTIES.contains(name);
+ public boolean isSQLCompilableProperty(String namespace, String name) {
+ try {
+ final String uri = getQuery().getSearchToken().getSlideContext()
+ .getSlidePath(getQuery().getScope().getHref());
+ return !getPropertyProvider().isSupportedProperty(uri, name, namespace);
+ }
+ catch (SlideException e) {
+ e.printStackTrace();
+ return false;
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
