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 2015/12/17 21:58:23 UTC
[6/6] jena git commit: JENA-1102; Use new lang string support.
JENA-1102; Use new lang string support.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/590c06a8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/590c06a8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/590c06a8
Branch: refs/heads/master
Commit: 590c06a8937a071c7f9b01254d44c7bc2811adfa
Parents: f8f5b62
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Dec 17 18:10:49 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Dec 17 18:10:49 2015 +0000
----------------------------------------------------------------------
.../jena/sparql/expr/nodevalue/NodeFunctions.java | 14 +++++++++-----
.../jena/sparql/expr/nodevalue/NodeValueLang.java | 2 +-
2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/590c06a8/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeFunctions.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeFunctions.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeFunctions.java
index 4df9aad..b0a2c4d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeFunctions.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeFunctions.java
@@ -228,7 +228,12 @@ public class NodeFunctions {
// -------- lang
public static NodeValue lang(NodeValue nv) {
- return NodeValue.makeString(lang(nv.asNode())) ;
+ if ( nv.isLangString() )
+ return NodeValue.makeString(nv.getLang()) ;
+ if ( nv.isLiteral() )
+ return NodeValue.nvEmptyString ;
+ NodeValue.raise(new ExprTypeException("lang: Not a literal: " + nv.asQuotedString())) ;
+ return null ;
}
public static String lang(Node node) {
@@ -469,10 +474,9 @@ public class NodeFunctions {
String lex = v1.asString() ;
String lang = v2.asString() ;
- // Check?
-
- Node n = NodeFactory.createLiteral(lex, lang) ;
- return NodeValue.makeNode(n) ;
+ if ( lang.isEmpty() )
+ throw new ExprEvalException("Empty lang tag") ;
+ return NodeValue.makeLangString(lex, lang) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/590c06a8/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueLang.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueLang.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueLang.java
index 157fd63..88c329d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueLang.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueLang.java
@@ -65,7 +65,7 @@ public class NodeValueLang extends NodeValue {
@Override
protected Node makeNode()
- { return NodeFactory.createLiteral(super.getString(), lang) ; }
+ { return NodeFactory.createLiteral(string, lang) ; }
@Override
public String toString() {