r9599: add rank slot to read ucxt

diff --git a/class-support.lisp b/class-support.lisp
index 208e1a3e23f368d710089a6312a06b3030dd30e8..c14291d7607e9552f1a878a046e5bd95bb21ec19 100644 (file)
--- a/class-support.lisp
+++ b/class-support.lisp
@@ -242,21 +242,23 @@
 
 
 (defvar +language-abbreviations+
-  '(("BAQ" . "Basque")
-    ("DAN" . "Danish")
-    ("DUT" . "Dutch")
-    ("ENG" . "English")
-    ("FIN" . "Finnish")
-    ("FRE" . "French")
-    ("GER" . "German")
-    ("HEB" . "Hebrew")
-    ("HUN" . "Hungarian")
-    ("ITA" . "Italian")
-    ("NOR" . "Norwegian")
-    ("POR" . "Portuguese")
-    ("RUS" . "Russian")
-    ("SPA" . "Spanish")
-    ("SWE" . "Swedish")))
+    '(("BAQ" . "Basque")
+      ("CZE" . "Chech")
+      ("DAN" . "Danish")
+      ("DUT" . "Dutch")
+      ("ENG" . "English")
+      ("FIN" . "Finnish")
+      ("FRE" . "French")
+      ("GER" . "German")
+      ("HEB" . "Hebrew")
+      ("HUN" . "Hungarian")
+      ("ITA" . "Italian")
+      ("JPN" . "Japanese")
+      ("NOR" . "Norwegian")
+      ("POR" . "Portuguese")
+      ("RUS" . "Russian")
+      ("SPA" . "Spanish")
+      ("SWE" . "Swedish")))
 
 (defvar *lat-info-table* (make-hash-table :size 30 :test 'equal))
 (defvar *is-lat-table-init* nil)
@@ -267,7 +269,10 @@
   (setq *is-lat-table-init* t))
 
 (defun lat-abbr-info (lat)
-  (nth-value 0 (gethash (string-downcase lat) *lat-info-table*)))
+  (aif (nth-value 0 (gethash (string-downcase lat) *lat-info-table*))
+       it
+       lat))
+
 
 
 (defun stt-abbr-info (stt)
@@ -332,7 +337,7 @@
       (let* ((anc-this-cxn (remove-if-not
                            (lambda (cxt) (= (1+ i) (cxn cxt))) anc)))
        (push
-        (sort anc-this-cxn (lambda (a b) (< (rnk a) (rnk b))))
+        (sort anc-this-cxn (lambda (a b) (< (rank a) (rank b))))
         anc-lists)))))
 
   

diff --git a/classes.lisp b/classes.lisp
index 5e9fd37e56ceb5eae56edaf84cabc1b1106ae628..feb970cb2fe301c957ee8c4f78ea57c7c5e27c56 100644 (file)
--- a/classes.lisp
+++ b/classes.lisp
@@ -97,7 +97,7 @@
    (code :value-type string :initarg :code :reader code)
    (cxn :value-type fixnum :initarg :cxn :reader cxn)
    (cxl :value-type string :initarg :cxl :reader cxl)
-   (rnk :value-type string :initarg :rnk :reader rnk)
+   (rank :value-type string :initarg :rank :reader rank)
    (cxs :value-type cdata :initarg :cxs :reader cxs)
    (cui2 :value-type fixnum :initarg :cui2 :reader cui2 :hyperlink find-ucon-cui
         :print-formatter fmt-cui)

diff --git a/sql-classes.lisp b/sql-classes.lisp
index e70c638d3a485963e4abe5875219b15751ccb811..3a1ac39df773d543fb41266cdcbdd8f90793a373 100644 (file)
--- a/sql-classes.lisp
+++ b/sql-classes.lisp
@@ -507,9 +507,10 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
 (defun find-ucxt-cuisui (cui sui &key (srl *current-srl*))
   (ensure-cui-integer cui)
   (ensure-sui-integer sui)
-  (collect-umlisp-query (mrcxt (sab code cxn cxl cxs cui2 hcd rela xc)
+  (collect-umlisp-query (mrcxt (sab rank code cxn cxl cxs cui2 hcd rela xc)
                            srl kcuisui (make-cuisui cui sui) :lrl ksrl)
-    (make-instance 'ucxt :sab sab :code code
+                       (make-instance 'ucxt :sab sab :code code
+               :rank rank
                   :cxn (ensure-integer cxn) :cxl cxl :cxs cxs :hcd hcd
                   :rela rela :xc xc
                   :cui2 (ensure-integer cui2))))