r9529: successful import of 2004aa

diff --git a/classes.lisp b/classes.lisp
index b00eb53a3ae332effde734455d9834f708b02534..72b4d450f4786b56cbe5c0fb90efbbd3028c4b0c 100644 (file)
--- a/classes.lisp
+++ b/classes.lisp
@@ -116,7 +116,7 @@
    (str :value-type cdata :initarg :str :reader str)
    (lrl :value-type fixnum :initarg :lrl :reader lrl)
    (stt :value-type string :initarg :stt :reader stt)
-   (s#so :reader s#atom :subobject (find-uso-cuisui cui sui))
+   (s#so :reader s#so :subobject (find-uso-cuisui cui sui))
    (s#sat :reader s#sat :subobject (find-usat-ui cui lui sui))
    (s#cxt :reader s#cxt :subobject (find-ucxt-cuisui cui sui)))
   (:metaclass hyperobject-class)

diff --git a/create-sql.lisp b/create-sql.lisp
index 3b8b39ca912589b131958be15331f42f7794bcae..15506cca76bdb539e6cf812f0452186d8a853823 100644 (file)
--- a/create-sql.lisp
+++ b/create-sql.lisp
@@ -215,7 +215,7 @@
       (ignore-errors (sql-execute "drop table USRL" conn)))
   (sql-execute "create table USRL (sab varchar(80), srl integer)" conn)
   (dolist (tuple (mutex-sql-query
-                 "select distinct SAB,SRL from MRSO order by SAB asc"))
+                 "select distinct SAB,SRL from MRCONSO order by SAB asc"))
     (sql-execute (format nil "insert into USRL (sab,srl) values ('~a',~d)" 
                         (car tuple) (ensure-integer (cadr tuple)))
                 conn)))

diff --git a/parse-rrf.lisp b/parse-rrf.lisp
index 793f81cfeb1d4fd04adf2450c18654f9c8783c83..0f89b148b4e3b3b5476dce43714f1d7aea515ad7 100644 (file)
--- a/parse-rrf.lisp
+++ b/parse-rrf.lisp
@@ -104,6 +104,7 @@
       ("RNK" sql-s) ("RWS" sql-i) ("SRL" sql-s) ("SUI" sql-u) ("TUI" sql-u)
       ;;; Custom columns
       ("KCUISUI" sql-l) ("KCUILUI" sql-l) ("KCUILRL" sql-i) ("KLUILRL" sql-i)
+      ("KSUILRL" sql-i)
       ("KSRL" sql-i) ("KLRL" sql-i)
       ;;; LEX columns
       ("EUI" sql-u) ("EUI2" sql-u)

diff --git a/sql-classes.lisp b/sql-classes.lisp
index 550cb2c9ebe231c9f7400a3f7fc46019d65e74dc..525aa9cb8f32bfc05d1ecdd8bdbd0c102adba9e4 100644 (file)
--- a/sql-classes.lisp
+++ b/sql-classes.lisp
@@ -804,24 +804,21 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
       (insert-ustats-count conn "Concept Count" "MRCONSO" "distinct CUI" "KCUILRL" srl)
       (insert-ustats-count conn "Term Count" "MRCONSO" "distinct KCUILUI" "KCUILRL" srl)
       (insert-ustats-count conn "Distinct Term Count" "MRCONSO" "distinct LUI" "KLUILRL" srl)
-      (insert-ustats-count conn "String Count" "MRCONSO" "*" "LRL" srl)
-      (insert-ustats-count conn "Distinct String Count" "MRCONSO" "distinct SUI" "LRL" srl)
+      (insert-ustats-count conn "String Count" "MRCONSO" "*" "KSUILRL" srl)
+      (insert-ustats-count conn "Distinct String Count" "MRCONSO" "distinct SUI" "KSUILRL" srl)
       (insert-ustats-count conn "Context Count" "MRCXT" "*" "KSRL" srl)
       (insert-ustats-count conn "Co-occuring Concept Count" "MRCOC" "*" "KLRL" srl)
       (insert-ustats-count conn "Definition Count" "MRDEF" "*" "KSRL" srl)
+      #+ignore
       (insert-ustats-count conn "Locator Count" "MRLO" "*" "KLRL" srl)
       (insert-ustats-count conn "Rank Count" "MRRANK" "*" "KSRL" srl)
       (insert-ustats-count conn "Relationship Count" "MRREL" "*" "KSRL" srl)
       (insert-ustats-count conn "Semantic Type Count" "MRSTY" "*" "KLRL" srl)
       (insert-ustats-count conn "Simple Attribute Count" "MRSAT" "*" "KSRL" srl)
-      (insert-ustats-count conn "Source Count" "MRSO" "*" "SRL" srl)
+      (insert-ustats-count conn "Source Abbreviation Count" "MRSAB" "*" "SRL" srl)
       (insert-ustats-count conn "Word Index Count" "MRXW_ENG" "*" "KLRL" srl)
       (insert-ustats-count conn "Normalized Word Index Count" "MRXNW_ENG" "*" "KLRL" srl)
-      (insert-ustats-count conn "Normalized String Index Count" "MRXNS_ENG" "*" "KLRL" srl)
-      (insert-ustats-count conn "Bonus Attribute Name Count" "BONUS_ATN" "*" nil srl)
-      (insert-ustats-count conn "Bonus Relationship Count" "BONUS_REL" "*" nil srl)
-      (insert-ustats-count conn "Bonus Source Abbreviation Count" "BONUS_SAB" "*" nil srl)
-      (insert-ustats-count conn "Bonus Term Type Count" "BONUS_TTY" "*" nil srl))
+      (insert-ustats-count conn "Normalized String Index Count" "MRXNS_ENG" "*" "KLRL" srl))
     (sql-execute "create index USTATS_SRL on USTATS (SRL)" conn))
   (find-ustats-all))