Author: pkluegl
Date: Thu Jul 5 09:24:48 2012
New Revision: 1357518
URL: http://svn.apache.org/viewvc?rev=1357518&view=rev
Log:
UIMA-2402
- fixed grammar for MARKTABLE action, changed order of arguments
- fixed bug for csv tables with missing entries
- additionally: fixed build.properties (missing plugin.properties) and encoding
when loading tables
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/build.properties
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/resource/CSVTable.java
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/build.properties
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/build.properties?rev=1357518&r1=1357517&r2=1357518&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/build.properties
(original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/build.properties Thu
Jul 5 09:24:48 2012
@@ -4,4 +4,4 @@ bin.includes = META-INF/,\
.,\
plugin.xml,\
icons/,\
- antlr-runtime-3.4.jar
+ plugin.properties,\
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g?rev=1357518&r1=1357517&r2=1357518&view=diff
==============================================================================
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
Thu Jul 5 09:24:48 2012
@@ -1205,12 +1205,14 @@ actionMarkTable returns [TextMarkerActio
structure = typeExpression COMMA
index = numberExpression COMMA
table = wordTableExpression
-
- (COMMA key=stringExpression ASSIGN_EQUAL value = numberExpression)=>(COMMA
key = stringExpression {left.add(key);} ASSIGN_EQUAL value =
numberExpression{right.add(value);} )+
- (COMMA ignoreCase = booleanExpression)=>(COMMA ignoreCase =
booleanExpression
+ COMMA
+ ( ignoreCase = booleanExpression
COMMA ignoreLength = numberExpression
COMMA ignoreChar = stringExpression
- COMMA maxIgnoreChar = numberExpression)?
+ COMMA maxIgnoreChar = numberExpression COMMA)?
+ key = stringExpression {left.add(key);} ASSIGN_EQUAL value =
numberExpression{right.add(value);}
+ (COMMA key = stringExpression {left.add(key);} ASSIGN_EQUAL value =
numberExpression{right.add(value);} )*
+
{
List<Expression> args = new ArrayList<Expression>();
Modified:
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g?rev=1357518&r1=1357517&r2=1357518&view=diff
==============================================================================
---
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g
Thu Jul 5 09:24:48 2012
@@ -1162,11 +1162,13 @@ actionMarkTable returns [AbstractTextMar
structure = typeExpression COMMA
index = numberExpression COMMA
table = wordTableExpression
- (COMMA key=stringExpression ASSIGN_EQUAL value = numberExpression)=>(COMMA
key = stringExpression ASSIGN_EQUAL value =
numberExpression{map.put(key,value);} )+
- (COMMA ignoreCase = booleanExpression)=>(COMMA ignoreCase =
booleanExpression
+ COMMA ( (ignoreCase =booleanExpression)=>ignoreCase = booleanExpression
COMMA ignoreLength = numberExpression
COMMA ignoreChar = stringExpression
- COMMA maxIgnoreChar = numberExpression)?
+ COMMA maxIgnoreChar = numberExpression COMMA)?
+ key = stringExpression ASSIGN_EQUAL value =
numberExpression{map.put(key,value);}
+ ( COMMA key = stringExpression ASSIGN_EQUAL value =
numberExpression{map.put(key,value);} )*
+
RPAREN
Modified:
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/resource/CSVTable.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/resource/CSVTable.java?rev=1357518&r1=1357517&r2=1357518&view=diff
==============================================================================
---
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/resource/CSVTable.java
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/resource/CSVTable.java
Thu Jul 5 09:24:48 2012
@@ -20,6 +20,7 @@
package org.apache.uima.textmarker.resource;
import java.io.FileInputStream;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -46,7 +47,7 @@ public class CSVTable implements TextMar
private void buildTable(String location) throws Exception {
FileInputStream in = new FileInputStream(location);
- Scanner sc = new Scanner(in);
+ Scanner sc = new Scanner(in, Charset.forName("UTF-8").name());
sc.useDelimiter("\\n");
tableData = new ArrayList<List<String>>();
while (sc.hasNext()) {
@@ -74,6 +75,8 @@ public class CSVTable implements TextMar
for (List<String> each : tableData) {
if (each.size() > i) {
result.add(each.get(i));
+ } else {
+ result.add("");
}
}
return result;
