wam 02/05/06 08:04:12
Modified: src/share/org/apache/slide/search/basic
BasicExpressionFactory.java
ComparePropertyExpression.java Literals.java
Log:
enable gte and lte
Revision Changes Path
1.4 +10 -4
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BasicExpressionFactory.java 26 Apr 2002 15:19:11 -0000 1.3
+++ BasicExpressionFactory.java 6 May 2002 15:04:12 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicExpressionFactory.java,v
1.3 2002/04/26 15:19:11 wam Exp $
- * $Revision: 1.3 $
- * $Date: 2002/04/26 15:19:11 $
+ * $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 $
*
* ====================================================================
*
@@ -117,9 +117,15 @@
else if (name.equals (Literals.GT))
result = new GTExpression (e);
+ else if (name.equals (Literals.GTE))
+ result = new GTEExpression (e);
+
else if (name.equals (Literals.LT))
result = new LTExpression (e);
+ else if (name.equals (Literals.LTE))
+ result = new LTEExpression (e);
+
else if (name.equals (Literals.EQ))
result = new EQExpression (e);
@@ -154,7 +160,7 @@
result = new IsPrincipalExpression (e);
- if (namespace.equals (Literals.SLIDE_EXTENSIONS)
+ else if (namespace.equals (Literals.SLIDE_EXTENSIONS)
&& name.equals (Literals.PROPCONTAINS))
result = new PropContainsExpression (e);
1.4 +4 -4
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ComparePropertyExpression.java 26 Apr 2002 15:19:11 -0000 1.3
+++ ComparePropertyExpression.java 6 May 2002 15:04:12 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/ComparePropertyExpression.java,v
1.3 2002/04/26 15:19:11 wam Exp $
- * $Revision: 1.3 $
- * $Date: 2002/04/26 15:19:11 $
+ * $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 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* Abstract base class for compare expressions (GT, EQ, is-collection ...).
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Wallmer</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public abstract class ComparePropertyExpression extends CompareExpression {
1.9 +6 -4
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Literals.java 26 Apr 2002 15:19:11 -0000 1.8
+++ Literals.java 6 May 2002 15:04:12 -0000 1.9
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/Literals.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/Literals.java,v 1.9
2002/05/06 15:04:12 wam Exp $
+ * $Revision: 1.9 $
+ * $Date: 2002/05/06 15:04:12 $
*
* ====================================================================
*
@@ -67,7 +67,7 @@
* static container for some literals.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Wallmer</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class Literals {
@@ -83,6 +83,7 @@
public static final String EQ = "eq";
public static final String FROM = "from";
public static final String GT = "gt";
+ public static final String GTE = "gte";
public static final String HREF = "href";
public static final String INFINITY = "infinity";
public static final String ISCOLLECTION = "is-collection";
@@ -91,6 +92,7 @@
public static final String LIMIT = "limit";
public static final String LITERAL = "literal";
public static final String LT = "lt";
+ public static final String LTE = "lte";
public static final String NOT = "not";
public static final String OR = "or";
public static final String ORDER = "order";
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
