Author: rwesten
Date: Tue Sep 15 08:23:50 2015
New Revision: 1703119
URL: http://svn.apache.org/r1703119
Log:
merged implementation for STANBOL-1411 from trunk to 0.12
Modified:
stanbol/branches/release-0.12/ (props changed)
stanbol/branches/release-0.12/enhancement-engines/ (props changed)
stanbol/branches/release-0.12/enhancement-engines/disambiguation-mlt/pom.xml
stanbol/branches/release-0.12/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/SavedEntity.java
stanbol/branches/release-0.12/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/Suggestion.java
stanbol/branches/release-0.12/enhancer/ (props changed)
stanbol/branches/release-0.12/enhancer/generic/servicesapi/ (props
changed)
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/Properties.java
Propchange: stanbol/branches/release-0.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 15 08:23:50 2015
@@ -1,2 +1,2 @@
/stanbol/branches/stanbol-solr4:1455112-1458685
-/stanbol/trunk:1543372-1543373,1543405,1546706,1547070,1547313,1547718,1548212,1548552,1550654,1551133,1551879,1551886,1556839,1557037,1557995,1559644-1559645,1564229,1633587,1634576,1638109,1685046,1685794,1685824,1686224,1689339
+/stanbol/trunk:1543372-1543373,1543405,1546706,1547070,1547313,1547718,1548212,1548552,1550654,1551133,1551879,1551886,1556839,1557037,1557995,1559644-1559645,1564229,1633587,1634576,1638109,1685046,1685794,1685824,1686224,1689339,1702947
Propchange: stanbol/branches/release-0.12/enhancement-engines/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 15 08:23:50 2015
@@ -3,4 +3,4 @@
/stanbol/branches/STANBOL-913:1443935-1448276
/stanbol/branches/stanbol-nlp-processing/enhancer/engines:1388017-1413353
/stanbol/branches/stanbol-solr4/enhancement-engines:1455112-1458685
-/stanbol/trunk/enhancement-engines:1543372-1543373,1546706,1547070,1547313,1547718,1548212,1550654,1556839,1557037,1633587,1634576
+/stanbol/trunk/enhancement-engines:1543372-1543373,1546706,1547070,1547313,1547718,1548212,1550654,1556839,1557037,1633587,1634576,1702947
Modified:
stanbol/branches/release-0.12/enhancement-engines/disambiguation-mlt/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancement-engines/disambiguation-mlt/pom.xml?rev=1703119&r1=1703118&r2=1703119&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancement-engines/disambiguation-mlt/pom.xml
(original)
+++
stanbol/branches/release-0.12/enhancement-engines/disambiguation-mlt/pom.xml
Tue Sep 15 08:23:50 2015
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
Modified:
stanbol/branches/release-0.12/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/SavedEntity.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/SavedEntity.java?rev=1703119&r1=1703118&r2=1703119&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/SavedEntity.java
(original)
+++
stanbol/branches/release-0.12/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/SavedEntity.java
Tue Sep 15 08:23:50 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/branches/release-0.12/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/Suggestion.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/Suggestion.java?rev=1703119&r1=1703118&r2=1703119&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/Suggestion.java
(original)
+++
stanbol/branches/release-0.12/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/Suggestion.java
Tue Sep 15 08:23:50 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;
+ }
+ }
+ }
+ }
}
Propchange: stanbol/branches/release-0.12/enhancer/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 15 08:23:50 2015
@@ -2,4 +2,4 @@
/incubator/stanbol/branches/stanbol-nlp-processing/enhancer:1386989-1388016
/stanbol/branches/stanbol-nlp-processing/enhancer:1388017-1413353
/stanbol/branches/stanbol-solr4/enhancer:1455112-1458685
-/stanbol/trunk/enhancer:1551879,1551886,1559644-1559645,1633587
+/stanbol/trunk/enhancer:1551879,1551886,1559644-1559645,1633587,1702947
Propchange: stanbol/branches/release-0.12/enhancer/generic/servicesapi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 15 08:23:50 2015
@@ -5,4 +5,4 @@
/stanbol/branches/disambiguation-engine/generic/servicesapi:1388017-1403900
/stanbol/branches/stanbol-nlp-processing/enhancer/generic/servicesapi:1388017-1413353
/stanbol/branches/stanbol-solr4/enhancer/generic/servicesapi:1455112-1458685
-/stanbol/trunk/enhancer/generic/servicesapi:1559644-1559645
+/stanbol/trunk/enhancer/generic/servicesapi:1559644-1559645,1702947
Modified:
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/Properties.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/Properties.java?rev=1703119&r1=1703118&r2=1703119&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/Properties.java
(original)
+++
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/Properties.java
Tue Sep 15 08:23:50 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");
