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 2015/10/22 18:09:10 UTC

svn commit: r1710050 - in /uima/ruta/trunk/ruta-core/src: main/java/org/apache/uima/ruta/seed/DefaultSeeder.java test/java/org/apache/uima/ruta/seed/DefaultSeederTest.java

Author: pkluegl
Date: Thu Oct 22 16:09:10 2015
New Revision: 1710050

URL: http://svn.apache.org/viewvc?rev=1710050&view=rev
Log:
UIMA-4652
- applied patch

Modified:
    uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/DefaultSeeder.java
    uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/seed/DefaultSeederTest.java

Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/DefaultSeeder.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/DefaultSeeder.java?rev=1710050&r1=1710049&r2=1710050&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/DefaultSeeder.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/DefaultSeeder.java Thu Oct 22 16:09:10 2015
@@ -40,7 +40,7 @@ public class DefaultSeeder implements Ru
   public static final String seedType = "org.apache.uima.ruta.type.TokenSeed";
 
   private final Pattern markupPattern = Pattern
-          .compile("</?\\w+((\\s+[\\w-]+(\\s*=\\s*(?:\".*?\"|'.*?'|[^'\">\\s]+))?)+\\s*|\\s*)/?>");
+          .compile("</?\\w[\\w-]*((\\s+[\\w-]+(\\s*=\\s*(?:\".*?\"|'.*?'|[^'\">\\s]+))?)+\\s*|\\s*)/?>");
 
   public Type seed(String text, CAS cas) {
     Type result = null;

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/seed/DefaultSeederTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/seed/DefaultSeederTest.java?rev=1710050&r1=1710049&r2=1710050&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/seed/DefaultSeederTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/seed/DefaultSeederTest.java Thu Oct 22 16:09:10 2015
@@ -110,7 +110,8 @@ public class DefaultSeederTest {
     String document = "<xref ref-type=\"bibr\" rid=\"b35-ehp0113-000220\">"
             + "<sec sec-type=\"methods\">" + "<sec sectype=\"methods\">"
             + "<sec sec-type=\"methods\">" + "<sec sectype=\"methods\">"
-            + "<sec sectype='methods'>";
+            + "<sec sectype='methods'>" + "<tag-with-dash value=\"1\">"
+						+ "<-not-a-real-tag value=\"1\">" + "<a_real_tag value=\"1\">";
     String script = "RETAINTYPE(MARKUP);MARKUP{-> T1};";
     CAS cas = null;
     try {
@@ -120,10 +121,10 @@ public class DefaultSeederTest {
       e.printStackTrace();
     }
 
-    RutaTestUtils.assertAnnotationsEquals(cas, 1, 6,
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 8,
             "<xref ref-type=\"bibr\" rid=\"b35-ehp0113-000220\">", "<sec sec-type=\"methods\">",
             "<sec sectype=\"methods\">", "<sec sec-type=\"methods\">", "<sec sectype=\"methods\">",
-            "<sec sectype='methods'>");
+            "<sec sectype='methods'>", "<tag-with-dash value=\"1\">", "<a_real_tag value=\"1\">");
 
     cas.release();
   }