X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=ml-class.lisp;h=59e2211a00511f829dc07b634fd2db7ddd102d37;hb=1245205caa5937842d5d13ec805e15fe0d6a88c2;hp=cfe2ab7455d26a3f12bcba792d63de393ffaf2a1;hpb=5e5cc3c20a925d8af5de153a118fdaf0792dd7e2;p=kmrcl.git diff --git a/ml-class.lisp b/ml-class.lisp index cfe2ab7..59e2211 100644 --- a/ml-class.lisp +++ b/ml-class.lisp @@ -11,15 +11,15 @@ ;;;; in Text, HTML, and XML formats. This includes hyperlinking ;;;; capability and sub-objects. ;;;; -;;;; $Id: ml-class.lisp,v 1.1 2002/10/06 13:21:47 kevin Exp $ +;;;; $Id: ml-class.lisp,v 1.3 2002/10/06 13:35:30 kevin Exp $ ;;;; -;;;; This file, part of Webutils, is Copyright (c) 2002 by Kevin M. Rosenberg +;;;; This file, part of Kmrcl, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; -;;;; Webutils users are granted the rights to distribute and use this software +;;;; Kmrcl users are granted the rights to distribute and use this software ;;;; as governed by the terms of the GNU General Public License. ;;;; ************************************************************************* -(in-package :webutils) +(in-package :kmrcl) (declaim (optimize (speed 3) (safety 1))) @@ -148,47 +148,47 @@ Format is ((field-name field-lookup-func other-link-params) ...)") (if first-field (setq first-field nil) (progn - (gu:string-append fmtstr-text " ") - (gu:string-append fmtstr-html " ") - (gu:string-append fmtstr-xml " ") - (gu:string-append fmtstr-text-labels " ") - (gu:string-append fmtstr-html-labels " ") - (gu:string-append fmtstr-xml-labels " ") - (gu:string-append fmtstr-html-ref " ") - (gu:string-append fmtstr-xml-ref " ") - (gu:string-append fmtstr-html-ref-labels " ") - (gu:string-append fmtstr-xml-ref-labels " "))) + (string-append fmtstr-text " ") + (string-append fmtstr-html " ") + (string-append fmtstr-xml " ") + (string-append fmtstr-text-labels " ") + (string-append fmtstr-html-labels " ") + (string-append fmtstr-xml-labels " ") + (string-append fmtstr-html-ref " ") + (string-append fmtstr-xml-ref " ") + (string-append fmtstr-html-ref-labels " ") + (string-append fmtstr-xml-ref-labels " "))) (setq html-str value-fmt) (setq xml-str (concatenate 'string "<" namestr-lower ">" value-fmt "" namestr-lower ">")) (setq html-label-str (concatenate 'string "" namestr-lower " " value-fmt)) (setq xml-label-str (concatenate 'string " <" namestr-lower ">" value-fmt "" namestr-lower ">")) - (gu:string-append fmtstr-text value-fmt) - (gu:string-append fmtstr-html html-str) - (gu:string-append fmtstr-xml xml-str) - (gu:string-append fmtstr-text-labels namestr-lower " " value-fmt) - (gu:string-append fmtstr-html-labels html-label-str) - (gu:string-append fmtstr-xml-labels xml-label-str) + (string-append fmtstr-text value-fmt) + (string-append fmtstr-html html-str) + (string-append fmtstr-xml xml-str) + (string-append fmtstr-text-labels namestr-lower " " value-fmt) + (string-append fmtstr-html-labels html-label-str) + (string-append fmtstr-xml-labels xml-label-str) (if (find name ref-fields :key #'car) (progn - (gu:string-append fmtstr-html-ref "<~~a>" value-fmt "~~a>") - (gu:string-append fmtstr-xml-ref "<~~a>" value-fmt "~~a>") - (gu:string-append fmtstr-html-ref-labels "" namestr-lower " <~~a>" value-fmt "~~a>") - (gu:string-append fmtstr-xml-ref-labels " <~~a>" value-fmt "~~a>")) + (string-append fmtstr-html-ref "<~~a>" value-fmt "~~a>") + (string-append fmtstr-xml-ref "<~~a>" value-fmt "~~a>") + (string-append fmtstr-html-ref-labels "" namestr-lower " <~~a>" value-fmt "~~a>") + (string-append fmtstr-xml-ref-labels " <~~a>" value-fmt "~~a>")) (progn - (gu:string-append fmtstr-html-ref html-str) - (gu:string-append fmtstr-xml-ref xml-str) - (gu:string-append fmtstr-html-ref-labels html-label-str) - (gu:string-append fmtstr-xml-ref-labels xml-label-str))) + (string-append fmtstr-html-ref html-str) + (string-append fmtstr-xml-ref xml-str) + (string-append fmtstr-html-ref-labels html-label-str) + (string-append fmtstr-xml-ref-labels xml-label-str))) (if formatter (setq plain-value-func - (list `(,formatter (,(gu:concat-symbol-pkg + (list `(,formatter (,(concat-symbol-pkg :umlisp namestr) x)))) (setq plain-value-func - (list `(,(gu:concat-symbol-pkg + (list `(,(concat-symbol-pkg :umlisp namestr) x)))) (setq value-func (append value-func plain-value-func)) @@ -243,10 +243,10 @@ Format is ((field-name field-lookup-func other-link-params) ...)") (eval-when (:compile-toplevel :load-toplevel :execute) (defun ml-class-title (obj) - (gu:awhen (slot-value (class-of obj) 'title) - (if (consp gu:it) - (car gu:it) - gu:it)))) + (awhen (slot-value (class-of obj) 'title) + (if (consp it) + (car it) + it)))) (defun ml-class-subobjects-lists (obj) (slot-value (class-of obj) 'subobjects-lists)) @@ -393,7 +393,7 @@ Format is ((field-name field-lookup-func other-link-params) ...)") (defclass xmlformat (textformat) () - (:default-initargs :file-start-str "" ; (gu:std-xml-header) + (:default-initargs :file-start-str "" ; (std-xml-header) :list-start-indent t :list-start-fmtstr "<~a>