From cba592c185ee1b2e4eedc4aaa531495da79d897e Mon Sep 17 00:00:00 2001 From: Kevin Rosenberg Date: Mon, 15 Feb 2010 19:04:17 -0700 Subject: [PATCH] Change name of setter functions --- data-structures.lisp | 2 +- package.lisp | 8 ++++++++ sql-classes.lisp | 2 +- sql.lisp | 10 +++++----- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/data-structures.lisp b/data-structures.lisp index 4672d4b..2214088 100644 --- a/data-structures.lisp +++ b/data-structures.lisp @@ -42,7 +42,7 @@ (defparameter *net-path* (merge-pathnames *net-dir* *umls-path*)) -(defun (setf umls-path) (p) +(defun set-umls-path (p) (setq *umls-path* (etypecase p (string (parse-namestring p)) (pathname p))) diff --git a/package.lisp b/package.lisp index 3bb601b..bf3ba30 100644 --- a/package.lisp +++ b/package.lisp @@ -55,10 +55,15 @@ ;; From sql.lisp #:*umls-sql-db* #:umls-sql-user + #:set-umls-sql-user #:umls-sql-passwd + #:set-umls-sql-passwd #:umls-sql-db + #:set-umls-sql-db #:umls-sql-host + #:set-umls-sql-host #:umls-sql-type + #:set-umls-sql-type ;; From utils.lisp #:fmt-cui @@ -72,6 +77,8 @@ #:parse-cui #:parse-lui #:parse-sui #:parse-tui #:parse-eui ;; From sql-classes.lisp + #:current-srl + #:set-current-srl #:find-udef-cui #:find-usty-cui #:find-usty-word @@ -190,6 +197,7 @@ ;; from data-structures.lisp #:umls-path + #:set-umls-path ))) (defpackage umlisp-user diff --git a/sql-classes.lisp b/sql-classes.lisp index 2805b80..cd676f1 100644 --- a/sql-classes.lisp +++ b/sql-classes.lisp @@ -20,7 +20,7 @@ (defvar *current-srl* nil) (defun current-srl () *current-srl*) -(defun (setf current-srl) (srl) +(defun set-current-srl (srl) (setq *current-srl* srl)) (defmacro query-string (table fields srl where-name where-value diff --git a/sql.lisp b/sql.lisp index 565672e..53c98e2 100644 --- a/sql.lisp +++ b/sql.lisp @@ -30,7 +30,7 @@ (defun umls-sql-db () *umls-sql-db*) -(defun (setf umls-sql-db) (db) +(defun set-umls-sql-db (db) (etypecase db (string (setq *umls-sql-db* db)) @@ -40,28 +40,28 @@ (defvar *umls-sql-user* "secret") (defun umls-sql-user () *umls-sql-user*) -(defun (setf umls-sql-user) (u) +(defun set-umls-sql-user (u) (sql-disconnect-pooled) (setq *umls-sql-user* u)) (defvar *umls-sql-passwd* "secret") (defun umls-sql-passwd () *umls-sql-passwd*) -(defun (setf umls-sql-passwd) (p) +(defun set-umls-sql-passwd (p) (sql-disconnect-pooled) (setq *umls-sql-passwd* p)) (defvar *umls-sql-host* "localhost") (defun umls-sql-host () *umls-sql-host*) -(defun (setf umls-sql-host) (h) +(defun set-umls-sql-host (h) (sql-disconnect-pooled) (setq *umls-sql-host* h)) (defvar *umls-sql-type* :mysql) (defun umls-sql-type () *umls-sql-type*) -(defun (setf umls-sql-type) (h) +(defun set-umls-sql-type (h) (sql-disconnect-pooled) (setq *umls-sql-type* h)) -- 2.34.1