X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=class-support.lisp;h=69983a621434a642ecb603a6ee7b65a95b755bc2;hb=08af5459d3ba7d229a8339d242ef742cfe846861;hp=2b94e91a93c2451f861100aa3446168d3686f837;hpb=51451987c4fee40b475e014ee5c801b1657d119d;p=umlisp.git

diff --git a/class-support.lisp b/class-support.lisp
index 2b94e91..69983a6 100644
--- a/class-support.lisp
+++ b/class-support.lisp
@@ -104,7 +104,7 @@
 (defgeneric fmt-rui (rui))
 (when *has-fixnum-class*
   (defmethod fmt-rui ((rui fixnum))
-    (prefixed-fixnum-string aui #\A 8)))
+    (prefixed-fixnum-string rui #\A 8)))
 
 (defmethod fmt-rui ((rui integer))
   (prefixed-integer-string rui #\A 8))
@@ -336,25 +336,6 @@
 	  "Other"))))
 
 
-(defun ucon-parents (con &optional sab)
-  (ucon-ancestors con sab t))
-
-(defun ucon-ancestors (ucon &optional sab single-level)
-  "Returns a list of ancestor lists for a concept"
-  (let* ((parent-rels (filter-urels-by-rel (s#rel ucon) "par"))
-	 (anc nil))
-    (when sab
-      (setq parent-rels (delete-if-not
-			 (lambda (rel) (string-equal sab (sab rel)))
-			 parent-rels)))
-    (dolist (rel parent-rels (nreverse anc))
-      (let ((parent (find-ucon-cui (cui2 rel))))
-	(push
-	 (if single-level
-	     (list parent)
-	   (list* parent (car (ucon-ancestors parent (sab rel) nil))))
-	 anc)))))
-
 (defgeneric cxt-ancestors (obj))
 (defmethod cxt-ancestors ((con ucon))
   (loop for term in (s#term con)
@@ -388,7 +369,10 @@
     (loop for key being the hash-key in sab-codes
         collect (list key (gethash key sab-codes)))))
 
-                                          
+(defun ucon-has-sab (ucon sab)
+  (and (find-if (lambda (uso) (string-equal sab (sab uso))) (s#so ucon)) t))
+
+
 #+scl
 (dolist (c '(urank udef usat uso ucxt ustr ulo uterm usty urel ucoc uatx ucon uxw uxnw uxns lexterm labr lagr lcmp lmod lnom lprn lprp lspl ltrm ltyp lwd sdef sstr sstre1 sstre2 usrl))
     (let ((cl (find-class c)))