You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by wa...@apache.org on 2002/05/27 10:17:13 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/search/basic Literals.java ComparePropertyExpression.java CheckResourceTypeExpression.java BasicSearchLanguage.java BasicExpressionFactory.java BasicExpression.java
wam 02/05/27 01:17:13
Modified: src/share/org/apache/slide/search/basic Literals.java
ComparePropertyExpression.java
CheckResourceTypeExpression.java
BasicSearchLanguage.java
BasicExpressionFactory.java BasicExpression.java
Log:
use NamespaceCache
Revision Changes Path
1.10 +3 -6 jakarta-slide/src/share/org/apache/slide/search/basic/Literals.java
Index: Literals.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/Literals.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Literals.java 6 May 2002 15:04:12 -0000 1.9
+++ Literals.java 27 May 2002 08:17:13 -0000 1.10
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/Literals.java,v 1.9 2002/05/06 15:04:12 wam Exp $
- * $Revision: 1.9 $
- * $Date: 2002/05/06 15:04:12 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/Literals.java,v 1.10 2002/05/27 08:17:13 wam Exp $
+ * $Revision: 1.10 $
+ * $Date: 2002/05/27 08:17:13 $
*
* ====================================================================
*
@@ -67,7 +67,7 @@
* static container for some literals.
*
* @author <a href="mailto:martin.wallmer@softwareag.com">Martin Wallmer</a>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class Literals {
@@ -105,9 +105,6 @@
public static final String SELECT = "select";
public static final String WHERE = "where";
- public static final String DAV_NAMESPACE = "DAV:";
- public static final String SLIDE_EXTENSIONS = "http://jakarta.apache.org/slide/";
-
// this one must be slidewide known, move it to appropriate class somewhen
// (is that true after the new DASL?)
//static final String DT_NAMESPACE
1.5 +21 -6 jakarta-slide/src/share/org/apache/slide/search/basic/ComparePropertyExpression.java
Index: ComparePropertyExpression.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/ComparePropertyExpression.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ComparePropertyExpression.java 6 May 2002 15:04:12 -0000 1.4
+++ ComparePropertyExpression.java 27 May 2002 08:17:13 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/ComparePropertyExpression.java,v 1.4 2002/05/06 15:04:12 wam Exp $
- * $Revision: 1.4 $
- * $Date: 2002/05/06 15:04:12 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/ComparePropertyExpression.java,v 1.5 2002/05/27 08:17:13 wam Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/05/27 08:17:13 $
*
* ====================================================================
*
@@ -63,12 +63,14 @@
package org.apache.slide.search.basic;
import org.apache.slide.search.*;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
import java.util.Iterator;
import java.util.Set;
import java.util.List;
import java.util.ArrayList;
import org.jdom.Namespace;
+import org.jdom.Attribute;
import org.jdom.Element;
import org.apache.slide.search.InvalidQueryException;
@@ -77,7 +79,7 @@
* Abstract base class for compare expressions (GT, EQ, is-collection ...).
*
* @author <a href="mailto:martin.wallmer@softwareag.com">Martin Wallmer</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public abstract class ComparePropertyExpression extends CompareExpression {
@@ -90,6 +92,9 @@
/** the property's namespace */
protected String propNamespace;
+ /** indicate, if compare should be casesensitive */
+ protected boolean casesensitive = true;
+
/**
* dummy constructor, called by is-collection (as no prop / literal
* is passed).
@@ -120,7 +125,17 @@
*
*/
protected void setProperty (Element e) throws InvalidQueryException {
- Element propListElement = e.getChild (Literals.PROP, davNamespace);
+ String casesensAttr = e.getAttributeValue (Literals.CASESENSITIVE, NamespaceCache.DEFAULT_NAMESPACE);
+ if (casesensAttr != null) {
+ if (casesensAttr.equals ("1"))
+ casesensitive = true;
+ else if (casesensAttr.equals ("0"))
+ casesensitive = false;
+ else
+ throw new InvalidQueryException ("casesensitive must be either \"0\" or \"1\"");
+ }
+
+ Element propListElement = e.getChild (Literals.PROP, NamespaceCache.DEFAULT_NAMESPACE);
if (propListElement == null)
throw new InvalidQueryException
("No property element supplied");
@@ -166,7 +181,7 @@
*
*/
protected String getLiteral(Element e) throws InvalidQueryException {
- Element lit = e.getChild (Literals.LITERAL, davNamespace);
+ Element lit = e.getChild (Literals.LITERAL, NamespaceCache.DEFAULT_NAMESPACE);
if (lit == null)
throw new InvalidQueryException
("No literal element supplied");
1.5 +6 -5 jakarta-slide/src/share/org/apache/slide/search/basic/CheckResourceTypeExpression.java
Index: CheckResourceTypeExpression.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/CheckResourceTypeExpression.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CheckResourceTypeExpression.java 14 May 2002 14:15:08 -0000 1.4
+++ CheckResourceTypeExpression.java 27 May 2002 08:17:13 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/CheckResourceTypeExpression.java,v 1.4 2002/05/14 14:15:08 juergen Exp $
- * $Revision: 1.4 $
- * $Date: 2002/05/14 14:15:08 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/CheckResourceTypeExpression.java,v 1.5 2002/05/27 08:17:13 wam Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/05/27 08:17:13 $
*
* ====================================================================
*
@@ -64,6 +64,7 @@
package org.apache.slide.search.basic;
import org.apache.slide.search.*;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.jdom.Element;
import org.apache.slide.search.InvalidQueryException;
@@ -73,7 +74,7 @@
* Represents an expression that check for a specific resourcetype.
*
* @author <a href="mailto:martin.wallmer@softwareag.com">Martin Wallmer</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public abstract class CheckResourceTypeExpression extends ComparePropertyExpression {
@@ -86,7 +87,7 @@
protected CheckResourceTypeExpression (Element e) throws InvalidQueryException {
this.expressionElement = e;
property = Literals.RESOURCETYPE;
- propNamespace = Literals.DAV_NAMESPACE;
+ propNamespace = NamespaceCache.DEFAULT_URI;
}
/**
1.6 +6 -7 jakarta-slide/src/share/org/apache/slide/search/basic/BasicSearchLanguage.java
Index: BasicSearchLanguage.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicSearchLanguage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BasicSearchLanguage.java 26 Apr 2002 15:19:11 -0000 1.5
+++ BasicSearchLanguage.java 27 May 2002 08:17:13 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicSearchLanguage.java,v 1.5 2002/04/26 15:19:11 wam Exp $
- * $Revision: 1.5 $
- * $Date: 2002/04/26 15:19:11 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicSearchLanguage.java,v 1.6 2002/05/27 08:17:13 wam Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/05/27 08:17:13 $
*
* ====================================================================
*
@@ -68,21 +68,20 @@
import org.apache.slide.search.SearchToken;
import org.apache.slide.search.BadQueryException;
import org.w3c.dom.Element;
-
+import org.apache.slide.content.NodeProperty.NamespaceCache;
/**
* Represent the BasicSearchLanguage for Slide
*
* @author <a href="mailto:martin.wallmer@softwareag.com">Martin Wallmer</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class BasicSearchLanguage extends SearchLanguage {
static final String GRAMMAR_NAME =
"basicsearch";
- static final String GRAMMAR_NAMESPACE =
- "DAV:";
+ static final String GRAMMAR_NAMESPACE = NamespaceCache.DEFAULT_URI;
public BasicSearchLanguage () {}
1.5 +8 -7 jakarta-slide/src/share/org/apache/slide/search/basic/BasicExpressionFactory.java
Index: BasicExpressionFactory.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicExpressionFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BasicExpressionFactory.java 6 May 2002 15:04:12 -0000 1.4
+++ BasicExpressionFactory.java 27 May 2002 08:17:13 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicExpressionFactory.java,v 1.4 2002/05/06 15:04:12 wam Exp $
- * $Revision: 1.4 $
- * $Date: 2002/05/06 15:04:12 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicExpressionFactory.java,v 1.5 2002/05/27 08:17:13 wam Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/05/27 08:17:13 $
*
* ====================================================================
*
@@ -65,6 +65,7 @@
import org.jdom.Element;
import org.apache.slide.search.InvalidQueryException;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
/**
* BasicExpressionFactory.java
@@ -94,7 +95,7 @@
}
else {
String namespace = e.getNamespace().getURI();
- if (namespace.equals (Literals.DAV_NAMESPACE))
+ if (namespace.equals (NamespaceCache.DEFAULT_URI))
result = createDAVExpression (e);
else
result = createNonDAVExpression (e, namespace);
@@ -143,7 +144,7 @@
else
throw new InvalidQueryException
- ("operator " + Literals.DAV_NAMESPACE + name + " is an unprocessable entity");
+ ("operator " + NamespaceCache.DEFAULT_URI + name + " is an unprocessable entity");
return result;
}
@@ -155,12 +156,12 @@
String name = e.getName();
BasicExpression result = null;
- if (namespace.equals (Literals.SLIDE_EXTENSIONS)
+ if (namespace.equals (NamespaceCache.SLIDE_URI)
&& name.equals (Literals.ISPRINCIPAL))
result = new IsPrincipalExpression (e);
- else if (namespace.equals (Literals.SLIDE_EXTENSIONS)
+ else if (namespace.equals (NamespaceCache.SLIDE_URI)
&& name.equals (Literals.PROPCONTAINS))
result = new PropContainsExpression (e);
1.9 +15 -8 jakarta-slide/src/share/org/apache/slide/search/basic/BasicExpression.java
Index: BasicExpression.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicExpression.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BasicExpression.java 26 Apr 2002 15:19:11 -0000 1.8
+++ BasicExpression.java 27 May 2002 08:17:13 -0000 1.9
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicExpression.java,v 1.8 2002/04/26 15:19:11 wam Exp $
- * $Revision: 1.8 $
- * $Date: 2002/04/26 15:19:11 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicExpression.java,v 1.9 2002/05/27 08:17:13 wam Exp $
+ * $Revision: 1.9 $
+ * $Date: 2002/05/27 08:17:13 $
*
* ====================================================================
*
@@ -63,12 +63,16 @@
package org.apache.slide.search.basic;
+import org.jdom.Attribute;
import org.jdom.Element;
import org.jdom.Namespace;
import org.apache.slide.search.InvalidQueryException;
import org.apache.slide.search.basic.RequestedResourcesPool;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
+
import java.util.Set;
+import java.util.List;
import java.util.HashSet;
/**
@@ -82,13 +86,10 @@
*
*
* @author <a href="mailto:martin.wallmer@softwareag.com">Martin Wallmer</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public abstract class BasicExpression {
- protected static final Namespace davNamespace =
- Namespace.getNamespace (Literals.DAV_NAMESPACE);
-
protected BasicExpressionFactory expressionFactory;
/** the JDOM element representing this expression. */
@@ -110,8 +111,14 @@
*
* @param e the jdom element representing this expression.
*/
- protected BasicExpression (Element e) {
+ protected BasicExpression (Element e) throws InvalidQueryException {
this.expressionElement = e;
+ List attrList = e.getAttributes();
+ if (attrList.size() != 0) {
+ Attribute attr = (Attribute) attrList.get(0);
+ throw new InvalidQueryException (attr.getQualifiedName() +
+ " is an unprocessable entity");
+ }
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>