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 2012/05/21 15:58:55 UTC
svn commit: r1341028 -
/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java
Author: andy
Date: Mon May 21 13:58:55 2012
New Revision: 1341028
URL: http://svn.apache.org/viewvc?rev=1341028&view=rev
Log:
If SPARQL changes ... (no match case for STRBEFORE and STRAFTER)
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java?rev=1341028&r1=1341027&r2=1341028&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java Mon May 21 13:58:55 2012
@@ -559,10 +559,15 @@ public class XSDFuncOp
Node mainArg = string.asNode() ;
if ( lex2.length() == 0 )
+ // This is considered to be "no match" in fn:substring-before
+ // SPARQL-WG proposed change::
+ // return NodeValue.nvEmptyString ;
return calcReturn("", mainArg) ;
int i = lex1.indexOf(lex2) ;
if ( i < 0 )
+ // SPARQL-WG proposed change::
+ //return NodeValue.nvEmptyString ;
return calcReturn("", mainArg) ;
String s = lex1.substring(0, i) ;
@@ -577,10 +582,16 @@ public class XSDFuncOp
Node mainArg = string.asNode() ;
if ( lex2.length() == 0 )
- return calcReturn("", mainArg) ;
+ // This is considered to be "no match" in fn:substring-after
+ // SPARQL-WG proposed change::
+ // return NodeValue.nvEmptyString ;
+ return calcReturn(lex1, mainArg) ;
int i = lex1.indexOf(lex2) ;
if ( i < 0 )
+ // This is considered to be "no match" in fn:substring-before
+ // SPARQL-WG proposed change::
+ // return NodeValue.nvEmptyString ;
return calcReturn("", mainArg) ;
i += lex2.length() ;
String s = lex1.substring(i) ;