[isidorus-cvs] r806 - trunk/src/xml/xtm

[lgiessmann at common-lisp.net]

Author: lgiessmann
Date: Tue Aug 30 00:50:52 2011
New Revision: 806

Log:
xtm-exporter: fixed a bug in the function list-extern-associations when handling associations with less or more than two roles

Modified:
   trunk/src/xml/xtm/exporter.lisp

Modified: trunk/src/xml/xtm/exporter.lisp
==============================================================================
--- trunk/src/xml/xtm/exporter.lisp	Tue Aug 30 00:46:40 2011	(r805)
+++ trunk/src/xml/xtm/exporter.lisp	Tue Aug 30 00:50:52 2011	(r806)
@@ -28,27 +28,28 @@
 	   nil)
 	  (t
 	   (loop for item in (d:get-all-associations revision) 
-	      when (and
-		    (= (length (roles item :revision revision)) 2)
-		    (not
-		     (and
-		      (or
-		       (eq instance-topic
-			   (instance-of (first (roles item
-						      :revision revision))
-					:revision revision))
-		       (eq instance-topic
-			   (instance-of (second (roles item
-						       :revision revision))
-					:revision revision)))
-		      (or (eq type-topic
-			      (instance-of (first (roles item
-							 :revision revision))
-					   :revision revision))
-			  (eq type-topic 
-			      (instance-of (second (roles item
+	      when (or (/= (length (roles item :revision revision)) 2)
+		       (and
+			(= (length (roles item :revision revision)) 2)
+			(not
+			 (and
+			  (or
+			   (eq instance-topic
+			       (instance-of (first (roles item
 							  :revision revision))
-					   :revision revision))))))
+					    :revision revision))
+			   (eq instance-topic
+			       (instance-of (second (roles item
+							   :revision revision))
+					    :revision revision)))
+			  (or (eq type-topic
+				  (instance-of (first (roles item
+							     :revision revision))
+					       :revision revision))
+			      (eq type-topic 
+				  (instance-of (second (roles item
+							      :revision revision))
+					       :revision revision)))))))
 	      collect item)))))