From e426167f52dd029869b5db3cf36b51124312d7d4 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Tue, 6 May 2003 07:55:15 +0000 Subject: [PATCH] r4843: Auto commit for Debian build --- parse-2002.lisp | 62 ++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/parse-2002.lisp b/parse-2002.lisp index a42d5b8..4024eb2 100644 --- a/parse-2002.lisp +++ b/parse-2002.lisp @@ -8,7 +8,7 @@ ;;;; Author: Kevin M. Rosenberg ;;;; Date Started: Apr 2000 ;;;; -;;;; $Id: parse-2002.lisp,v 1.8 2003/05/06 07:44:07 kevin Exp $ +;;;; $Id: parse-2002.lisp,v 1.9 2003/05/06 07:55:15 kevin Exp $ ;;;; ;;;; This file, part of UMLisp, is ;;;; Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D. @@ -151,50 +151,50 @@ '(("MRCON" "KPFSTR" "TEXT" 1024 (lambda (x) (pfstr-hash (parse-ui (nth 0 x))))) ("MRCON" "KCUISUI" "BIGINT" 0 - (lambda (x) (format nil "~d" (make-cuisui (parse-ui (nth 0 x)) (parse-ui (nth 5 x)))))) + (lambda (x) (write-to-string (make-cuisui (parse-ui (nth 0 x)) (parse-ui (nth 5 x)))))) ("MRCON" "KCUILUI" "BIGINT" 0 - (lambda (x) (format nil "~d" (make-cuilui (parse-ui (nth 0 x)) (parse-ui (nth 3 x)))))) + (lambda (x) (write-to-string (make-cuilui (parse-ui (nth 0 x)) (parse-ui (nth 3 x)))))) ("MRCON" "KCUILRL" "INTEGER" 0 - (lambda (x) (format nil "~d" (cui-lrl (parse-ui (nth 0 x)))))) + (lambda (x) (write-to-string (cui-lrl (parse-ui (nth 0 x)))))) ("MRCON" "KLUILRL" "INTEGER" 0 - (lambda (x) (format nil "~d" (lui-lrl (parse-ui (nth 3 x)))))) + (lambda (x) (write-to-string (lui-lrl (parse-ui (nth 3 x)))))) ("MRLO" "KLRL" "INTEGER" 0 - (lambda (x) (format nil "~d" + (lambda (x) (write-to-string (if (zerop (length (nth 4 x))) (cui-lrl (parse-ui (nth 0 x))) (cuisui-lrl (make-cuisui (parse-ui (nth 0 x)) (parse-ui (nth 4 x)))))))) ("MRSTY" "KLRL" "INTEGER" 0 - (lambda (x) (format nil "~d" (cui-lrl (parse-ui (nth 0 x)))))) + (lambda (x) (write-to-string (cui-lrl (parse-ui (nth 0 x)))))) ("MRCOC" "KLRL" "INTEGER" 0 - (lambda (x) (format nil "~d" + (lambda (x) (write-to-string (max (cui-lrl (parse-ui (nth 0 x))) (kmrcl:aif (cui-lrl (parse-ui (nth 1 x))) kmrcl::it 0))))) ("MRSAT" "KSRL" "INTEGER" 0 - (lambda (x) (format nil "~d" (sab-srl (nth 5 x))))) + (lambda (x) (write-to-string (sab-srl (nth 5 x))))) ("MRREL" "KSRL" "INTEGER" 0 - (lambda (x) (format nil "~d" (sab-srl (nth 4 x))))) + (lambda (x) (write-to-string (sab-srl (nth 4 x))))) ("MRRANK" "KSRL" "INTEGER" 0 - (lambda (x) (format nil "~d" (sab-srl (nth 1 x))))) + (lambda (x) (write-to-string (sab-srl (nth 1 x))))) ("MRDEF" "KSRL" "INTEGER" 0 - (lambda (x) (format nil "~d" (sab-srl (nth 1 x))))) + (lambda (x) (write-to-string (sab-srl (nth 1 x))))) ("MRCXT" "KSRL" "INTEGER" 0 - (lambda (x) (format nil "~d" (sab-srl (nth 2 x))))) + (lambda (x) (write-to-string (sab-srl (nth 2 x))))) ("MRATX" "KSRL" "INTEGER" 0 - (lambda (x) (format nil "~d" (sab-srl (nth 1 x))))) + (lambda (x) (write-to-string (sab-srl (nth 1 x))))) ("MRXW.ENG" "KLRL" "INTEGER" 0 - (lambda (x) (format nil "~d" (cuisui-lrl (make-cuisui + (lambda (x) (write-to-string (cuisui-lrl (make-cuisui (parse-ui (nth 2 x)) (parse-ui (nth 4 x))))))) ("MRXW.NONENG" "KLRL" "INTEGER" 0 - (lambda (x) (format nil "~d" (cuisui-lrl (make-cuisui + (lambda (x) (write-to-string (cuisui-lrl (make-cuisui (parse-ui (nth 2 x)) (parse-ui (nth 4 x))))))) ("MRXNW.ENG" "KLRL" "INTEGER" 0 - (lambda (x) (format nil "~d" (cuisui-lrl (make-cuisui + (lambda (x) (write-to-string (cuisui-lrl (make-cuisui (parse-ui (nth 2 x)) (parse-ui (nth 4 x))))))) ("MRXNS.ENG" "KLRL" "INTEGER" 0 - (lambda (x) (format nil "~d" (cuisui-lrl (make-cuisui + (lambda (x) (write-to-string (cuisui-lrl (make-cuisui (parse-ui (nth 2 x)) (parse-ui (nth 4 x))))))) ("MRREL" "KPFSTR2" "TEXT" 1024 @@ -202,26 +202,26 @@ ("MRCOC" "KPFSTR2" "TEXT" 1024 (lambda (x) (pfstr-hash (parse-ui (nth 1 x))))) ("MRCXT" "KCUISUI" "BIGINT" 0 - (lambda (x) (format nil "~d" (make-cuisui (parse-ui (nth 0 x)) (parse-ui (nth 1 x)))))) + (lambda (x) (write-to-string (make-cuisui (parse-ui (nth 0 x)) (parse-ui (nth 1 x)))))) ("MRSAT" "KCUILUI" "BIGINT" 0 - (lambda (x) (format nil "~d" (make-cuilui (parse-ui (nth 0 x)) (parse-ui (nth 1 x)))))) + (lambda (x) (write-to-string (make-cuilui (parse-ui (nth 0 x)) (parse-ui (nth 1 x)))))) ("MRSAT" "KCUISUI" "BIGINT" 0 - (lambda (x) (format nil "~d" (make-cuisui (parse-ui (nth 0 x)) (parse-ui (nth 2 x)))))) + (lambda (x) (write-to-string (make-cuisui (parse-ui (nth 0 x)) (parse-ui (nth 2 x)))))) ("MRSO" "KCUISUI" "BIGINT" 0 - (lambda (x) (format nil "~d" (make-cuisui (parse-ui (nth 0 x)) (parse-ui (nth 2 x)))))) + (lambda (x) (write-to-string (make-cuisui (parse-ui (nth 0 x)) (parse-ui (nth 2 x)))))) ("MRXW.ENG" "KCUISUI" "BIGINT" 0 - (lambda (x) (format nil "~d" (make-cuisui (parse-ui (nth 2 x)) (parse-ui (nth 4 x)))))) + (lambda (x) (write-to-string (make-cuisui (parse-ui (nth 2 x)) (parse-ui (nth 4 x)))))) ("MRXNW.ENG" "KCUISUI" "BIGINT" 0 - (lambda (x) (format nil "~d" (make-cuisui (parse-ui (nth 2 x)) (parse-ui (nth 4 x)))))) + (lambda (x) (write-to-string (make-cuisui (parse-ui (nth 2 x)) (parse-ui (nth 4 x)))))) ("MRXNS.ENG" "KCUISUI" "BIGINT" 0 - (lambda (x) (format nil "~d" (make-cuisui (parse-ui (nth 2 x)) (parse-ui (nth 4 x)))))) + (lambda (x) (write-to-string (make-cuisui (parse-ui (nth 2 x)) (parse-ui (nth 4 x)))))) ("MRXW.NONENG" "LAT" "CHAR" 3 (lambda (x) (nth 0 x))) ("MRXW.NONENG" "WD" "CHAR" 200 (lambda (x) (nth 1 x))) - ("MRXW.NONENG" "CUI" "INTEGER" 0 (lambda (x) (parse-ui (nth 2 x)))) - ("MRXW.NONENG" "LUI" "INTEGER" 0 (lambda (x) (parse-ui (nth 3 x)))) - ("MRXW.NONENG" "SUI" "INTEGER" 0 (lambda (x) (parse-ui (nth 4 x)))) + ("MRXW.NONENG" "CUI" "INTEGER" 0 (lambda (x) (write-to-string (parse-ui (nth 2 x))))) + ("MRXW.NONENG" "LUI" "INTEGER" 0 (lambda (x) (write-to-string (parse-ui (nth 3 x))))) + ("MRXW.NONENG" "SUI" "INTEGER" 0 (lambda (x) (write-to-string (parse-ui (nth 4 x))))) ("MRXW.NONENG" "KCUISUI" "BIGINT" 0 - (lambda (x) (format nil "~d" (make-cuisui (parse-ui (nth 2 x)) (parse-ui (nth 4 x))))))) + (lambda (x) (write-to-string (make-cuisui (parse-ui (nth 2 x)) (parse-ui (nth 4 x))))))) "Custom columns to create.(filename, col, sqltype, value-func).") (defparameter +index-cols+ @@ -358,9 +358,7 @@ append a unique number (starting at 2) onto a column name that is repeated in th (multiple-value-bind (key found) (gethash col col-count) (if found (let ((next-id (1+ key))) - (setf (nth i field-list) (concatenate 'string - col - (format nil "~D" next-id))) + (setf (nth i field-list) (concatenate 'string col (write-to-string next-id))) (setf (gethash col col-count) next-id)) (setf (gethash col col-count) 1))))) field-list)) -- 2.34.1