r4924: *** empty log message ***

diff --git a/examples/person.lisp b/examples/person.lisp
index 72167072cee6e117a82f335bbbe6dcfb915c3f45..646a02f07a975c46a4d5c766f1b36b2cb9058c35 100644 (file)
--- a/examples/person.lisp
+++ b/examples/person.lisp
@@ -9,7 +9,7 @@
 ;;;;
 ;;;; A simple example file for hyperobjects
 ;;;;
-;;;; $Id: person.lisp,v 1.7 2003/05/14 05:29:48 kevin Exp $
+;;;; $Id: person.lisp,v 1.8 2003/05/14 05:36:22 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -60,8 +60,7 @@
    (phones :subobject t :initarg :phones :accessor phones))
   (:metaclass hyperobject-class)
   (:default-initargs :title nil :street nil) 
-  (:user-name "Address")
-  (:user-name-plural "Addresses")
+  (:user-name "Address" "Addresses")
   (:default-print-slots title street)
   (:description "An address"))
 

diff --git a/mop.lisp b/mop.lisp
index 204412dc39d25f59a844b936b6618320947529c3..b24c4b477dac3b1852e894fc3f11c10ffd9d2962 100644 (file)
--- a/mop.lisp
+++ b/mop.lisp
@@ -11,7 +11,7 @@
 ;;;; in Text, HTML, and XML formats. This includes hyperlinking
 ;;;; capability and sub-objects.
 ;;;;
-;;;; $Id: mop.lisp,v 1.70 2003/05/14 05:29:48 kevin Exp $
+;;;; $Id: mop.lisp,v 1.71 2003/05/14 05:36:22 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -419,7 +419,7 @@
                                   (user-name cl))
                    2)))
 
-  (dolist (name '(description))
+  (dolist (name '(user-name description))
     (awhen (slot-value cl name)
           (setf (slot-value cl name)
                 (etypecase (slot-value cl name)

diff --git a/tests.lisp b/tests.lisp
index d31ac172f9582751ef36aa489cefaa3c52076335..dd8035a6f8f5d456df37bf7998ea96eb4debe311 100644 (file)
--- a/tests.lisp
+++ b/tests.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2003
 ;;;;
-;;;; $Id: tests.lisp,v 1.5 2003/05/14 05:29:48 kevin Exp $
+;;;; $Id: tests.lisp,v 1.6 2003/05/14 05:38:09 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -102,11 +102,11 @@
 
 (rem-all-tests)
 
-(deftest p1 (view-to-string mary) " Person:
+(deftest p1 (view-to-string mary) "Person:
   Mary Jackson Thu, 4 May 2000 03:02:01 Style & Grace
 ")
 
-(deftest p2 (view-to-string mary :subobjects t) " Person:
+(deftest p2 (view-to-string mary :subobjects t) "Person:
   Mary Jackson Thu, 4 May 2000 03:02:01 Style & Grace
   Addresses:
     Home 321 Shady Lane
@@ -121,60 +121,60 @@
 ")
 
 (deftest p3 (view-to-string mary :category :compact-text-labels)
-  " Person:
+  "Person:
   first-name Mary last-name Jackson dob Thu, 4 May 2000 03:02:01 resume Style & Grace
 ")
 
 (deftest p4 (view-to-string mary :subobjects t :category :html-labels)
-  " <p><b>Person:</b></p><div class=\"person\"><ul>
- <li> <span class=\"label\">first-name</span> <span class=\"first-name\">Mary</span> <span class=\"label\">last-name</span> <span class=\"last-name\">Jackson</span> <span class=\"label\">dob</span> <span class=\"dob\">Thu, 4 May 2000 03:02:01</span> <span class=\"label\">resume</span> <span class=\"resume\">Style & Grace</span>
+  "<p><b>Person:</b></p><div class=\"person\"><ul>
+<li>  <span class=\"label\">first-name</span> <span class=\"first-name\">Mary</span> <span class=\"label\">last-name</span> <span class=\"last-name\">Jackson</span> <span class=\"label\">dob</span> <span class=\"dob\">Thu, 4 May 2000 03:02:01</span> <span class=\"label\">resume</span> <span class=\"resume\">Style & Grace</span>
   <p><b>Addresss:</b></p><div class=\"address\"><ul>
-  <li> <span class=\"label\">title</span> <span class=\"title\">Home</span> <span class=\"label\">street</span> <span class=\"street\">321 Shady Lane</span>
+  <li>    <span class=\"label\">title</span> <span class=\"title\">Home</span> <span class=\"label\">street</span> <span class=\"street\">321 Shady Lane</span>
     <p><b>Phone Numbers:</b></p><div class=\"phone\"><ul>
-    <li> <span class=\"label\">title</span> <span class=\"title\">Voice</span> <span class=\"label\">phone-number</span> <span class=\"phone-number\">367-9812</span>
+    <li>      <span class=\"label\">title</span> <span class=\"title\">Voice</span> <span class=\"label\">phone-number</span> <span class=\"phone-number\">367-9812</span>
     </li>
-    <li> <span class=\"label\">title</span> <span class=\"title\">Fax</span> <span class=\"label\">phone-number</span> <span class=\"phone-number\">367-9813</span>
+    <li>      <span class=\"label\">title</span> <span class=\"title\">Fax</span> <span class=\"label\">phone-number</span> <span class=\"phone-number\">367-9813</span>
     </li>
     </ul></div>
   </li>
-  <li> <span class=\"label\">title</span> <span class=\"title\">Office</span> <span class=\"label\">street</span> <span class=\"street\">113 Main St.</span>
+  <li>    <span class=\"label\">title</span> <span class=\"title\">Office</span> <span class=\"label\">street</span> <span class=\"street\">113 Main St.</span>
     <p><b>Phone Numbers:</b></p><div class=\"phone\"><ul>
-    <li> <span class=\"label\">title</span> <span class=\"title\">Main line</span> <span class=\"label\">phone-number</span> <span class=\"phone-number\">123-0001</span>
+    <li>      <span class=\"label\">title</span> <span class=\"title\">Main line</span> <span class=\"label\">phone-number</span> <span class=\"phone-number\">123-0001</span>
     </li>
-    <li> <span class=\"label\">title</span> <span class=\"title\">Staff line</span> <span class=\"label\">phone-number</span> <span class=\"phone-number\">123-0002</span>
+    <li>      <span class=\"label\">title</span> <span class=\"title\">Staff line</span> <span class=\"label\">phone-number</span> <span class=\"phone-number\">123-0002</span>
     </li>
-    <li> <span class=\"label\">title</span> <span class=\"title\">Fax</span> <span class=\"label\">phone-number</span> <span class=\"phone-number\">123-0005</span>
+    <li>      <span class=\"label\">title</span> <span class=\"title\">Fax</span> <span class=\"label\">phone-number</span> <span class=\"phone-number\">123-0005</span>
     </li>
     </ul></div>
   </li>
   </ul></div>
- </li>
- </ul></div>
+</li>
+</ul></div>
 ")
 
 (deftest p5 (view-to-string mary :subobjects t  :category :xml-link-labels)
-  " <personlist><title>Person:</title> 
- <person><label>first-name</label> <first-name>Mary</first-name> <label>last-name</label> <xmllink xlink:type=\"simple\" xlink:href=\"disp-func1?func=FIND-PERSON-BY-LAST-NAME&amp;key=Jackson\">Jackson</xmllink> <label>dob</label> <dob><![CDATA[Thu, 4 May 2000 03:02:01]]></dob> <label>resume</label> <resume>Style & Grace</resume>
+  "<personlist><title>Person:</title> 
+<person><label>first-name</label> <first-name><![CDATA[Mary]]></first-name> <label>last-name</label> <xmllink xlink:type=\"simple\" xlink:href=\"disp-func1?func=FIND-PERSON-BY-LAST-NAME&amp;key=Jackson\"><![CDATA[Jackson]]></xmllink> <label>dob</label> <dob><![CDATA[Thu, 4 May 2000 03:02:01]]></dob> <label>resume</label> <resume><![CDATA[Style & Grace]]></resume>
   <addresslist><title>Addresss:</title> 
-  <address><label>title</label> <title>Home</title> <label>street</label> <street>321 Shady Lane</street>
+  <address><label>title</label> <title><![CDATA[Home]]></title> <label>street</label> <street><![CDATA[321 Shady Lane]]></street>
     <phonelist><title>Phone Numbers:</title> 
-    <phone><label>title</label> <title>Voice</title> <label>phone-number</label> <phone-number>367-9812</phone-number>
+    <phone><label>title</label> <title><![CDATA[Voice]]></title> <label>phone-number</label> <phone-number><![CDATA[367-9812]]></phone-number>
 </phone>
-    <phone><label>title</label> <title>Fax</title> <label>phone-number</label> <phone-number>367-9813</phone-number>
+    <phone><label>title</label> <title><![CDATA[Fax]]></title> <label>phone-number</label> <phone-number><![CDATA[367-9813]]></phone-number>
 </phone>
     </phonelist>
 </address>
-  <address><label>title</label> <title>Office</title> <label>street</label> <street>113 Main St.</street>
+  <address><label>title</label> <title><![CDATA[Office]]></title> <label>street</label> <street><![CDATA[113 Main St.]]></street>
     <phonelist><title>Phone Numbers:</title> 
-    <phone><label>title</label> <title>Main line</title> <label>phone-number</label> <phone-number>123-0001</phone-number>
+    <phone><label>title</label> <title><![CDATA[Main line]]></title> <label>phone-number</label> <phone-number><![CDATA[123-0001]]></phone-number>
 </phone>
-    <phone><label>title</label> <title>Staff line</title> <label>phone-number</label> <phone-number>123-0002</phone-number>
+    <phone><label>title</label> <title><![CDATA[Staff line]]></title> <label>phone-number</label> <phone-number><![CDATA[123-0002]]></phone-number>
 </phone>
-    <phone><label>title</label> <title>Fax</title> <label>phone-number</label> <phone-number>123-0005</phone-number>
+    <phone><label>title</label> <title><![CDATA[Fax]]></title> <label>phone-number</label> <phone-number><![CDATA[123-0005]]></phone-number>
 </phone>
     </phonelist>
 </address>
   </addresslist>
 </person>
- </personlist>
+</personlist>
 ")

diff --git a/views.lisp b/views.lisp
index b5594a7a8cf71e8e004913f3b6509c7290f66c52..f6e38f2bea790356573bd228eb284e7f8d7f2ec1 100644 (file)
--- a/views.lisp
+++ b/views.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: views.lisp,v 1.36 2003/05/14 05:29:48 kevin Exp $
+;;;; $Id: views.lisp,v 1.37 2003/05/14 05:36:22 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -576,7 +576,7 @@
   (write-char #\< strm)
   (write-string (class-name-of x) strm)
   (write-string "list><title>" strm)
-  (write-user-name-maybe-plural obj nitems strm)
+  (write-user-name-maybe-plural x nitems strm)
   (write-string ":</title>" strm)
   (write-char #\newline strm))