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 2012/07/19 00:22:51 UTC
svn commit: r1363155 - in
/incubator/clerezza/trunk/uima/uima.concept-tagging/src:
main/java/org/apache/clerezza/uima/concept/UIMAResourceTagger.java
test/java/org/apache/clerezza/uima/concept/UIMARemoteResourceTaggerTest.java
Author: tommaso
Date: Wed Jul 18 22:22:50 2012
New Revision: 1363155
URL: http://svn.apache.org/viewvc?rev=1363155&view=rev
Log:
[CLEREZZA-695] - minor refactoring to uima.concepttagging
Modified:
incubator/clerezza/trunk/uima/uima.concept-tagging/src/main/java/org/apache/clerezza/uima/concept/UIMAResourceTagger.java
incubator/clerezza/trunk/uima/uima.concept-tagging/src/test/java/org/apache/clerezza/uima/concept/UIMARemoteResourceTaggerTest.java
Modified: incubator/clerezza/trunk/uima/uima.concept-tagging/src/main/java/org/apache/clerezza/uima/concept/UIMAResourceTagger.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/uima/uima.concept-tagging/src/main/java/org/apache/clerezza/uima/concept/UIMAResourceTagger.java?rev=1363155&r1=1363154&r2=1363155&view=diff
==============================================================================
--- incubator/clerezza/trunk/uima/uima.concept-tagging/src/main/java/org/apache/clerezza/uima/concept/UIMAResourceTagger.java (original)
+++ incubator/clerezza/trunk/uima/uima.concept-tagging/src/main/java/org/apache/clerezza/uima/concept/UIMAResourceTagger.java Wed Jul 18 22:22:50 2012
@@ -54,6 +54,8 @@ import java.util.List;
@Path("/concepts/tagger/")
public class UIMAResourceTagger extends ResourceTagger {
+ public static final String RELEVANCE = "relevance";
+ public static final String TEXT = "text";
private UIMAServicesFacade uimaServicesFacade;
@Override
@@ -73,7 +75,7 @@ public class UIMAResourceTagger extends
public Response updateConcepts(@FormParam("uri") UriRef uri, @Context UriInfo uriInfo, @FormParam("override") boolean override) {
if (uri != null) {
GraphNode node = new GraphNode(uri, cgProvider.getContentGraph());
- List<FeatureStructure> conceptsFS = null;
+ List<FeatureStructure> conceptsFS;
try {
/* extract concepts */
conceptsFS = uimaServicesFacade.getConcepts(node.toString());
@@ -85,9 +87,9 @@ public class UIMAResourceTagger extends
if (conceptsFS != null && !conceptsFS.isEmpty()) {
for (FeatureStructure conceptFS : conceptsFS) {
Type conceptType = conceptFS.getType();
- Double relevance = Double.valueOf(conceptFS.getStringValue(conceptType.getFeatureByBaseName("relevance")));
+ Double relevance = Double.valueOf(conceptFS.getStringValue(conceptType.getFeatureByBaseName(RELEVANCE)));
if (relevance > 0.6) {
- node.addProperty(DCTERMS.subject, new UriRef(conceptFS.getStringValue(conceptType.getFeatureByBaseName("text"))));
+ node.addProperty(DCTERMS.subject, new UriRef(conceptFS.getStringValue(conceptType.getFeatureByBaseName(TEXT))));
}
}
}
Modified: incubator/clerezza/trunk/uima/uima.concept-tagging/src/test/java/org/apache/clerezza/uima/concept/UIMARemoteResourceTaggerTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/uima/uima.concept-tagging/src/test/java/org/apache/clerezza/uima/concept/UIMARemoteResourceTaggerTest.java?rev=1363155&r1=1363154&r2=1363155&view=diff
==============================================================================
--- incubator/clerezza/trunk/uima/uima.concept-tagging/src/test/java/org/apache/clerezza/uima/concept/UIMARemoteResourceTaggerTest.java (original)
+++ incubator/clerezza/trunk/uima/uima.concept-tagging/src/test/java/org/apache/clerezza/uima/concept/UIMARemoteResourceTaggerTest.java Wed Jul 18 22:22:50 2012
@@ -22,7 +22,6 @@ import org.apache.clerezza.rdf.core.Grap
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
/**
* Testcase for {@link UIMARemoteResourceTaggerService}
@@ -30,13 +29,9 @@ import static org.junit.Assert.fail;
public class UIMARemoteResourceTaggerTest {
@Test
- public void serviceExecutionTest() {
- try {
- UIMARemoteResourceTaggerService service = new UIMARemoteResourceTaggerService();
- Graph graph = service.tagUri("http://incubator.apache.org/clerezza", "04490000a72fe7ec5cb3497f14e77f338c86f2fe");
- assertNotNull(graph);
- } catch (Exception e) {
- fail(e.getLocalizedMessage());
- }
+ public void serviceExecutionTest() throws Exception {
+ UIMARemoteResourceTaggerService service = new UIMARemoteResourceTaggerService();
+ Graph graph = service.tagUri("http://incubator.apache.org/clerezza", "04490000a72fe7ec5cb3497f14e77f338c86f2fe");
+ assertNotNull(graph);
}
}