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 2017/05/17 15:32:41 UTC
svn commit: r1795425 - in /uima/ruta/trunk/ruta-core/src:
main/java/org/apache/uima/ruta/verbalize/ScriptVerbalizer.java
test/java/org/apache/uima/ruta/verbalizer/ScriptVerbalizerTest.java
Author: pkluegl
Date: Wed May 17 15:32:41 2017
New Revision: 1795425
URL: http://svn.apache.org/viewvc?rev=1795425&view=rev
Log:
UIMA-5399
fix action only rules
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ScriptVerbalizer.java
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ScriptVerbalizerTest.java
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ScriptVerbalizer.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ScriptVerbalizer.java?rev=1795425&r1=1795424&r2=1795425&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ScriptVerbalizer.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ScriptVerbalizer.java Wed May 17 15:32:41 2017
@@ -154,9 +154,16 @@ public class ScriptVerbalizer {
RutaMatcher matcher = tmre.getMatcher();
// action-only rule
IRutaExpression expression = matcher.getExpression();
- if (expression != null) {
- result.append(verbalizer.verbalize(expression));
- } else {
+ boolean actionOnlyRule = expression == null;
+ if(expression != null) {
+ String verbalize = verbalizer.verbalize(expression);
+ if(StringUtils.isBlank(verbalize)) {
+ actionOnlyRule = true;
+ } else {
+ result.append(verbalize);
+ }
+ }
+ if (actionOnlyRule) {
Iterator<AbstractRutaAction> ait = actions.iterator();
while (ait.hasNext()) {
AbstractRutaAction each = ait.next();
@@ -165,6 +172,7 @@ public class ScriptVerbalizer {
result.append(",");
}
}
+ return result.toString();
}
} else if (re instanceof WildCardRuleElement) {
result.append("#");
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ScriptVerbalizerTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ScriptVerbalizerTest.java?rev=1795425&r1=1795424&r2=1795425&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ScriptVerbalizerTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ScriptVerbalizerTest.java Wed May 17 15:32:41 2017
@@ -40,13 +40,14 @@ public class ScriptVerbalizerTest {
public void testRuleVerbalization() throws Exception{
JCas jcas = RutaTestUtils.getCAS("Some text.").getJCas();
-// assertRuleVerbalization(jcas, "W{->T1} W{->T2};");
-// assertRuleVerbalization(jcas, "MARK(T1);", "Document{->MARK(T1)};");
-// assertRuleVerbalization(jcas, "T1<-{W PERIOD;};");
-// assertRuleVerbalization(jcas, "T1->{W{->T1} PERIOD;};");
-// assertRuleVerbalization(jcas, "T1<-{W PERIOD;}->{W{->T1} PERIOD;};");
-// assertRuleVerbalization(jcas, "W W? W?? W+ W+? W* W*? W[1,2] W[1,2]? #;");
+ assertRuleVerbalization(jcas, "MARK(T1);");
+ assertRuleVerbalization(jcas, "W{->T1} W{->T2};");
+ assertRuleVerbalization(jcas, "T1<-{W PERIOD;};");
+ assertRuleVerbalization(jcas, "T1->{W{->T1} PERIOD;};");
+ assertRuleVerbalization(jcas, "T1<-{W PERIOD;}->{W{->T1} PERIOD;};");
+ assertRuleVerbalization(jcas, "W W? W?? W+ W+? W* W*? W[1,2] W[1,2]? #;");
assertRuleVerbalization(jcas, "Document{CONTAINS(T1)->T2};");
+ assertRuleVerbalization(jcas, "ADDFILTERTYPE(CW);");
jcas.release();
}
@@ -65,4 +66,10 @@ public class ScriptVerbalizerTest {
Assert.assertEquals(expected, ruleApply.getElement());
Ruta.removeDebugInformation(jcas);
}
+
+ @Test
+ public void testScriptBlockVerbalization() throws Exception{
+
+ }
+
}