X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=create-sql.lisp;h=9311a820bc3980804a7e94ca9faf11677c23f1e0;hb=9e472725307c8f98e1590814b0cb77c62cf5dc14;hp=1440fd32911e755fc16da94c974021cf8e644c2c;hpb=fe0f8af77c3bc5bb58c1cc0ab3701688fa8089a8;p=umlisp.git

diff --git a/create-sql.lisp b/create-sql.lisp
index 1440fd3..9311a82 100644
--- a/create-sql.lisp
+++ b/create-sql.lisp
@@ -208,9 +208,10 @@
      (format nil "DROP INDEX ~a"
 	     (concatenate 'string tablename "_" colname "_X")))))
 
-(defun sql-create-indexes (conn &optional (indexes +index-cols+))
+(defun sql-create-indexes (conn &key (indexes +index-cols+) verbose)
   "SQL Databases: create all indexes"
   (dolist (idx indexes)
+    (when verbose (format t "UMLS Import: Creating index ~S.~%" idx))
     (ignore-errors (sql-execute (drop-index-cmd (car idx) (cadr idx)) conn))
     (sql-execute (create-index-cmd (car idx) (cadr idx) (caddr idx)) conn)))
 
@@ -229,7 +230,7 @@
   (make-usrl conn)
   (make-ustats))
 
-(defun create-umls-db-by-insert ()
+(defun create-umls-db-by-insert (&key verbose)
   "SQL Databases: initializes entire database via SQL insert commands"
   (ensure-ucols+ufiles)
   (ensure-preparse)
@@ -239,7 +240,7 @@
     (sql-insert-all-values conn)
     (sql-create-indexes conn)
     (sql-create-custom-tables conn)
-    (sql-create-indexes conn +custom-index-cols+)
+    (sql-create-indexes conn :indexes +custom-index-cols+ :verbose verbose)
     (sql-create-special-tables conn)))
 
 (defun create-umls-db (&key (extension "-trans") (skip-translation nil) (verbose nil))
@@ -251,7 +252,7 @@ This is much faster that using create-umls-db-insert."
   (ensure-preparse)
   (unless skip-translation
     (when verbose (format t "UMLS Import: Converting text UMLS files to optimized format.~%"))
-    (translate-all-files extension))
+    (translate-all-files :extension extension :verbose verbose))
   (let ((copy-cmd
 	 (ecase (umls-sql-type)
 	   (:mysql #'mysql-copy-cmd)
@@ -264,20 +265,21 @@ This is much faster that using create-umls-db-insert."
         (when verbose (format t "UMLS Import: Importing file ~A.~%" file))
 	(sql-execute (funcall copy-cmd file extension) conn))
       (When verbose (format t "UMLS Import: Creating SQL indices.~%"))
-      (sql-create-indexes conn)
+      (sql-create-indexes conn :verbose verbose)
       (When verbose (format t "UMLS Import: Creating custom tables.~%"))
       (sql-create-custom-tables conn)
       (When verbose (format t "UMLS Import: Creating custom indices.~%"))
-      (sql-create-indexes conn +custom-index-cols+)
+      (sql-create-indexes conn :indexes +custom-index-cols+ :verbose verbose)
       (When verbose (format t "UMLS Import: Creating special tables.~%"))
       (sql-create-special-tables conn)))
   (When verbose (format t "UMLS Import: Completed.~%"))
   t)
 
-(defun translate-all-files (&optional (extension "-trans"))
-  "Copy translated files and return postgresql copy commands to import"
+(defun translate-all-files (&key (extension "-trans") verbose)
+  "Translate all *umls-files* to optimized import format."
   (make-noneng-index-file extension)
   (dolist (f (remove "MRXW_NONENG.RRF" *umls-files* :test #'string= :key #'fil))
+    (when verbose (format t "UMLS Import: translating file ~S.~%" f))
     (translate-umls-file f extension)))
 
 (defun translate-umls-file (file extension)