* allow less operator in filter clauses and don't switch to uri mode …

…there
AKSW · Oct 27, 2015 · c2764ee · c2764ee
1 parent 77df076
commit c2764ee
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/library/Erfurt/Sparql/Parser.php b/library/Erfurt/Sparql/Parser.php
@@ -112,7 +112,7 @@ public static function tokenize($queryString)
 
         $inLiteral   = false;
         $longLiteral = false;
-        
+
         for ($i=0; $i<$len; ++$i) {
             if (in_array($queryString[$i], $removeableSpecialChars) && !$inLiteral && !$inTelUri) {        
                 if (isset($tokens[$n]) && $tokens[$n] !== '') {
@@ -224,15 +224,19 @@ public static function tokenize($queryString)
                     $inUri = false;
                     continue;
                 } else if ($queryString[$i] === '<') {
-                    $inUri = true;
-                    if ($tokens[$n] === '') {
-                        $tokens[$n] = '<';
-                        continue;
-                    } else {
-                        $tokens[++$n] = '<';
-                        continue;
-                    }
+                    // this is a less operator, if we are in a filter clause and this is the second argument and also followed by a whitespace
+                    if (isset($tokens[$n-3]) && $tokens[$n-3] !== 'FILTER' && isset($queryString[$i+1]) && $queryString[$i+1] !== ' ') {
+                        // this is an uri
+                        $inUri = true;
 
+                        if ($tokens[$n] === '') {
+                            $tokens[$n] = '<';
+                            continue;
+                        } else {
+                            $tokens[++$n] = '<';
+                            continue;
+                        }
+                    }
                 }
 
                 $tokens[$n] .= $queryString{$i};