X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=create-sql.lisp;h=f842eb21af84ca166f342766430180db7e7c01fc;hb=3adbc09e353b3c4dc09c8c9da6cddee8075eaa14;hp=a6f8ad390f4f0aecfa9ae10fbcf186923e203c3e;hpb=dff3199405205cf99782dd3abf9d9dde187f5494;p=umlisp.git

diff --git a/create-sql.lisp b/create-sql.lisp
index a6f8ad3..f842eb2 100644
--- a/create-sql.lisp
+++ b/create-sql.lisp
@@ -7,10 +7,10 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: create-sql.lisp,v 1.2 2003/05/07 22:53:36 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UMLisp, is
-;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
+;;;;    Copyright (c) 2000-2003 by Kevin M. Rosenberg, M.D.
 ;;;;
 ;;;; UMLisp users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the GNU General Public License.
@@ -18,9 +18,6 @@
 
 (in-package #:umlisp)
 
-(eval-when (:compile-toplevel)
-  (declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3))))
-
 (defun create-table-cmd (file)
   "Return sql command to create a table"
   (let ((col-func 
@@ -157,12 +154,13 @@
 		 conn)))
 
 (defun sql-create-special-tables (conn)
-  (make-usrl conn))
+  (make-usrl conn)
+  (make-ustats))
 
 (defun create-umls-db-by-insert ()
   "SQL Databases: initializes entire database via SQL insert commands"
-  (ensure-init-umls)
-  (init-hash-table)
+  (ensure-ucols+ufiles)
+  (ensure-preparse)
   (with-sql-connection (conn)
     (sql-drop-tables conn)
     (sql-create-tables conn)
@@ -176,8 +174,8 @@
 		       (copy-cmd #'mysql-copy-cmd))
   "SQL Databases: initializes entire database via SQL copy commands. 
 This is much faster that using create-umls-db-insert."
-  (ensure-init-umls)
-  (init-hash-table)
+  (ensure-ucols+ufiles)
+  (ensure-preparse)
   (translate-all-files extension)
   (with-sql-connection (conn)
     (sql-drop-tables conn)
@@ -192,7 +190,8 @@ This is much faster that using create-umls-db-insert."
 (defun translate-all-files (&optional (extension ".trans"))
   "Copy translated files and return postgresql copy commands to import"
   (make-noneng-index-file extension)
-  (dolist (f *umls-files*) (translate-umls-file f extension)))
+  (dolist (f (remove "MRXW.NONENG" *umls-files* :test #'string= :key #'fil))
+    (translate-umls-file f extension)))
 
 (defun translate-umls-file (file extension)
   "Translate a umls file into a format suitable for sql copy cmd"
@@ -276,7 +275,7 @@ This is much faster that using create-umls-db-insert."
 	    (nreverse avoidable) (nreverse unavoidable))))
 
 (defun display-waste ()
-  (ensure-init-umls)
+  (ensure-ucols+ufiles)
   (multiple-value-bind (tw ta tu al ul) (umls-fixed-size-waste)
     (format t "Total waste: ~d~%" tw)
     (format t "Total avoidable: ~d~%" ta)
@@ -292,7 +291,7 @@ This is much faster that using create-umls-db-insert."
 (defun max-umls-field ()
   "Return length of longest field"
   (declare (optimize (speed 3) (space 0)))
-  (ensure-init-umls)
+  (ensure-ucols+ufiles)
   (let ((max 0))
     (declare (fixnum max))
     (dolist (ucol *umls-cols*)
@@ -303,7 +302,7 @@ This is much faster that using create-umls-db-insert."
 (defun max-umls-row ()
   "Return length of longest row"
   (declare (optimize (speed 3) (space 0)))
-  (ensure-init-umls)
+  (ensure-ucols+ufiles)
   (let ((rowsizes '()))
     (dolist (file *umls-files*)
       (let ((row 0))