r11156: fix trans extension for sbcl, fix index for mrrel

[umlisp.git] / parse-rrf.lisp

diff --git a/parse-rrf.lisp b/parse-rrf.lisp
index 2e744ad9764cc5979c2234977002f5729aba108d..ad9105aa546ee2b9e33b5cfbddbb5d6c879b5d4b 100644 (file)
--- a/parse-rrf.lisp
+++ b/parse-rrf.lisp
@@ -2,7 +2,7 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:     parse-2002.lisp
+;;;; Name:     parse-rrf.lisp
 ;;;; Purpose:  Parsing and SQL insertion routines for UMLisp which may
 ;;;;           change from year to year
 ;;;; Author:   Kevin M. Rosenberg
@@ -40,11 +40,11 @@
           (clrhash cuisui-lrl-hash)
           (clrhash sab-srl-hash))
       (setf
-         pfstr-hash (make-hash-table :size 800000)
-         cui-lrl-hash (make-hash-table :size 800000)
-         lui-lrl-hash (make-hash-table :size 1500000)
-         sui-lrl-hash (make-hash-table :size 1500000)
-         cuisui-lrl-hash (make-hash-table :size 1800000)
+         pfstr-hash (make-hash-table :size 1300000)
+         cui-lrl-hash (make-hash-table :size 1300000)
+         lui-lrl-hash (make-hash-table :size 4600000)
+         sui-lrl-hash (make-hash-table :size 5100000)
+         cuisui-lrl-hash (make-hash-table :size 2000000)
          sab-srl-hash (make-hash-table :size 100 :test 'equal))))
 
   (defun ensure-preparse (&optional (force-read nil))
@@ -57,10 +57,12 @@
             (sui (parse-ui (nth 5 line)))
             (sab (nth 11 line))
             (srl (parse-integer (nth 15 line))))
+        ;; pfstr deprecated by KPKENG field in MRCONSO
+        #+nil
         (unless (gethash cui pfstr-hash)  ;; if haven't stored pfstr for cui
-            (if (and (string-equal (nth 1 line) "ENG") ; LAT
-                     (string-equal (nth 2 line) "P") ; ts
-                     (string-equal (nth 4 line) "PF")) ; stt
+            (when (and (string-equal (nth 1 line) "ENG") ; LAT
+                       (string-equal (nth 2 line) "P") ; ts
+                       (string-equal (nth 4 line) "PF")) ; stt
              (setf (gethash cui pfstr-hash) (nth 14 line))))
         (set-lrl-hash cui srl cui-lrl-hash)
         (set-lrl-hash lui srl lui-lrl-hash)
@@ -73,7 +75,7 @@
     (setq *preparse-hash-init?* t)
     t)
 
-  (defun pfstr-hash (cui) (gethash cui pfstr-hash))
+  #+nil (defun pfstr-hash (cui) (gethash cui pfstr-hash))
   (defun cui-lrl (cui)    (gethash cui cui-lrl-hash))
   (defun lui-lrl (lui)    (gethash lui lui-lrl-hash))
   (defun sui-lrl (sui)    (gethash sui sui-lrl-hash))
@@ -214,7 +216,7 @@
       ("SCUI" "MRCONSO")
       ("CUI" "MRDEF")
       ("CUI1" "MRREL") ("CUI2" "MRREL")
-      ("RUI" "MRREL") ("AUI" "MRREL") ("AUI2" "MRREL")
+      ("RUI" "MRREL") ("AUI1" "MRREL") ("AUI2" "MRREL")
       ("CUI" "MRSAT") ("LUI" "MRSAT") ("SUI" "MRSAT")
       ("METAUI" "MRSAT") ("ATN" "MRSAT")
       ("CUI" "MRSTY")  ("TUI" "MRSTY") ("CUI" "MRXNS_ENG")