Changeset 452 for trunk/src/xml/xtm

Timestamp:

05/04/11 16:46:51 (14 years ago)

Author:

lgiessmann

Message:

datamodel: implemented the function "open-tm-store" which wrapps elephant:open-store and uses :register t to support mutliple isidorus instances on one database; implemented the wrapper function "close-tm-store" that calls elephant:close-store; => adapted all unit-tests to these changes

Location:

trunk/src/xml/xtm

Files:

• importer.lisp (modified) (2 diffs)
• setup.lisp (modified) (3 diffs)

trunk/src/xml/xtm/importer.lisp ¶

@@ -45 +45 @@
            :from-topic-elem-to-stub
            :from-type-elem
-           :get-store-spec
            :get-topicref-uri
            :import-only-topics
@@ -77 +76 @@
 
 (in-package :xtm-importer)
-
-;(declaim (optimize (debug 3)))
-
-(defun get-store-spec (pathname)
-  "return the store spec for elephant and ensure that the path name is absolute"
-  (list :BDB (truename pathname)))
 
 

trunk/src/xml/xtm/setup.lisp ¶

@@ -14 +14 @@
   (format nil "~a" (uuid:make-v4-uuid)))
 
+
 (defun import-from-xtm (xtm-path repository-path &key 
                         (tm-id (error "you must provide a stable identifier (PSI-style) for this TM"))
@@ -27 +28 @@
                    (truename xtm-path) (cxml-dom:make-dom-builder)))))
     (unless elephant:*store-controller*
-      (elephant:open-store  
-       (get-store-spec repository-path)))
+      (open-tm-store repository-path))
          ;create the topic stubs so that we can refer to them later on
     (setf d:*current-xtm* xtm-id)
@@ -50 +50 @@
            (Keyword xtm-format))
   (unless elephant:*store-controller*
-    (elephant:open-store  
-     (get-store-spec repository-path)))
+    (open-tm-store repository-path))
   (init-isidorus)
   (import-from-xtm xtm-path repository-path :tm-id tm-id :xtm-id xtm-id
                    :xtm-format xtm-format)
   (when elephant:*store-controller*
-    (elephant:close-store)))
+    (close-tm-store)))