r11474: improve verbose status msgs

[umlisp.git] / create-sql.lisp

diff --git a/create-sql.lisp b/create-sql.lisp
index 02a8701d3ff5cd9a4941c9ae3035a75b97fc2bf2..33e85b6584d02b467f77467d80f0f5d6b36dacb9 100644 (file)
--- a/create-sql.lisp
+++ b/create-sql.lisp
@@ -252,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)
@@ -262,7 +262,7 @@ This is much faster that using create-umls-db-insert."
       (sql-drop-tables conn)
       (sql-create-tables conn)
       (dolist (file *umls-files*)
-        (when verbose (format t "UMLS Import: Importing file ~A.~%" file))
+        (when verbose (format t "UMLS Import: Importing file ~A to SQL.~%" (fil file)))
        (sql-execute (funcall copy-cmd file extension) conn))
       (When verbose (format t "UMLS Import: Creating SQL indices.~%"))
       (sql-create-indexes conn :verbose verbose)
@@ -275,10 +275,11 @@ This is much faster that using create-umls-db-insert."
   (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.~%" (fil f)))
     (translate-umls-file f extension)))
 
 (defun translate-umls-file (file extension)