You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by to...@apache.org on 2010/04/21 09:38:50 UTC
svn commit: r936182 - in
/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/src:
main/java/org/apache/clerezza/uima/utils/
test/java/org/apache/clerezza/uima/utils/
Author: tommaso
Date: Wed Apr 21 07:38:50 2010
New Revision: 936182
URL: http://svn.apache.org/viewvc?rev=936182&view=rev
Log:
[CLEREZZA-124] - changed signature of method retrieving opencalais annotations to List<Annotation> to enable smarter adding of such objects to a resource (i.e. inside UIMAMetadataGenerator)
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/src/main/java/org/apache/clerezza/uima/utils/ExternalServicesFacade.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/src/test/java/org/apache/clerezza/uima/utils/ExternalServicesFacadeTest.java
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/src/main/java/org/apache/clerezza/uima/utils/ExternalServicesFacade.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/src/main/java/org/apache/clerezza/uima/utils/ExternalServicesFacade.java?rev=936182&r1=936181&r2=936182&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/src/main/java/org/apache/clerezza/uima/utils/ExternalServicesFacade.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/src/main/java/org/apache/clerezza/uima/utils/ExternalServicesFacade.java Wed Apr 21 07:38:50 2010
@@ -75,9 +75,9 @@ public class ExternalServicesFacade {
return language;
}
- public List<String> getCalaisEntities(String document) throws UIMAException {
+ public List<Annotation> getCalaisAnnotations(String document) throws UIMAException {
- List<String> entities = new ArrayList<String>();
+ List<Annotation> calaisAnnotations = new ArrayList<Annotation>();
try {
@@ -88,17 +88,12 @@ public class ExternalServicesFacade {
JCas jcas = uimaExecutor.getResults();
// extract entities using OpenCalaisAnnotator
- List<Annotation> calaisAnnotations = UIMAUtils.getAllAnnotationsOfType(org.apache.uima.calais.BaseType.type, jcas);
-
- // TODO should change return value to a list of richer type wrapping UIMA Annotations
- for (Annotation calaisAnnotation : calaisAnnotations) {
- entities.add(calaisAnnotation.getCoveredText());
- }
+ calaisAnnotations = UIMAUtils.getAllAnnotationsOfType(org.apache.uima.calais.BaseType.type, jcas);
} catch (Exception e) {
throw new UIMAException(e);
}
- return entities;
+ return calaisAnnotations;
}
public Map<String, Object> getParameterSetting() {
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/src/test/java/org/apache/clerezza/uima/utils/ExternalServicesFacadeTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/src/test/java/org/apache/clerezza/uima/utils/ExternalServicesFacadeTest.java?rev=936182&r1=936181&r2=936182&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/src/test/java/org/apache/clerezza/uima/utils/ExternalServicesFacadeTest.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/src/test/java/org/apache/clerezza/uima/utils/ExternalServicesFacadeTest.java Wed Apr 21 07:38:50 2010
@@ -1,5 +1,6 @@
package org.apache.clerezza.uima.utils;
+import org.apache.uima.jcas.tcas.Annotation;
import org.junit.Test;
import java.util.HashMap;
@@ -52,18 +53,18 @@ public class ExternalServicesFacadeTest
}
@Test
- public void getCalaisEntities() {
+ public void getCalaisAnnotationsTest() {
try {
ExternalServicesFacade externalServicesFacade = new ExternalServicesFacade();
String licenseId = "g6h9zamsdtwhb93nc247ecrs";
Map<String, Object> parameterSettings = new HashMap<String, Object>();
parameterSettings.put("licenseID", licenseId);
externalServicesFacade.setParameterSetting(parameterSettings);
- List<String> entities = externalServicesFacade.getCalaisEntities(AN_ENGLISH_TEXT);
- assertTrue(entities != null);
- assertTrue(!entities.isEmpty());
- assertTrue(entities.size() == 1);
- assertTrue(entities.get(0).equals("Queen Elizabeth"));
+ List<Annotation> calaisAnnotations = externalServicesFacade.getCalaisAnnotations(AN_ENGLISH_TEXT);
+ assertTrue(calaisAnnotations != null);
+ assertTrue(!calaisAnnotations.isEmpty());
+ assertTrue(calaisAnnotations.size() == 1);
+ assertTrue(calaisAnnotations.get(0).getCoveredText().equals("Queen Elizabeth"));
}
catch (Exception e) {
e.printStackTrace();