Changeset 241

Timestamp:

03/21/10 19:17:59 (15 years ago)

Author:

lgiessmann

Message:

new-datamodel: changed some code sections that caused problems with the package "xml"

Location:

branches/new-datamodel/src

Files:

• model/datamodel.lisp (modified) (1 diff)
• xml/rdf/importer.lisp (modified) (6 diffs)
• xml/rdf/map_to_tm.lisp (modified) (6 diffs)

branches/new-datamodel/src/model/datamodel.lisp ¶

@@ -23 +23 @@
            :VersionedConstructC
            :ReifiableConstructC
+           :ScopableC
+           :TypableC
            :TopicMapC
            :AssociationC

branches/new-datamodel/src/xml/rdf/importer.lisp ¶

@@ -68 +68 @@
                      (from-topic-elem-to-stub top-elem revision
                                               :xtm-id *rdf-core-xtm*)))
-                 (add-to-topicmap xml-importer::tm top))))))))
+                 (add-to-tm xml-importer::tm top))))))))
 
 
@@ -356 +356 @@
                                  :player sub-top))))
         (let ((assoc
-               (add-to-topicmap
+               (add-to-tm
                 tm
                 (make-construct 'AssociationC
@@ -397 +397 @@
                                  :player instance-top))))
         (let ((assoc
-               (add-to-topicmap
+               (add-to-tm
                 tm
                 (make-construct 'AssociationC
@@ -450 +450 @@
                                          :start-revision start-revision)))))
               (handler-case (let ((top
-                                   (add-to-topicmap
+                                   (add-to-tm
                                     tm
                                     (make-construct 
@@ -503 +503 @@
                                  :player top))))
           (let ((assoc
-                 (add-to-topicmap tm (make-construct 'AssociationC
+                 (add-to-tm tm (make-construct 'AssociationC
                                                      :start-revision start-revision
                                                      :instance-of type-top
@@ -532 +532 @@
                                :player object-topic))))
         (let ((assoc
-               (add-to-topicmap 
+               (add-to-tm 
                 tm (make-construct 'AssociationC
                                    :start-revision start-revision

branches/new-datamodel/src/xml/rdf/map_to_tm.lisp ¶

@@ -189 +189 @@
         (d::delete-construct assoc-top)
         (with-tm (start-revision document-id tm-id)
-          (add-to-topicmap
+          (add-to-tm
            xml-importer::tm
            (let ((association
@@ -230 +230 @@
         (occurrence-topics (get-isi-occurrences top start-revision))
         (name-topics (get-isi-names top start-revision)))
-    (bound-subject-identifiers top new-psis)
-    (bound-subject-locators top new-locators)
-    (bound-item-identifiers top new-item-ids)
+    (bound-subject-identifiers top new-psis start-revision)
+    (bound-subject-locators top new-locators start-revision)
+    (bound-item-identifiers top new-item-ids start-revision)
     (map 'list #'(lambda(occurrence-topic)
                    (map-isi-occurrence top occurrence-topic start-revision))
@@ -561 +561 @@
 
 
-(defun bound-item-identifiers (construct identifiers)
+(defun bound-item-identifiers (construct identifiers start-revision)
   "Bounds the passed item-identifier to the passed construct."
   (declare (ReifiableConstructC construct))
@@ -570 +570 @@
                  (item-identifiers construct))
         (d::delete-construct id)
-        (setf (identified-construct id) construct)))
+        (add-item-identifier (identified-construct id :revision start-revision)
+                             construct :revision start-revision)))
   construct)
 
 
-(defun bound-subject-identifiers (top identifiers)
+(defun bound-subject-identifiers (top identifiers start-revision)
   "Bounds the passed psis to the passed topic."
   (declare (TopicC top))
@@ -583 +584 @@
                  (psis top))
         (d::delete-construct id)
-        (setf (identified-construct id) top)))
+        (add-psi (identified-construct id :revision start-revision)
+                                top :revision start-revision)))
   top)
 
 
-(defun bound-subject-locators (top locators)
+(defun bound-subject-locators (top locators start-revision)
   "Bounds the passed locators to the passed topic."
   (declare (TopicC top))
@@ -596 +598 @@
                  (locators top))
         (d::delete-construct id)
-        (setf (identified-construct id) top)))
+        (add-locator (identified-construct id :revision start-revision)
+                     top :revision start-revision)))
   top)