You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2014/01/14 19:38:30 UTC
svn commit: r1558153 - in
/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta:
expression/feature/SimpleFeatureExpression.java rule/RutaTypeMatcher.java
Author: pkluegl
Date: Tue Jan 14 18:38:30 2014
New Revision: 1558153
URL: http://svn.apache.org/r1558153
Log:
UIMA-3283
- "deactivated" matching outside of the current window
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/SimpleFeatureExpression.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaTypeMatcher.java
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/SimpleFeatureExpression.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/SimpleFeatureExpression.java?rev=1558153&r1=1558152&r2=1558153&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/SimpleFeatureExpression.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/SimpleFeatureExpression.java Tue Jan 14 18:38:30 2014
@@ -119,7 +119,9 @@ public class SimpleFeatureExpression ext
}
}
if (!(this instanceof FeatureMatchExpression)) {
- result.add(afs);
+ if(stream.isVisible(afs)) {
+ result.add(afs);
+ }
}
}
return result;
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaTypeMatcher.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaTypeMatcher.java?rev=1558153&r1=1558152&r2=1558153&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaTypeMatcher.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaTypeMatcher.java Tue Jan 14 18:38:30 2014
@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import java.util.Set;
import java.util.TreeSet;
import org.apache.uima.cas.ConstraintFactory;
@@ -119,7 +118,7 @@ public class RutaTypeMatcher implements
Collection<AnnotationFS> beginAnchors = nextBasic.getBeginAnchors(eachMatchType);
if (beginAnchors != null) {
for (AnnotationFS afs : beginAnchors) {
- if (afs.getEnd() <= stream.getDocumentAnnotation().getEnd()) {
+ if (afs.getBegin() >= stream.getDocumentAnnotation().getBegin() && afs.getEnd() <= stream.getDocumentAnnotation().getEnd()) {
anchors.add(afs);
}
}