r3103: *** empty log message ***

diff --git a/ml-class.lisp b/ml-class.lisp
index 39878fa91bae69131b19285e8ccac934628d015d..9b5f08520927d14d8edfd91a92b4aa9c29454adc 100644 (file)
--- 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.20 2002/10/17 00:25:05 kevin Exp $
+;;;; $Id: ml-class.lisp,v 1.21 2002/10/18 07:28:57 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -25,17 +25,17 @@
 (declaim (optimize (speed 3) (safety 1)))
 
 (defun ml-class-of (obj)
-  #-(or cmu sbcl scl) (class-of obj)
+  #-(or cmu sbcl) (class-of obj)
   #+sbcl (sb-pcl:class-of obj)
-  #+(or cmu scl) (pcl:class-of obj))
+  #+cmu (pcl:class-of obj))
 
 (defun ml-class-name (obj)
-  #-(or cmu sbcl scl) (class-name obj)
+  #-(or cmu sbcl) (class-name obj)
   #+sbcl (sb-pcl:class-name obj)
-  #+(or cmu scl) (pcl:class-name obj))
+  #+cmu (pcl:class-name obj))
 
 (defclass ml-class (#-(or cmu sbcl) standard-class
-                     #+(or cmu scl) pcl::standard-class
+                     #+cmu pcl::standard-class
                      #+sbcl sb-pcl::standard-class)
   ((title :initarg :title :type string :reader ml-std-title
          :documentation 
@@ -72,20 +72,28 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
   (:default-initargs :title nil :fields nil :subobjects-lists nil :ref-fields nil)
   (:documentation "Metaclass for Markup Language classes."))
 
-#+(or cmu scl)
+#+cmu
 (defmethod pcl:finalize-inheritance :after ((cl ml-class))
   (init-ml-class cl))
 
+#+scl
+(defmethod clos:finalize-inheritance :after ((cl ml-class))
+  (init-ml-class cl))
+
 
 #+sbcl
 (defmethod sb-pcl:finalize-inheritance :after ((cl ml-class))
   (init-ml-class cl))
 
 
-#+(or cmu slc)
+#+cmu
 (defmethod pcl:validate-superclass ((class ml-class) (superclass pcl::standard-class))
   t)
 
+#+scl
+(defmethod clos:validate-superclass ((class ml-class) (superclass standard-class))
+  t)
+
 #+sbcl
 (defmethod sb-pcl:validate-superclass ((class ml-class) (superclass sb-pcl::standard-class))
   t)

diff --git a/web-utils-aserve.lisp b/web-utils-aserve.lisp
index 654866254e07c06fe39b0638a7918b294a166477..6ace751136a96a65b4b326ce73d4f08272bde574 100644 (file)
--- a/web-utils-aserve.lisp
+++ b/web-utils-aserve.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: web-utils-aserve.lisp,v 1.9 2002/10/18 05:14:49 kevin Exp $
+;;;; $Id: web-utils-aserve.lisp,v 1.10 2002/10/18 07:28:57 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -65,11 +65,11 @@
 ;   (format *html-stream* "Return to <go xml:link=\"simple\" show=\"replace\" href=\"qstr/\">Home</go>")
   `(case ,format
      (:xml
-      (princ-http "<elem xlink:type=\"simple\" xlink:href=\"")
+      (princ-http "<xmllink xlink:type=\"simple\" xlink:href=\"")
       (princ-http ,href)
       (princ-http "\">")
       ,@body
-      (princ-http "</elem>"))
+      (princ-http "</xmllink>"))
      (:ie-xml
       (princ-http "<html:a href=\"")
       (princ-http ,href)