You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2015/09/14 15:28:43 UTC
svn commit: r1702947 - in /stanbol/trunk:
enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/
enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/
Author: rwesten
Date: Mon Sep 14 13:28:43 2015
New Revision: 1702947
URL: http://svn.apache.org/r1702947
Log:
STANBOL-1411: The MLT disambiguation engine now considers the fise:orign property
Modified:
stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/SavedEntity.java
stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/Suggestion.java
stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/Properties.java
Modified: stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/SavedEntity.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/SavedEntity.java?rev=1702947&r1=1702946&r2=1702947&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/SavedEntity.java (original)
+++ stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/SavedEntity.java Mon Sep 14 13:28:43 2015
@@ -22,6 +22,7 @@ import static org.apache.stanbol.enhance
import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.ENHANCER_SELECTED_TEXT;
import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.ENHANCER_SELECTION_CONTEXT;
import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.ENHANCER_START;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.ENHANCER_ORIGIN;
import java.util.ArrayList;
import java.util.Collection;
@@ -34,6 +35,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.clerezza.rdf.core.Literal;
import org.apache.clerezza.rdf.core.LiteralFactory;
import org.apache.clerezza.rdf.core.NonLiteral;
import org.apache.clerezza.rdf.core.Triple;
Modified: stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/Suggestion.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/Suggestion.java?rev=1702947&r1=1702946&r2=1702947&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/Suggestion.java (original)
+++ stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/Suggestion.java Mon Sep 14 13:28:43 2015
@@ -18,11 +18,13 @@ package org.apache.stanbol.enhancer.engi
import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.ENHANCER_CONFIDENCE;
import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.ENHANCER_ENTITY_REFERENCE;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.ENHANCER_ORIGIN;
import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.ENHANCER_SELECTED_TEXT;
import java.util.SortedMap;
import java.util.SortedSet;
+import org.apache.clerezza.rdf.core.Literal;
import org.apache.clerezza.rdf.core.LiteralFactory;
import org.apache.clerezza.rdf.core.TripleCollection;
import org.apache.clerezza.rdf.core.UriRef;
@@ -92,6 +94,10 @@ public class Suggestion implements Compa
suggestion.originalConfidnece = 0.0;
}
suggestion.site = EnhancementEngineHelper.getString(graph, entityAnnotation, ENTITYHUB_SITE);
+ if(suggestion.site == null){
+ //STANBOL-1411: fall back to fise:orign
+ suggestion.site = getOrigin(graph, entityAnnotation);
+ }
// NOTE: site might be NULL
return suggestion;
}
@@ -172,6 +178,8 @@ public class Suggestion implements Compa
/**
* The name of the Entityhub {@link Site} the suggested Entity is managed.
+ * Both <code>entityhub:site</code> and <code>fise:orign</code> are
+ * considered as sites (see STANBOL-1411).
*
* @return the name of the Entityhub {@link Site}
*/
@@ -229,5 +237,24 @@ public class Suggestion implements Compa
return result == 0 ? entityUri.getUnicodeString().compareTo(other.entityUri.getUnicodeString())
: result;
}
+
+ private static String getOrigin(TripleCollection graph, UriRef entityAnnotation) {
+ UriRef uOrigin = EnhancementEngineHelper.getReference(graph, entityAnnotation, ENHANCER_ORIGIN);
+ if (uOrigin != null) {
+ return uOrigin.getUnicodeString();
+ } else {
+ String sOrigin = EnhancementEngineHelper.getString(graph, entityAnnotation, ENHANCER_ORIGIN);
+ if (sOrigin != null) {
+ return sOrigin;
+ } else {
+ Literal lOrigin = EnhancementEngineHelper.get(graph, entityAnnotation, ENHANCER_ORIGIN, Literal.class, lf);
+ if (lOrigin != null) {
+ return lOrigin.getLexicalForm();
+ } else {
+ return null;
+ }
+ }
+ }
+ }
}
Modified: stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/Properties.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/Properties.java?rev=1702947&r1=1702946&r2=1702947&view=diff
==============================================================================
--- stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/Properties.java (original)
+++ stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/Properties.java Mon Sep 14 13:28:43 2015
@@ -226,7 +226,7 @@ public final class Properties {
* ontology, ...) the Entity {@link #ENHANCER_ENTITY_REFERENCE referenced}
* by a <code>{@link TechnicalClasses#ENHANCER_ENTITYANNOTATION fise:EntiyAnnotation}</code>
* originates from.
- * @since 0.12.1 (STANBOL-????)
+ * @since 0.12.1 (STANBOL-1391)
*/
public static final UriRef ENHANCER_ORIGIN = new UriRef(
NamespaceEnum.fise + "origin");