You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2017/06/27 14:53:17 UTC
[6/7] jena git commit: JENA-1367: Use Util.isSimpleString.
JENA-1367: Use Util.isSimpleString.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c2a8abd5
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c2a8abd5
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c2a8abd5
Branch: refs/heads/master
Commit: c2a8abd51395aabb84b8b1b69ca650799fa71613
Parents: 0573874
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jun 27 15:00:24 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jun 27 15:00:24 2017 +0100
----------------------------------------------------------------------
.../org/apache/jena/sparql/pfunction/library/strSplit.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/c2a8abd5/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/library/strSplit.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/library/strSplit.java b/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/library/strSplit.java
index 2033d38..77889b7 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/library/strSplit.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/library/strSplit.java
@@ -27,6 +27,7 @@ import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.query.QueryBuildException;
+import org.apache.jena.rdf.model.impl.Util ;
import org.apache.jena.sparql.core.Var ;
import org.apache.jena.sparql.engine.ExecutionContext ;
import org.apache.jena.sparql.engine.QueryIterator ;
@@ -36,7 +37,6 @@ import org.apache.jena.sparql.engine.iterator.QueryIterPlainWrapper ;
import org.apache.jena.sparql.pfunction.PFuncSimpleAndList ;
import org.apache.jena.sparql.pfunction.PropFuncArg ;
import org.apache.jena.sparql.util.IterLib;
-import org.apache.jena.vocabulary.XSD;
/**
* Property function that requires the object to
@@ -84,13 +84,9 @@ public class strSplit extends PFuncSimpleAndList
NodeFactory.createLiteral(item)));
return new QueryIterPlainWrapper(it, execCxt);
- } else if (subject.isLiteral()
- && XSD.xstring.getURI().equals(subject.getLiteralDatatypeURI())
- && "".equals(subject.getLiteralLanguage())) {
-
+ } else if ( Util.isSimpleString(subject) ) {
// Case: Subject is a plain literal.
// Return input unchanged if it is one of the tokens, or nothing otherwise
-
if (tokens.contains(subject.getLiteralLexicalForm())) {
return IterLib.result(binding, execCxt);
} else {