Author: rwesten
Date: Thu Apr 23 08:44:39 2015
New Revision: 1675557
URL: http://svn.apache.org/r1675557
Log:
merged update to STANBOL-1417 from 0.12 to trunk
Modified:
stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/EnhancementEngineHelper.java
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/reader/ContentItemReader.java
Modified:
stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/EnhancementEngineHelper.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/EnhancementEngineHelper.java?rev=1675557&r1=1675556&r2=1675557&view=diff
==============================================================================
---
stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/EnhancementEngineHelper.java
(original)
+++
stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/EnhancementEngineHelper.java
Thu Apr 23 08:44:39 2015
@@ -40,6 +40,7 @@ import java.util.Random;
import java.util.UUID;
import org.apache.clerezza.rdf.core.BNode;
+import org.apache.clerezza.rdf.core.InvalidLiteralTypeException;
import org.apache.clerezza.rdf.core.Language;
import org.apache.clerezza.rdf.core.Literal;
import org.apache.clerezza.rdf.core.LiteralFactory;
@@ -728,7 +729,20 @@ public final class EnhancementEngineHelp
NonLiteral textAnnotation = textAnnoataions.next().getSubject();
String language = getString(graph, textAnnotation, DC_LANGUAGE);
if(language != null){
- Double confidence = get(graph, textAnnotation,
ENHANCER_CONFIDENCE, Double.class, lf);
+ Double confidence = null;
+ try {
+ confidence = get(graph, textAnnotation,
ENHANCER_CONFIDENCE, Double.class, lf);
+ } catch (InvalidLiteralTypeException e){ // STANBOL-1417: not
a double value
+ try { //try with float
+ Float fconf =
get(graph,textAnnotation,ENHANCER_CONFIDENCE,Float.class,lf);
+ if(fconf != null){
+ confidence = Double.valueOf(fconf.doubleValue());
+ }
+ } catch (InvalidLiteralTypeException e1){
+ log.warn("Unable to parse confidence for language
annotation "
+ + textAnnotation, e);
+ }
+ }
confidences.put(textAnnotation,confidence);
langAnnotations.add(textAnnotation);
}
Modified:
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/reader/ContentItemReader.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/reader/ContentItemReader.java?rev=1675557&r1=1675556&r2=1675557&view=diff
==============================================================================
---
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/reader/ContentItemReader.java
(original)
+++
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/reader/ContentItemReader.java
Thu Apr 23 08:44:39 2015
@@ -327,8 +327,8 @@ public class ContentItemReader implement
//add fise:TextAnnotation information as expected by a Language
annotation.
m.add(new TripleImpl(la, DC_TYPE, DCTERMS_LINGUISTIC_SYSTEM));
m.add(new TripleImpl(la, DC_LANGUAGE, new PlainLiteralImpl(lang)));
- //we set the confidence to 1.0
- m.add(new TripleImpl(la, ENHANCER_CONFIDENCE,
lf.createTypedLiteral(Float.valueOf(1.0f))));
+ //we set the confidence to 1.0^^xsd:double
+ m.add(new TripleImpl(la, ENHANCER_CONFIDENCE,
lf.createTypedLiteral(Double.valueOf(1.0f))));
}
/**
* tries to retrieve the ContentItem from the 'uri' query parameter of the
