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 lu...@apache.org on 2004/11/16 15:38:22 UTC

cvs commit: jakarta-slide/src/share/org/apache/slide/search/basic/expression LikeExpression.java NotLikeExpression.java

luetzkendorf    2004/11/16 06:38:22

  Modified:    src/share/org/apache/slide/search/basic/expression
                        LikeExpression.java NotLikeExpression.java
  Log:
  fix for not existing properties
  
  Revision  Changes    Path
  1.2       +7 -6      jakarta-slide/src/share/org/apache/slide/search/basic/expression/LikeExpression.java
  
  Index: LikeExpression.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/expression/LikeExpression.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LikeExpression.java	1 Nov 2004 17:50:18 -0000	1.1
  +++ LikeExpression.java	16 Nov 2004 14:38:22 -0000	1.2
  @@ -23,6 +23,7 @@
   package org.apache.slide.search.basic.expression;
   
   import org.apache.slide.common.SlideException;
  +import org.apache.slide.content.NodeProperty;
   import org.apache.slide.search.InvalidQueryException;
   import org.apache.slide.search.basic.ComparableResource;
   import org.apache.slide.search.basic.ComparableResourcesPool;
  @@ -50,14 +51,14 @@
       protected boolean compare(ComparableResource item)
       {
           try {
  -            Object value = item.getProperty(
  +            NodeProperty value = item.getProperty(
                       comparedProperty.getProperty(),
  -                    comparedProperty.getPropNamespace()).getValue();
  +                    comparedProperty.getPropNamespace());
               if (value != null) {
                   return wildcardEquals(
                           comparedProperty.getLiteral(),
                           0,
  -                        value.toString(),
  +                        value.getValue().toString(),
                           0);
               }
           } catch (SlideException e) {
  
  
  
  1.2       +4 -3      jakarta-slide/src/share/org/apache/slide/search/basic/expression/NotLikeExpression.java
  
  Index: NotLikeExpression.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/expression/NotLikeExpression.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NotLikeExpression.java	1 Nov 2004 17:50:18 -0000	1.1
  +++ NotLikeExpression.java	16 Nov 2004 14:38:22 -0000	1.2
  @@ -2,6 +2,7 @@
   package org.apache.slide.search.basic.expression;
   
   import org.apache.slide.common.SlideException;
  +import org.apache.slide.content.NodeProperty;
   import org.apache.slide.search.InvalidQueryException;
   import org.apache.slide.search.basic.ComparableResource;
   import org.apache.slide.search.basic.ComparableResourcesPool;
  @@ -25,14 +26,14 @@
       protected boolean compare(ComparableResource item)
       {
           try {
  -            Object value = item.getProperty(
  +            NodeProperty value = item.getProperty(
                       comparedProperty.getProperty(),
  -                    comparedProperty.getPropNamespace()).getValue();
  +                    comparedProperty.getPropNamespace());
               if (value != null) {
                   return !wildcardEquals(
                           comparedProperty.getLiteral(),
                           0,
  -                        value.toString(),
  +                        value.getValue().toString(),
                           0);
               }
           } catch (SlideException e) {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org