Changeset 366

Timestamp:

12/16/10 13:23:10 (14 years ago)

Author:

lgiessmann

Message:

TM-SPARQL: fixed a problem in all filter statements that uses """, ' or and do not escape inner " in literals

Location:

trunk/src

Files:

• TM-SPARQL/sparql_filter.lisp (modified) (4 diffs)
• base-tools/base-tools.lisp (modified) (2 diffs)
• unit_tests/sparql_test.lisp (modified) (3 diffs)

trunk/src/TM-SPARQL/sparql_filter.lisp ¶

@@ -59 +59 @@
   ;; *replace function(x), function(x, y), function(x, y, z)
   ;;   by filter-function(x), (filter-function(x, y), filter-function(x, y, z)
-  ;; check if all functions that will e invoked are allowed
+  ;; check if all functions that will be invoked are allowed
+  ;; add a let with all variables that are used: every variable with $ and ? prefix
+  ;; add a let with (true t) and (false nil)
   ;; *create and store this filter object
 
@@ -122 +124 @@
              (list :next-query (string-after cleaned-str result)
                    :scope result)))
-          ((string-starts-with cleaned-str "'''")
+          ((string-starts-with cleaned-str "\"")
            (let ((result (get-literal cleaned-str)))
              (list :next-query (getf result :next-query)
@@ -349 +351 @@
 
 
-(defun get-literal (query-string &key (quotation "'''"))
+(defun get-literal (query-string &key (quotation "\""))
   "Returns a list of the form (:next-query <string> :literal <string>
    where next-query is the query after the found literal and literal
@@ -367 +369 @@
              (string-starts-with query-string "'"))
          (let ((literal-end
-                (find-literal-end (subseq query-string 1)(subseq query-string 0 1))))
+                (find-literal-end (subseq query-string 1)
+                                  (subseq query-string 0 1))))
            (when literal-end
-             (list :next-query (subseq query-string (+ 1 literal-end))
-                   :literal (concatenate 'string quotation
-                                         (subseq query-string 1 literal-end)
-                                         quotation)))))))
+             (let ((literal
+                    (escape-string (subseq query-string 1 literal-end) "\"")))
+               (list :next-query (subseq query-string (+ 1 literal-end))
+                     :literal (concatenate 'string quotation literal
+                                           quotation))))))))
 
 

trunk/src/base-tools/base-tools.lisp ¶

@@ -30 +30 @@
            :string-after-number
            :separate-leading-digits
-           :white-space))
+           :white-space
+           :escape-string))
 
 (in-package :base-tools)
@@ -262 +263 @@
       (and position-of-colon (> position-of-colon 0)
            (not (find #\/ (subseq uri 0 position-of-colon)))))))
+
+
+(defun escape-string (str char-to-escape)
+  "Escapes every occurrence of char-to-escape in str, if it is
+   not escaped."
+  (declare (String str char-to-escape))
+  (let ((result ""))
+    (dotimes (idx (length str))
+      (let ((current-char (subseq str idx (1+ idx)))
+            (previous-char (if (= idx 0) "" (subseq str (1- idx) idx))))
+        (cond ((and (string= current-char char-to-escape)
+                    (string/= previous-char "\\"))
+               (push-string "\\" result)
+               (push-string current-char result))
+              (t
+               (push-string current-char result)))))
+    result))

trunk/src/unit_tests/sparql_test.lisp ¶

@@ -1060 +1060 @@
     (is-true result-2)
     (is (string= (getf result-1 :filter-string)
-                 "BOUND((progn   (progn ?var)  )) || (progn isLITERAL($var) && ?var = '''abc''')"))
+                 "BOUND((progn   (progn ?var)  )) || (progn isLITERAL($var) && ?var = \"abc\")"))
     (is (string= (getf result-1 :next-query) "}"))
     (is (string= (getf result-2 :filter-string)
-                 "(progn REGEX(?var1, '''''', ?var3) || (progn ?var1 > ?var3 && (progn STR( ?var) = '''abc''')))"))
+                 "(progn REGEX(?var1, \"\", ?var3) || (progn ?var1 > ?var3 && (progn STR( ?var) = \"abc\")))"))
     (is (string= (getf result-2 :next-query) "}"))
     (is (string= (getf result-3 :filter-string)
@@ -1082 +1082 @@
          (str-2 "!BOUND(?var1) = false}")
          (str-3 "+?var1=-$var2}")
-         (str-4 "!'abc' && (+12 = - 14)}")
+         (str-4 "!'a\"b\"c' && (+12 = - 14)}")
          (result-1
           (getf (tm-sparql::set-boundings dummy-object str-1) :filter-string))
@@ -1110 +1110 @@
     (is (string= result-2-1 "(not BOUND(?var1)) = false"))
     (is (string= result-3-1 "(1+ ?var1)=(1- $var2)"))
-    (is (string= result-4-1 "(not '''abc''') && (progn (1+ 12) = (1- 14))"))))
+    (is (string= result-4-1 "(not \"a\\\"b\\\"c\") && (progn (1+ 12) = (1- 14))"))))