Changeset 385

Timestamp:

01/25/11 17:46:43 (14 years ago)

Author:

lgiessmann

Message:

tm-sparql: added an xtm file that contains all special uris defined by the networkedplanet tmsparql proposal as topic with corresponding PSIs; added a funtion that allos to initialise the tmsparql module, ie. the tmsparql xtm is imported

Location:

trunk/src

Files:

• TM-SPARQL/sparql.lisp (modified) (3 diffs)
• TM-SPARQL/sparql_constants.lisp (added)
• TM-SPARQL/tmsparql_core_psis.xtm (added)
• isidorus.asd (modified) (3 diffs)
• xml-constants.lisp (modified) (2 diffs)

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

@@ -9 +9 @@
 
 (defpackage :TM-SPARQL
-  (:use :cl :datamodel :base-tools :exceptions :constants)
+  (:use :cl :datamodel :base-tools :exceptions :constants
+        :TM-SPARQL-Constants :xml-importer :xml-constants
+        :isidorus-threading :xml-tools)
   (:export :SPARQL-Query
-           :result))
+           :result
+           :init-tm-sparql))
 
 (in-package :TM-SPARQL)
@@ -19 +22 @@
 (defvar *equal-operators* nil "A Table taht contains tuples of 
                                classes and equality operators.")
+
+
+(defun init-tm-sparql (&optional (revision (get-revision)))
+  "Imports the file tmsparql_core_psis.xtm. core_psis.xtm has to be imported
+   before."
+  (with-writer-lock
+    (with-tm (revision "tmsparql.xtm" (concat *tms* "topic-map"))
+      (let ((core-dom (cxml:parse-file *tmsparql_core_psis.xtm*
+                                       (cxml-dom:make-dom-builder)))
+            (xtm-id (reverse
+                     (base-tools:string-until
+                      (reverse
+                       (pathname-name
+                        xml-constants:*tmsparql_core_psis.xtm*)) "/"))))
+        (elephant:ensure-transaction (:txn-nosync t)
+          (loop for top-elem across 
+               (xpath-child-elems-by-qname (dom:document-element core-dom)
+                                           *xtm2.0-ns* "topic")
+             do (let ((top
+                       (from-topic-elem-to-stub top-elem revision
+                                                :xtm-id xtm-id)))
+                  (add-to-tm xml-importer::tm top))))))))
+
+
 
 (defun init-*equal-operators* ()
@@ -1165 +1192 @@
   ;; => an intersection is invoked
   (reduce-results construct (make-result-lists construct))
-;  (dolist (triple (select-group construct))
-;    (dolist (filter (filters construct))
-;      (invoke-filter triple construct filter)))
   (process-filters construct)
   construct)

trunk/src/isidorus.asd ¶

@@ -24 +24 @@
                (:static-file "xml/xtm/core_psis.xtm")
                (:static-file "xml/rdf/rdf_core_psis.xtm")
+               (:static-file "TM-SPARQL/tmsparql_core_psis.xtm")
                (:file "xml-constants" 
                       :depends-on ("xml/xtm/core_psis.xtm"
@@ -41 +42 @@
                         :depends-on ("constants" "base-tools"))
                (:module "TM-SPARQL"
-                        :components ((:file "sparql")
+                        :components ((:file "sparql_constants")
+                                     (:file "sparql"
+                                            :depends-on ("sparql_constants"))
                                      (:file "filter_wrappers"
                                             :depends-on ("sparql"))
@@ -48 +51 @@
                                      (:file "sparql_parser"
                                             :depends-on ("sparql" "sparql_filter")))
-                        :depends-on ("constants" "base-tools" "model"))
+                        :depends-on ("constants"
+                                     "base-tools"
+                                     "model"
+                                     "xml-constants"
+                                     "xml"
+                                     "threading"))
                (:module "xml"
                         :components ((:module "xtm"

trunk/src/xml-constants.lisp ¶

@@ -15 +15 @@
   (:export :*xml-component*
            :*core_psis.xtm*
-           :*rdf_core_psis.xtm*))
+           :*rdf_core_psis.xtm*
+           :*tmsparql_core_psis.xtm*))
 
 (in-package :xml-constants)
@@ -29 +30 @@
   (asdf:component-pathname
    (asdf:find-component *isidorus-system* "xml/rdf/rdf_core_psis.xtm")))
+
+(defparameter *tmsparql_core_psis.xtm*
+  (asdf:component-pathname
+   (asdf:find-component *isidorus-system* "TM-SPARQL/tmsparql_core_psis.xtm")))