Changeset 290 for branches/new-datamodel/src/model

Timestamp:

04/29/10 10:17:20 (15 years ago)

Author:

lgiessmann

Message:

new-datamodel: fixed a problem when topic-merging was caused by reifying the same "ReifiableConstructC"; fixed a bug when two topics are merged and every of these topics reifies a construct that can't be merged with the other one.

File:

• branches/new-datamodel/src/model/datamodel.lisp (modified) (3 diffs)

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

@@ -3087 +3087 @@
   (:method ((construct ReifiableConstructC) (reifier-topic TopicC)
             &key (revision *TM-REVISION*))
+    (when (and (reified-construct reifier-topic :revision revision)
+               (not (equivalent-constructs construct
+                                           (reified-construct
+                                            reifier-topic :revision revision))))
+      (error (make-condition 'not-mergable-error
+                             :message (format nil "From add-reifier(): ~a and ~a can't be merged since the reified-constructs (~a ~a) are not mergable"
+                                              reifier-topic (reifier construct :revision revision) (reified-construct reifier-topic :revision revision) construct)
+                             :construct-1 construct
+                             :construct-2 (reified-construct reifier-topic :revision revision))))
     (let ((merged-reifier-topic
            (if (reifier construct :revision revision)
@@ -3853 +3862 @@
           (destination-reified (reified-construct destination
                                                   :revision revision)))
-      (unless (eql (type-of source-reified) (type-of destination-reified))
+      (when (and source-reified destination-reified
+                 (not (eql (type-of source-reified)
+                           (type-of destination-reified))))
         (error (make-condition 'not-mergable-error
                                :message (format nil "From move-reified-construct(): ~a and ~a can't be merged since the reified-constructs are not of the same type ~a ~a"
@@ -3869 +3880 @@
             (source-reified
              (delete-reifier source source-reified :revision revision)
-             (add-reifier destination source-reified :revision revision)
+             (add-reifier  source-reified destination :revision revision)
              source-reified)
             (destination-reified
-             (add-reifier destination destination-reified :revision revision)
+             (add-reifier destination-reified destination :revision revision)
              destination-reified)))))