Changeset 151 for trunk/src/xml

Timestamp:

11/25/09 08:39:26 (15 years ago)

Author:

lgiessmann

Message:

restructured some functions of the importer which are responsible for reifcation; adapted the corresponding unit-tests

Location:

trunk/src/xml/xtm

Files:

• importer_xtm1.0.lisp (modified) (3 diffs)
• importer_xtm2.0.lisp (modified) (3 diffs)

trunk/src/xml/xtm/importer_xtm1.0.lisp ¶

@@ -19 +19 @@
     (when (and (stringp reifier-uri)
                (> (length reifier-uri) 0))
-      (add-reifier reifiable-construct (concatenate 'string "#" reifier-uri) :xtm-version '1.0))
-    reifiable-construct))
+      (let ((psi
+             (elephant:get-instance-by-value 'd:PersistentIdC 'd:uri
+                                             (concatenate 'string "#" reifier-uri))))
+        (when psi
+          (let ((reifier-topic (identified-construct psi)))
+            (when reifier-topic
+              (add-reifier reifiable-construct reifier-topic)))))))
+  reifiable-construct)
 
 
@@ -409 +415 @@
                            member-elem :xtm-id xtm-id))
                       (xpath-child-elems-by-qname assoc-elem *xtm1.0-ns* "member"))))
-      ;(format t "type: ~A~%themes: ~A~%roles: ~A~%~%" type themes roles)
       (unless roles
         (error "from-association-elem-xtm1.0: roles are missing in association"))
@@ -431 +436 @@
                                                       (getf list-role :player))
                                                  (getf list-role :reifier-uri))
-                                        (add-reifier assoc-role (getf list-role :reifier-uri) :xtm-version '1.0)))
+                                        (let ((reifier-uri (getf list-role :reifier-uri)))
+                                          (when (and (stringp reifier-uri)
+                                                     (> (length reifier-uri) 0))
+                                            (let ((psi
+                                                   (elephant:get-instance-by-value 'd:PersistentIdC 'd:uri
+                                                                                   reifier-uri)))
+                                              (when psi
+                                                (let ((reifier-topic (identified-construct psi)))
+                                                  (when reifier-topic
+                                                    (add-reifier assoc-role reifier-topic)))))))))
                             roles))
              (roles association))

trunk/src/xml/xtm/importer_xtm2.0.lisp ¶

@@ -14 +14 @@
   (declare (dom:element reifiable-elem))
   (declare (ReifiableConstructC reifiable-construct))
-  (let ((reifier-uri (get-attribute reifiable-elem "reifier")))
+  (let ((reifier-uri (get-attribute reifiable-elem "reifier"))
+        (err "From set-reifier(): "))
     (when (and (stringp reifier-uri)
                (> (length reifier-uri) 0))
-      (add-reifier reifiable-construct reifier-uri :xtm-version '2.0))
-    reifiable-construct))
+      (let ((ii
+             (elephant:get-instance-by-value 'd:ItemIdentifierC 'd:uri reifier-uri)))
+        (if ii
+            (let ((reifier-topic (identified-construct ii)))
+              (if reifier-topic
+                  (add-reifier reifiable-construct reifier-topic)
+                  (error "~aitem-identifier ~a not found" err reifier-uri)))
+            (error "~aitem-identifier ~a not found" err reifier-uri)))))
+    reifiable-construct)
 
 
@@ -368 +376 @@
   (elephant:ensure-transaction (:txn-nosync t) 
     (let 
-        ((item-identifiers 
+        ((err "From from-association-elem(): ")
+         (item-identifiers 
           (make-identifiers 'ItemIdentifierC assoc-elem "itemIdentity" start-revision))
          (instance-of
@@ -404 +413 @@
                                                       (getf list-role :player))
                                                  (getf list-role :reifier-uri))
-                                        (add-reifier assoc-role (getf list-role :reifier-uri) :xtm-version '2.0)))
+                                        (let ((reifier-uri (getf list-role :reifier-uri)))
+                                          (when (and (stringp reifier-uri)
+                                                     (> (length reifier-uri) 0))
+                                            (let ((ii
+                                                   (elephant:get-instance-by-value 'd:ItemIdentifierC 'd:uri
+                                                                                   reifier-uri)))
+                                              (if ii
+                                                (let ((reifier-topic (identified-construct ii)))
+                                                  (if reifier-topic
+                                                      (add-reifier assoc-role reifier-topic)
+                                                      (error "~aitem-identifier ~a not found" err reifier-uri)))
+                                                (error "~aitem-identifier ~a not found" err reifier-uri)))))))
                             roles))
              (roles assoc))