From: Kevin M. Rosenberg Date: Fri, 11 Oct 2002 23:51:33 +0000 (+0000) Subject: r2967: *** empty log message *** X-Git-Tag: v1.96~334 X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=commitdiff_plain;h=49423cd4fe194abd0b7210905bc5c742f226b6c8 r2967: *** empty log message *** --- diff --git a/kmrcl.asd b/kmrcl.asd index 5ebe2a9..5216a5e 100644 --- a/kmrcl.asd +++ b/kmrcl.asd @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Apr 2000 ;;;; -;;;; $Id: kmrcl.asd,v 1.3 2002/10/10 16:23:48 kevin Exp $ +;;;; $Id: kmrcl.asd,v 1.4 2002/10/11 23:51:33 kevin Exp $ ;;;; ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -34,7 +34,7 @@ (:file "web-utils" :depends-on ("package")) (:file "xml-utils" :depends-on ("package")) - #+(or allegro lispworks) (:file "ml-class" :depends-on ("package")) + #+(or allegro lispworks cmu) (:file "ml-class" :depends-on ("package")) #+(or allegro aserve) (:file "web-utils-aserve" :depends-on ("package")) ) ) diff --git a/ml-class.lisp b/ml-class.lisp index 525ff16..567a327 100644 --- a/ml-class.lisp +++ b/ml-class.lisp @@ -11,7 +11,7 @@ ;;;; in Text, HTML, and XML formats. This includes hyperlinking ;;;; capability and sub-objects. ;;;; -;;;; $Id: ml-class.lisp,v 1.4 2002/10/10 16:23:48 kevin Exp $ +;;;; $Id: ml-class.lisp,v 1.5 2002/10/11 23:51:33 kevin Exp $ ;;;; ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -379,9 +379,6 @@ Format is ((field-name field-lookup-func other-link-params) ...)") :obj-data-fmtstr-labels #'ml-class-fmtstr-html-labels :obj-data-value-func #'ml-class-value-func)) -(defclass htmlrefformat (htmlformat) - () - (:default-initargs :link-ref (make-instance 'html-link-ref))) (defun class-name-of (obj) (string-downcase (class-name (class-of obj)))) @@ -412,10 +409,6 @@ Format is ((field-name field-lookup-func other-link-params) ...)") :obj-data-fmtstr-labels #'ml-class-fmtstr-xml-labels :obj-data-value-func #'ml-class-xmlvalue-func)) -(defclass xmlrefformat (xmlformat) - () - (:default-initargs :link-ref (make-instance 'xml-link-ref))) - (defclass link-ref () ((fmtstr :type function :initarg :fmtstr :accessor fmtstr) (fmtstr-labels :type function :initarg :fmtstr-labels :accessor fmtstr-labels) @@ -446,6 +439,15 @@ Format is ((field-name field-lookup-func other-link-params) ...)") :ampersand "&")) +(defclass htmlrefformat (htmlformat) + () + (:default-initargs :link-ref (make-instance 'html-link-ref))) + +(defclass xmlrefformat (xmlformat) + () + (:default-initargs :link-ref (make-instance 'xml-link-ref))) + + ;;; File Start and Ends (defmethod fmt-file-start ((fmt dataformat) (s stream)))