projects
/
umlisp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2554358
)
r4836: Auto commit for Debian build
author
Kevin M. Rosenberg
<kevin@rosenberg.net>
Tue, 6 May 2003 05:35:48 +0000
(
05:35
+0000)
committer
Kevin M. Rosenberg
<kevin@rosenberg.net>
Tue, 6 May 2003 05:35:48 +0000
(
05:35
+0000)
sql-create.lisp
patch
|
blob
|
history
diff --git
a/sql-create.lisp
b/sql-create.lisp
index ee5ea48138a3f713258e470c9709baeee44983f1..064836f83121473bcdaa5873951f0d06941612f3 100644
(file)
--- a/
sql-create.lisp
+++ b/
sql-create.lisp
@@
-7,7
+7,7
@@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: sql-create.lisp,v 1.1
4 2003/05/06 05:11:55
kevin Exp $
+;;;; $Id: sql-create.lisp,v 1.1
5 2003/05/06 05:35:48
kevin Exp $
;;;;
;;;; This file, part of UMLisp, is
;;;; Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
;;;;
;;;; This file, part of UMLisp, is
;;;; Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@
-61,17
+61,18
@@
(custom-col-values (custom-colstructs-for-file file) values t)))))
(custom-col-values (custom-colstructs-for-file file) values t)))))
-(defun custom-col-value (col
doquote values
)
+(defun custom-col-value (col
values doquote
)
(let ((custom-value (funcall (umls-col-custom-value-func col) values)))
(let ((custom-value (funcall (umls-col-custom-value-func col) values)))
- (if doquote
- (let ((q (umls-col-quotechar col)))
- (concatenate 'string q (escape-backslashes custom-value) q))
- (escape-backslashes custom-value))))
+ (if custom-value
+ (if doquote
+ (let ((q (umls-col-quotechar col)))
+ (concatenate 'string q (escape-backslashes custom-value) q))
+ (escape-backslashes custom-value))
+ "")))
(defun custom-col-values (colstructs values doquote)
"Returns a list of string column values for SQL inserts for custom columns"
(defun custom-col-values (colstructs values doquote)
"Returns a list of string column values for SQL inserts for custom columns"
- (loop for col in colstructs collect (custom-col-value col doquote values)))
-
+ (loop for col in colstructs collect (custom-col-value col values doquote)))
(defun remove-custom-cols (cols)
"Remove custom cols from a list col umls-cols"
(defun remove-custom-cols (cols)
"Remove custom cols from a list col umls-cols"
@@
-226,9
+227,11
@@
This is much faster that using create-umls-db-insert."
(umls-pathname (umls-file-fil file) extension) (umls-file-table file)))
(defun col-value (col value)
(umls-pathname (umls-file-fil file) extension) (umls-file-table file)))
(defun col-value (col value)
- (if (eq (umls-col-datatype col) 'sql-u)
- (write-to-string (parse-ui value ""))
- (escape-backslashes value)))
+ (if value
+ (if (eq (umls-col-datatype col) 'sql-u)
+ (write-to-string (parse-ui value ""))
+ (escape-backslashes value))
+ ""))
(defun umls-translate (file line strm)
"Translate a single line for sql output"
(defun umls-translate (file line strm)
"Translate a single line for sql output"