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 2012/01/12 13:36:09 UTC
svn commit: r1230504 [3/3] - in /uima/sandbox/trunk/TextMarker:
uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/
uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/
uimaj-ep-textmarker-engine/src/main/java/or...
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerBasic.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerBasic.java?rev=1230504&r1=1230503&r2=1230504&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerBasic.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerBasic.java Thu Jan 12 12:36:08 2012
@@ -25,16 +25,6 @@ public class TextMarkerBasic extends Ann
private final Map<Type, Set<AnnotationFS>> endMap = new HashMap<Type, Set<AnnotationFS>>(10);
- public Map<String, String> tags = new HashMap<String, String>(20);
-
- public void setTags(Map<String, String> tags) {
- this.tags = new HashMap<String, String>(tags);
- }
-
- public Map<String, String> getTags() {
- return tags;
- }
-
public void addPartOf(Type type) {
partOf.add(type);
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ActionVerbalizer.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ActionVerbalizer.java?rev=1230504&r1=1230503&r2=1230504&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ActionVerbalizer.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ActionVerbalizer.java Thu Jan 12 12:36:08 2012
@@ -30,7 +30,6 @@ import org.apache.uima.textmarker.action
import org.apache.uima.textmarker.action.DelAction;
import org.apache.uima.textmarker.action.ExpandAction;
import org.apache.uima.textmarker.action.FillAction;
-import org.apache.uima.textmarker.action.FilterMarkupAction;
import org.apache.uima.textmarker.action.FilterTypeAction;
import org.apache.uima.textmarker.action.GatherAction;
import org.apache.uima.textmarker.action.GetAction;
@@ -44,7 +43,6 @@ import org.apache.uima.textmarker.action
import org.apache.uima.textmarker.action.RemoveAction;
import org.apache.uima.textmarker.action.RemoveDuplicateAction;
import org.apache.uima.textmarker.action.ReplaceAction;
-import org.apache.uima.textmarker.action.RetainMarkupAction;
import org.apache.uima.textmarker.action.RetainTypeAction;
import org.apache.uima.textmarker.action.SetFeatureAction;
import org.apache.uima.textmarker.action.TransferAction;
@@ -78,8 +76,6 @@ public class ActionVerbalizer {
return "DEL";
} else if (action instanceof FillAction) {
return "FILL";
- } else if (action instanceof FilterMarkupAction) {
- return "FILTERMARKUP";
} else if (action instanceof FilterTypeAction) {
return "FILTERTYPE";
} else if (action instanceof LogAction) {
@@ -100,8 +96,6 @@ public class ActionVerbalizer {
return "MARKLAST";
} else if (action instanceof ReplaceAction) {
return "REPLACE";
- } else if (action instanceof RetainMarkupAction) {
- return "RETAINMARKUP";
} else if (action instanceof RetainTypeAction) {
return "RETAINTYPE";
} else if (action instanceof SetFeatureAction) {
@@ -207,10 +201,6 @@ public class ActionVerbalizer {
features = features.substring(0, features.length() - 1);
}
return "FILL(" + verbalizer.verbalize(a.getStructureType()) + features + ")";
- } else if (action instanceof FilterMarkupAction) {
- FilterMarkupAction a = (FilterMarkupAction) action;
- return a.getMarkup().isEmpty() ? "FILTERMARKUP" : "FILTERMARKUP("
- + verbalizer.verbalizeExpressionList(a.getMarkup()) + ")";
} else if (action instanceof FilterTypeAction) {
FilterTypeAction a = (FilterTypeAction) action;
return a.getList().isEmpty() ? "FILTERTYPE" : "FILTERTYPE("
@@ -265,10 +255,6 @@ public class ActionVerbalizer {
} else if (action instanceof ReplaceAction) {
ReplaceAction a = (ReplaceAction) action;
return "REPLACE(" + verbalizer.verbalize(a.getReplacement()) + ")";
- } else if (action instanceof RetainMarkupAction) {
- RetainMarkupAction a = (RetainMarkupAction) action;
- return a.getMarkup().isEmpty() ? "RETAINMARKUP" : "RETAINMARKUP("
- + verbalizer.verbalizeExpressionList(a.getMarkup()) + ")";
} else if (action instanceof RetainTypeAction) {
RetainTypeAction a = (RetainTypeAction) action;
return a.getList().isEmpty() ? "RETAINTYPE" : "RETAINTYPE("
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ConditionVerbalizer.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ConditionVerbalizer.java?rev=1230504&r1=1230503&r2=1230504&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ConditionVerbalizer.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ConditionVerbalizer.java Thu Jan 12 12:36:08 2012
@@ -35,7 +35,6 @@ import org.apache.uima.textmarker.condit
import org.apache.uima.textmarker.condition.IfCondition;
import org.apache.uima.textmarker.condition.InListCondition;
import org.apache.uima.textmarker.condition.IsCondition;
-import org.apache.uima.textmarker.condition.IsInTagCondition;
import org.apache.uima.textmarker.condition.LastCondition;
import org.apache.uima.textmarker.condition.MOfNCondition;
import org.apache.uima.textmarker.condition.NearCondition;
@@ -84,8 +83,6 @@ public class ConditionVerbalizer {
return name;
} else if (condition instanceof InListCondition) {
return "INLIST";
- } else if (condition instanceof IsInTagCondition) {
- return "ISINTAG";
} else if (condition instanceof LastCondition) {
return "LAST";
} else if (condition instanceof MOfNCondition) {
@@ -240,9 +237,6 @@ public class ConditionVerbalizer {
rel = "," + verbalizer.verbalize(c.getRelative());
}
return name + "(" + list + dist + rel + ")";
- } else if (condition instanceof IsInTagCondition) {
- IsInTagCondition c = (IsInTagCondition) condition;
- return "ISINTAG(" + verbalizer.verbalize(c.getTag()) + ")";
} else if (condition instanceof LastCondition) {
LastCondition c = (LastCondition) condition;
return "LAST(" + verbalizer.verbalize(c.getType()) + ")";
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerKeywords.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerKeywords.java?rev=1230504&r1=1230503&r2=1230504&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerKeywords.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerKeywords.java Thu Jan 12 12:36:08 2012
@@ -21,7 +21,7 @@ package org.apache.uima.textmarker.ide.c
public class TextMarkerKeywords implements ITextMarkerKeywords {
- private static String[] condition = { "CONTAINS", "IF", "INLIST", "ISINTAG", "PARTOF",
+ private static String[] condition = { "CONTAINS", "IF", "INLIST", "PARTOF",
"TOTALCOUNT", "CURRENTCOUNT", "CONTEXTCOUNT", "LAST", "VOTE", "COUNT", "NEAR", "REGEXP",
"POSITION", "SCORE", "ISLISTEMPTY", "MOFN", "AND", "OR", "FEATURE", "PARSE", "IS", "BEFORE",
"AFTER", "STARTSWITH", "ENDSWITH", "PARTOFNEQ", "SIZE" };
@@ -32,8 +32,8 @@ public class TextMarkerKeywords implemen
"TYPELIST" };
private static String[] action = { "DEL", "CALL", "MARK", "MARKSCORE", "COLOR", "LOG", "TAG",
- "REPLACE", "FILLOBJECT", "RETAINMARKUP", "RETAINTYPE", "SETFEATURE", "ASSIGN", "PUTINLIST",
- "ATTRIBUTE", "MARKFAST", "FILTERTYPE", "FILTERMARKUP", "CREATE", "FILL", "MARKTABLE",
+ "REPLACE", "FILLOBJECT", "RETAINTYPE", "SETFEATURE", "ASSIGN", "PUTINLIST",
+ "ATTRIBUTE", "MARKFAST", "FILTERTYPE", "CREATE", "FILL", "MARKTABLE",
"UNMARK", "TRANSFER", "MARKONCE", "TRIE", "GATHER", "EXEC", "MARKLAST", "ADD", "REMOVE",
"MERGE", "GET", "GETLIST", "REMOVEDUPLICATE", "GETFEATURE", "MATCHEDTEXT", "CLEAR",
"UNMARKALL", "EXPAND", "CONFIGURE", "DYNAMICANCHORING" };
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/src/main/java/org/apache/uima/textmarker/textruler/core/TextRulerBasicLearner.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/src/main/java/org/apache/uima/textmarker/textruler/core/TextRulerBasicLearner.java?rev=1230504&r1=1230503&r2=1230504&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/src/main/java/org/apache/uima/textmarker/textruler/core/TextRulerBasicLearner.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/src/main/java/org/apache/uima/textmarker/textruler/core/TextRulerBasicLearner.java Thu Jan 12 12:36:08 2012
@@ -115,7 +115,6 @@ public abstract class TextRulerBasicLear
// set filters to NO filtering so that we can add it manually with
// the FILTERTYPE expression!
- ae.setConfigParameterValue(TextMarkerEngine.DEFAULT_FILTERED_MARKUPS, new String[0]);
String tempRulesFileName = getTempRulesFileName();
IPath path = new Path(tempRulesFileName);
ae.setConfigParameterValue(TextMarkerEngine.MAIN_SCRIPT, path.removeFileExtension()
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/src/main/java/org/apache/uima/textmarker/textruler/tools/BatchRuleEvaluator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/src/main/java/org/apache/uima/textmarker/textruler/tools/BatchRuleEvaluator.java?rev=1230504&r1=1230503&r2=1230504&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/src/main/java/org/apache/uima/textmarker/textruler/tools/BatchRuleEvaluator.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/src/main/java/org/apache/uima/textmarker/textruler/tools/BatchRuleEvaluator.java Thu Jan 12 12:36:08 2012
@@ -59,7 +59,6 @@ public class BatchRuleEvaluator {
// set filters to NO filtering so that we can add it manually with
// the FILTERTYPE expression!
- ae.setConfigParameterValue(TextMarkerEngine.DEFAULT_FILTERED_MARKUPS, new String[0]);
IPath path = new Path(tempDir + "/results.tm");
ae.setConfigParameterValue(TextMarkerEngine.MAIN_SCRIPT, path.removeFileExtension()
.lastSegment());