juergen 2002/06/05 06:38:26
Modified: src/share/org/apache/slide/search/basic
BasicExpressionFactory.java
Log:
Added support for new <not-...> expressions.
(ralf)
Revision Changes Path
1.6 +37 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BasicExpressionFactory.java 27 May 2002 08:17:13 -0000 1.5
+++ BasicExpressionFactory.java 5 Jun 2002 13:38:26 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicExpressionFactory.java,v
1.6 2002/06/05 13:38:26 juergen Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/06/05 13:38:26 $
*
* ====================================================================
*
@@ -118,27 +118,51 @@
else if (name.equals (Literals.GT))
result = new GTExpression (e);
+ else if (name.equals (Literals.NOT_GT))
+ result = new NotGTExpression (e);
+
else if (name.equals (Literals.GTE))
result = new GTEExpression (e);
+ else if (name.equals (Literals.NOT_GTE))
+ result = new NotGTEExpression (e);
+
else if (name.equals (Literals.LT))
result = new LTExpression (e);
+ else if (name.equals (Literals.NOT_LT))
+ result = new NotLTExpression (e);
+
else if (name.equals (Literals.LTE))
result = new LTEExpression (e);
+ else if (name.equals (Literals.NOT_LTE))
+ result = new NotLTEExpression (e);
+
else if (name.equals (Literals.EQ))
result = new EQExpression (e);
+ else if (name.equals (Literals.NOT_EQ))
+ result = new NotEQExpression (e);
+
else if (name.equals (Literals.CONTAINS))
result = new ContainsExpression (e);
+ else if (name.equals (Literals.NOT_CONTAINS))
+ result = new NotContainsExpression (e);
+
else if (name.equals (Literals.ISCOLLECTION))
result = new IsCollectionExpression (e);
+ else if (name.equals (Literals.NOT_ISCOLLECTION))
+ result = new NotIsCollectionExpression (e);
+
else if (name.equals (Literals.ISDEFINED))
result = new IsDefinedExpression (e);
+ else if (name.equals (Literals.NOT_ISDEFINED))
+ result = new NotIsDefinedExpression (e);
+
else if (name.equals (Literals.NOT))
result = new NotExpression (e, this);
@@ -161,10 +185,20 @@
result = new IsPrincipalExpression (e);
+ if (namespace.equals (NamespaceCache.SLIDE_URI)
+ && name.equals (Literals.NOT_ISPRINCIPAL))
+
+ result = new NotIsPrincipalExpression (e);
+
else if (namespace.equals (NamespaceCache.SLIDE_URI)
&& name.equals (Literals.PROPCONTAINS))
result = new PropContainsExpression (e);
+
+ else if (namespace.equals (NamespaceCache.SLIDE_URI)
+ && name.equals (Literals.NOT_PROPCONTAINS))
+
+ result = new NotPropContainsExpression (e);
else
throw new InvalidQueryException
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
