r4876: *** empty log message ***

[umlisp.git] / create-sql.lisp

diff --git a/create-sql.lisp b/create-sql.lisp
index a6f8ad390f4f0aecfa9ae10fbcf186923e203c3e..80d842abe55a6f9944903c925e9bbd1e78123f8f 100644 (file)
--- a/create-sql.lisp
+++ b/create-sql.lisp
@@ -7,7 +7,7 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: create-sql.lisp,v 1.2 2003/05/07 22:53:36 kevin Exp $
+;;;; $Id: create-sql.lisp,v 1.3 2003/05/08 04:36:12 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -161,8 +161,8 @@
 
 (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 +176,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)
@@ -276,7 +276,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 +292,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 +303,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))