Changeset 422 for trunk/src/TM-SPARQL

Timestamp:

04/06/11 20:53:10 (14 years ago)

Author:

lgiessmann

Message:

TM-SPARQL: fixed a bug when there is a greater amount of variables in filters contained in one select-group

File:

• trunk/src/TM-SPARQL/sparql.lisp (modified) (2 diffs)

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

@@ -414 +414 @@
 (defgeneric process-filters (construct)
   (:documentation "Processes all filters by calling invoke-filter.")
-  (:method ((construct SPARQL-Query))
+  (:method ((construct SPARQL-Query))      
     (dolist (filter (filters construct))
       (let* ((filter-variable-names
@@ -424 +424 @@
         (setf filter-variable-values
               (cast-variable-values construct filter-variable-values))
-        (dolist (filter (filters construct))
-          (let ((true-values nil))
-            (dolist (var-elem filter-variable-values)
-              (when (eval (read-from-string (to-lisp-code var-elem filter)))
-                (map 'list #'(lambda(list-elem)
-                               (push list-elem true-values))
-                     var-elem)))
-            (let ((values-to-remove
-                   (return-false-values filter-variable-values
-                                        (remove-duplicates true-values
-                                                           :test #'variable-list=))))
-              (dolist (to-del values-to-remove)
-                (delete-rows-by-value construct (getf to-del :variable-name)
-                                      (getf to-del :variable-value))))))))
+        (let ((true-values nil))
+          (dolist (var-elem filter-variable-values)
+            (when (eval (read-from-string (to-lisp-code var-elem filter)))
+              (map 'list #'(lambda(list-elem)
+                             (push list-elem true-values))
+                   var-elem)))
+          (let ((values-to-remove
+                 (return-false-values filter-variable-values
+                                      (remove-duplicates true-values
+                                                         :test #'variable-list=))))
+            (dolist (to-del values-to-remove)
+              (delete-rows-by-value construct (getf to-del :variable-name)
+                                    (getf to-del :variable-value)))))))
     construct))