svn commit: r1490939 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli: CliBase.java DuccUiConstants.java
Author: degenaro
Date: Sat Jun 8 09:59:43 2013
New Revision: 1490939
URL: http://svn.apache.org/r1490939
Log:
UIMA-2724 DUCC webserver (WS) specification displays should make clear
difference between user specified and system default values
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java?rev=1490939r1=1490938r2=1490939view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java
Sat Jun 8 09:59:43 2013
@@ -81,6 +81,9 @@ public abstract class CliBase
CountDownLatch waiter = null;
+protected Properties userSpecifiedProperties = new Properties();
+protected Properties fileSpecifiedProperties = new Properties();
+
/**
* All extenders must implement execute - this method does whatever
processing on the input
* is needed and passes the CLI request to the internal DUCC processes.
@@ -331,6 +334,13 @@ public abstract class CliBase
options = makeOptions(opts, false);
commandLine = parser.parse(options, args);
+Option[] optionArray = commandLine.getOptions();
+for(Option option : optionArray) {
+ String key = option.getLongOpt().trim();
+ String value = option.getValue().trim();
+ userSpecifiedProperties.setProperty(key, value);
+}
+
if (commandLine.hasOption(UiOption.Help.pname())) {
usage(null);
}
@@ -357,6 +367,12 @@ public abstract class CliBase
FileInputStream fis = new FileInputStream(file);
cli_props.load(fis);
+String[] keyArray = cli_props.keySet().toArray(new String[0]);
+for(String key : keyArray) {
+ String value = cli_props.getProperty(key);
+ fileSpecifiedProperties.setProperty(key, value);
+}
+
// Loop through options and enhance / override things from cl
options
enhanceProperties(commandLine, true);
@@ -433,6 +449,24 @@ public abstract class CliBase
out.close();
fos.close();
+
+/
+
+fileName = directory + File.separator +
DuccUiConstants.user_specified_properties;
+fos = new FileOutputStream(fileName);
+out = new OutputStreamWriter(fos);
+userSpecifiedProperties.store(out, comments);
+out.close();
+fos.close();
+
+/
+
+fileName = directory + File.separator +
DuccUiConstants.file_specified_properties;
+fos = new FileOutputStream(fileName);
+out = new OutputStreamWriter(fos);
+fileSpecifiedProperties.store(out, comments);
+out.close();
+fos.close();
}
void adjustLdLibraryPath(DuccProperties requestProps, String key)
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java?rev=1490939r1=1490938r2=1490939view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java
Sat Jun 8 09:59:43 2013
@@ -37,6 +37,9 @@ public class DuccUiConstants {
public static final String service_specification_properties =
service-specification.properties;
public static final String managed_reservation_properties =
managed-reservation.properties;
+ public static final String user_specified_properties =
specified-by-user.properties;
+ public static final String file_specified_properties =
specified-by-file.properties;
+
/*
* common
*/
svn commit: r1491021 - /uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/ui/LearnerConfigurator.java
Author: pkluegl
Date: Sat Jun 8 17:58:58 2013
New Revision: 1491021
URL: http://svn.apache.org/r1491021
Log:
UIMA-2777
- fixed double parameters in textruler
Modified:
uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/ui/LearnerConfigurator.java
Modified:
uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/ui/LearnerConfigurator.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/ui/LearnerConfigurator.java?rev=1491021r1=1491020r2=1491021view=diff
==
---
uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/ui/LearnerConfigurator.java
(original)
+++
uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/ui/LearnerConfigurator.java
Sat Jun 8 17:58:58 2013
@@ -158,6 +158,10 @@ public class LearnerConfigurator {
result.put(p.id, store.getFloat(id));
break;
}
+ case ML_DOUBLE_PARAM: {
+result.put(p.id, store.getDouble(id));
+break;
+ }
case ML_INT_PARAM: {
result.put(p.id, store.getInt(id));
break;
svn commit: r1491023 - in /uima/sandbox/ruta/trunk/ruta-core/src: main/java/org/apache/uima/ruta/ main/java/org/apache/uima/ruta/engine/ main/java/org/apache/uima/ruta/rule/ main/java/org/apache/uima/
Author: pkluegl
Date: Sat Jun 8 18:01:10 2013
New Revision: 1491023
URL: http://svn.apache.org/r1491023
Log:
UIMA-2980
- added optional annotations, which will be filtered by rule match
Added:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/RutaOptional.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/RutaOptional_Type.java
Modified:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleMatch.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java
uima/sandbox/ruta/trunk/ruta-core/src/main/resources/org/apache/uima/ruta/engine/InternalTypeSystem.xml
uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/InternalTypeSystem.xml
Modified:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java?rev=1491023r1=1491022r2=1491023view=diff
==
---
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
(original)
+++
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
Sat Jun 8 18:01:10 2013
@@ -199,10 +199,7 @@ public class RutaStream extends FSIterat
public void addAnnotation(AnnotationFS annotation, boolean addToIndex,
AbstractRuleMatch? extends AbstractRule creator) {
-if (addToIndex) {
- cas.addFsToIndexes(annotation);
-}
-addAnnotation(annotation, creator);
+addAnnotation(annotation, true, true, creator);
}
public void addAnnotation(AnnotationFS annotation,
@@ -233,6 +230,7 @@ public class RutaStream extends FSIterat
crowd.annotationAdded(annotation, creator);
}
+
private boolean checkSpan(AnnotationFS annotation) {
boolean result = false;
int begin = annotation.getBegin();
Modified:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java?rev=1491023r1=1491022r2=1491023view=diff
==
---
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
(original)
+++
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
Sat Jun 8 18:01:10 2013
@@ -85,6 +85,8 @@ public class RutaEngine extends JCasAnno
public static final String BASIC_TYPE =
org.apache.uima.ruta.type.RutaBasic;
+ public static final String OPTIONAL_TYPE =
org.apache.uima.ruta.type.RutaOptional;
+
public static final String SEEDERS = seeders;
public static final String REMOVE_BASICS = removeBasics;
@@ -131,6 +133,8 @@ public class RutaEngine extends JCasAnno
public static final String SIMPLE_GREEDY_FOR_COMPOSED =
simpleGreedyForComposed;
+
+
private String[] seeders;
private Boolean createDebugInfo;
Modified:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleMatch.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleMatch.java?rev=1491023r1=1491022r2=1491023view=diff
==
---
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleMatch.java
(original)
+++
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleMatch.java
Sat Jun 8 18:01:10 2013
@@ -32,6 +32,7 @@ import org.apache.uima.cas.text.Annotati
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.ScriptApply;
import org.apache.uima.ruta.action.AbstractRutaAction;
+import org.apache.uima.ruta.engine.RutaEngine;
public class RuleMatch extends AbstractRuleMatchRutaRule {
@@ -150,10 +151,16 @@ public class RuleMatch extends AbstractR
for (RuleElementMatch ruleElementMatch : list2) {
ListAnnotationFS textsMatched =
ruleElementMatch.getTextsMatched();
if (textsMatched != null !textsMatched.isEmpty()) {
- begin = Math.min(textsMatched.get(0).getBegin(), begin);
- end = Math.max(textsMatched.get(textsMatched.size() -
1).getEnd(), end);
- if (cas == null) {
-cas = textsMatched.get(0).getCAS();
+ AnnotationFS first = getFirstNormal(textsMatched);
+ if (first != null) {
+begin = Math.min(first.getBegin(), begin);
+ }
+ AnnotationFS last =
