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 2018/11/30 10:34:29 UTC
svn commit: r1847797 - in /uima/ruta/trunk:
ruta-core-ext/src/main/java/org/apache/uima/ruta/action/
ruta-core/src/main/java/org/apache/uima/ruta/action/
ruta-core/src/main/java/org/apache/uima/ruta/resource/
Author: pkluegl
Date: Fri Nov 30 10:34:29 2018
New Revision: 1847797
URL: http://svn.apache.org/viewvc?rev=1847797&view=rev
Log:
UIMA-5777 - applied patch
Modified:
uima/ruta/trunk/ruta-core-ext/src/main/java/org/apache/uima/ruta/action/MarkTableReloadAction.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkTableAction.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/CSVTable.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/RutaTable.java
Modified: uima/ruta/trunk/ruta-core-ext/src/main/java/org/apache/uima/ruta/action/MarkTableReloadAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core-ext/src/main/java/org/apache/uima/ruta/action/MarkTableReloadAction.java?rev=1847797&r1=1847796&r2=1847797&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core-ext/src/main/java/org/apache/uima/ruta/action/MarkTableReloadAction.java (original)
+++ uima/ruta/trunk/ruta-core-ext/src/main/java/org/apache/uima/ruta/action/MarkTableReloadAction.java Fri Nov 30 10:34:29 2018
@@ -171,10 +171,10 @@ public class MarkTableReloadAction exten
candidate = candidate.replaceFirst("[" + ignoreCharValue + "]", "");
}
}
- List<String> rowWhere = table.getRowWhere(index - 1, candidate);
+ List<String> rowWhere = table.getRowWhere(index - 1, candidate, false);
if (rowWhere.isEmpty() && ignoreCaseValue && candidate.length() > ignoreLengthValue) {
// TODO: does not cover all variants
- rowWhere = table.getRowWhere(index - 1, candidate.toLowerCase());
+ rowWhere = table.getRowWhere(index - 1, candidate, true);
}
FeatureStructure newFS = stream.getCas().createFS(type);
if (newFS instanceof Annotation) {
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkTableAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkTableAction.java?rev=1847797&r1=1847796&r2=1847797&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkTableAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkTableAction.java Fri Nov 30 10:34:29 2018
@@ -123,10 +123,10 @@ public class MarkTableAction extends Abs
candidate = candidate.replaceFirst("[" + ignoreCharValue + "]", "");
}
}
- List<String> rowWhere = table.getRowWhere(index - 1, candidate);
+ List<String> rowWhere = table.getRowWhere(index - 1, candidate, false);
if (rowWhere.isEmpty() && ignoreCaseValue && candidate.length() > ignoreLengthValue) {
// TODO: does not cover all variants
- rowWhere = table.getRowWhere(index - 1, candidate.toLowerCase());
+ rowWhere = table.getRowWhere(index - 1, candidate, true);
}
FeatureStructure newFS = stream.getCas().createFS(type);
if (newFS instanceof Annotation) {
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/CSVTable.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/CSVTable.java?rev=1847797&r1=1847796&r2=1847797&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/CSVTable.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/CSVTable.java Fri Nov 30 10:34:29 2018
@@ -129,22 +129,23 @@ public class CSVTable implements RutaTab
}
@Override
- public List<String> getRowWhere(int column, String value) {
+ public List<String> getRowWhere(int column, String lookupValue, boolean ignoreCase) {
List<String> columnData = getColumnData(column);
int i = 0;
- for (String string : columnData) {
- if (string.toLowerCase().equals(value.toLowerCase())) {
+ for (String tableValue : columnData) {
+ if (ignoreCase ? tableValue.equalsIgnoreCase(lookupValue) : tableValue.equals(lookupValue)) {
return tableData.get(i);
}
i++;
}
i = 0;
- for (String string : columnData) {
- if (string.toLowerCase().replaceAll("\\s", "").equals(value.toLowerCase())) {
+ for (String tableValue : columnData) {
+ String tableValueWithoutSpacers = tableValue.replaceAll("\\s", "");
+ if (ignoreCase ? tableValueWithoutSpacers.equalsIgnoreCase(lookupValue) : tableValueWithoutSpacers.equals(lookupValue)) {
return tableData.get(i);
}
i++;
}
- return new ArrayList<String>();
+ return new ArrayList<>();
}
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/RutaTable.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/RutaTable.java?rev=1847797&r1=1847796&r2=1847797&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/RutaTable.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/RutaTable.java Fri Nov 30 10:34:29 2018
@@ -29,6 +29,6 @@ public interface RutaTable {
String getEntry(int row, int column);
- List<String> getRowWhere(int column, String value);
+ List<String> getRowWhere(int column, String value, boolean ignoreCase);
}