Remove obsolute uso class, simply loop exit

diff --git a/classes.lisp b/classes.lisp
index 4df25abafb9a9664ede14c78579c20bfe155c9cb..db6def56141adae1ae2aaeb42c4459b65f934b10 100644 (file)
--- a/classes.lisp
+++ b/classes.lisp
@@ -126,27 +126,6 @@
   (:default-print-slots sui stt lrl str suppress))
 
 
   (:default-print-slots sui stt lrl str suppress))
 
 

-(defclass uso (umlsclass)
-  ((aui :value-type fixnum :initarg :aui :reader aui :print-formatter fmt-aui
-        :hyperlink find-ucon-aui)
-   (cui :value-type fixnum :initarg :cui :reader cui :print-formatter fmt-cui
-        :hyperlink find-ucon-cui)
-   (sui :value-type fixnum :initarg :sui :reader sui :print-formatter fmt-sui
-        :hyperlink find-ucon-sui)
-   (saui :value-type string :initarg :saui :reader saui)
-   (sdui :value-type string :initarg :sdui :reader sdui)
-   (scui :value-type string :initarg :scui :reader scui)
-   (tty :value-type string :initarg :tty :reader tty)
-   (code :value-type string :initarg :code :reader code)
-   (sab :value-type string :initarg :sab :reader sab :hyperlink find-usab-rsab)
-   (lat :value-type string :initarg :lat :reader lat)
-   (str :value-type cdata :initarg :str :reader str)
-   (srl :value-type fixnum :initarg :srl :reader srl)
-   (ts :value-type string :initarg :ts :reader ts))
-  (:metaclass hyperobject-class)
-  (:user-name "Source")
-  (:default-print-slots aui sab code saui sdui scui tty srl ts))
-

 (defclass uterm (umlsclass)
   ((lui :value-type fixnum :initarg :lui :reader lui :print-formatter fmt-lui
         :hyperlink find-uterm-lui)
 (defclass uterm (umlsclass)
   ((lui :value-type fixnum :initarg :lui :reader lui :print-formatter fmt-lui
         :hyperlink find-uterm-lui)

diff --git a/create-sql.lisp b/create-sql.lisp
index 544267c4037b2efb1789afc27cedeaac912ebc90..974087726b0dde19e71c699399e0311f15bcb7d4 100644 (file)
--- a/create-sql.lisp
+++ b/create-sql.lisp
@@ -339,25 +339,24 @@ This is much faster that using create-umls-db-insert."
     (let ((translated-lines 0)
           (input-lines 0)
           (eof (cons nil nil)))
     (let ((translated-lines 0)
           (input-lines 0)
           (eof (cons nil nil)))

-      (catch 'done-counting
-        (with-open-file (ts output-path :direction :input
-                            #+(and sbcl sb-unicode) :external-format
-                            #+(and sbcl sb-unicode) :UTF-8
-                            #+(and allegro ics) :external-format
-                            #+(and allegro ics) :UTF-8
-                            #+lispworks :external-format
-                            #+lispworks :UTF-8
-                            #+(and clisp unicode) :external-format
-                            #+(and clisp unicode) charset:utf-8)
-          (do ((c (read-char ts nil eof) (read-char ts nil eof)))
-              ((eq c eof))
-            (when (eql c #\newline)
-              (incf translated-lines))))
-        (dolist (input-ufile input-ufiles)
-          (with-umls-ufile (line input-ufile)
-                           (incf input-lines)
-                           (when (> input-lines translated-lines)
-                             (throw 'done-counting 'incomplete)))))
+      (with-open-file (ts output-path :direction :input
+                          #+(and sbcl sb-unicode) :external-format
+                          #+(and sbcl sb-unicode) :UTF-8
+                          #+(and allegro ics) :external-format
+                          #+(and allegro ics) :UTF-8
+                          #+lispworks :external-format
+                          #+lispworks :UTF-8
+                          #+(and clisp unicode) :external-format
+                          #+(and clisp unicode) charset:utf-8)
+        (do ((c (read-char ts nil eof) (read-char ts nil eof)))
+            ((eq c eof))
+          (when (eql c #\newline)
+            (incf translated-lines))))
+      (dolist (input-ufile input-ufiles)
+        (with-umls-ufile (line input-ufile)
+          (incf input-lines)
+          (when (> input-lines translated-lines)
+            (return))))

       (cond
         ((< input-lines translated-lines)
           (format t "Translated file ~A incomplete, deleting...~%" output-path)
       (cond
         ((< input-lines translated-lines)
           (format t "Translated file ~A incomplete, deleting...~%" output-path)

diff --git a/package.lisp b/package.lisp
index e8b4b4fc2c59fd9219507dc0380451f499ce8efa..aa02443d847d389aa73bf0a5291798c1fb6d0e2c 100644 (file)
--- a/package.lisp
+++ b/package.lisp
@@ -66,6 +66,10 @@
          #:set-umls-sql-host
          #:umls-sql-type
          #:set-umls-sql-type
          #:set-umls-sql-host
          #:umls-sql-type
          #:set-umls-sql-type

+         #:with-sql-connection
+         #:with-sql-connection
+         #:sql-disconnect
+         #:sql-disconnect-pooled

 
          ;; From utils.lisp
          #:fmt-cui
 
          ;; From utils.lisp
          #:fmt-cui