You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by ki...@apache.org on 2017/06/13 10:13:29 UTC
[2/6] jena git commit: Revert "JENA-1313: compare using a Collator
when both literals are tagged with same language"
Revert "JENA-1313: compare using a Collator when both literals are tagged with same language"
This reverts commit fdcfc6307d7d0f4cbd850adeeb48d3ca9300c266.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/3e9a2de0
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/3e9a2de0
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/3e9a2de0
Branch: refs/heads/master
Commit: 3e9a2de0877fde2dac724585f1aa09fc868993d3
Parents: fdcfc63
Author: Bruno P. Kinoshita <br...@yahoo.com.br>
Authored: Sun Apr 30 13:06:06 2017 +1200
Committer: Bruno P. Kinoshita <br...@yahoo.com.br>
Committed: Sun Apr 30 13:06:06 2017 +1200
----------------------------------------------------------------------
.../main/java/org/apache/jena/sparql/expr/NodeValue.java | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/3e9a2de0/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
index de5f90e..c2b727e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
@@ -27,10 +27,8 @@ import java.io.FileInputStream ;
import java.io.InputStream ;
import java.math.BigDecimal ;
import java.math.BigInteger ;
-import java.text.Collator;
import java.util.Calendar ;
import java.util.Iterator ;
-import java.util.Locale;
import java.util.Properties ;
import java.util.ServiceLoader ;
@@ -786,15 +784,10 @@ public abstract class NodeValue extends ExprNode
return x ;
}
- // same lang tag, handle collation
- // TBD: cache locales? cache collators? pre define both/any? a simple in-memory lru-map-cache?
- Locale desiredLocale = Locale.forLanguageTag(node1.getLiteralLanguage());
- Collator collator = Collator.getInstance(desiredLocale);
-
- x = collator.compare(node1.getLiteralLexicalForm(), node2.getLiteralLexicalForm());
+ // same lang tag (case insensitive)
+ x = StrUtils.strCompare(node1.getLiteralLexicalForm(), node2.getLiteralLexicalForm()) ;
if ( x != Expr.CMP_EQUAL )
return x ;
-
// Same lexical forms, same lang tag by value
// Try to split by syntactic lang tags.
x = StrUtils.strCompare(node1.getLiteralLanguage(), node2.getLiteralLanguage()) ;