From eadf93ecf9164f5e0a1ec0be102624d1a383f677 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sun, 30 May 2004 12:09:02 +0000 Subject: [PATCH] r9529: successful import of 2004aa --- classes.lisp | 2 +- create-sql.lisp | 2 +- parse-rrf.lisp | 1 + sql-classes.lisp | 13 +++++-------- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/classes.lisp b/classes.lisp index b00eb53..72b4d45 100644 --- 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 3b8b39c..15506cc 100644 --- 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 793f81c..0f89b14 100644 --- 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 550cb2c..525aa9c 100644 --- 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)) -- 2.34.1