test for being a literal before any use of literal
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a4ac41cb Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a4ac41cb Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a4ac41cb Branch: refs/heads/master Commit: a4ac41cbf4e7cbcfe5d894f50d8552d3e458dad7 Parents: 0c4f059 Author: Andy Seaborne <[email protected]> Authored: Thu Apr 28 16:22:19 2016 +0100 Committer: Andy Seaborne <[email protected]> Committed: Thu Apr 28 16:22:19 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/jena/query/text/TextQueryFuncs.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/a4ac41cb/jena-text/src/main/java/org/apache/jena/query/text/TextQueryFuncs.java ---------------------------------------------------------------------- diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryFuncs.java b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryFuncs.java index 21a9d3c..0aa4f38 100644 --- a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryFuncs.java +++ b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryFuncs.java @@ -74,9 +74,14 @@ public class TextQueryFuncs { String field = defn.getField(p) ; if ( field == null ) return null ; - + if ( !o.isLiteral() ) { + Log.warn(TextQuery.class, "Not a literal value for mapped field-predicate: " + field + " :: " + + FmtUtils.stringForString(field)) ; + return null ; + } String x = TextQueryFuncs.subjectToString(s) ; String graphText = TextQueryFuncs.graphNodeToString(g) ; + String language = o.getLiteral().language() ; RDFDatatype datatype = o.getLiteral().getDatatype() ; Entity entity = new Entity(x, graphText, language, datatype) ; @@ -84,11 +89,6 @@ public class TextQueryFuncs { if ( defn.getGraphField() != null ) entity.put(graphField, graphText) ; - if ( !o.isLiteral() ) { - Log.warn(TextQuery.class, "Not a literal value for mapped field-predicate: " + field + " :: " - + FmtUtils.stringForString(field)) ; - return null ; - } entity.put(field, o.getLiteralLexicalForm()) ; return entity ; }
