From: Kevin M. Rosenberg Date: Wed, 14 May 2003 05:38:09 +0000 (+0000) Subject: r4924: *** empty log message *** X-Git-Tag: debian-2.11.0-2~82 X-Git-Url: http://git.kpe.io/?p=hyperobject.git;a=commitdiff_plain;h=c03522d6e56c265fc5b7d859d0a8b324805ddf73 r4924: *** empty log message *** --- diff --git a/examples/person.lisp b/examples/person.lisp index 7216707..646a02f 100644 --- 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 204412d..b24c4b4 100644 --- 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 d31ac17..dd8035a 100644 --- 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) - "

Person:

") (deftest p5 (view-to-string mary :subobjects t :category :xml-link-labels) - " Person: - Mary Jackson Style & Grace + "Person: + Addresss: -
Home 321 Shady Lane +
<![CDATA[Home]]> Phone Numbers: - Voice 367-9812 + <![CDATA[Voice]]> - Fax 367-9813 + <![CDATA[Fax]]>
-
Office 113 Main St. +
<![CDATA[Office]]> Phone Numbers: - Main line 123-0001 + <![CDATA[Main line]]> - Staff line 123-0002 + <![CDATA[Staff line]]> - Fax 123-0005 + <![CDATA[Fax]]>
- + ") diff --git a/views.lisp b/views.lisp index b5594a7..f6e38f2 100644 --- 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>" strm) - (write-user-name-maybe-plural obj nitems strm) + (write-user-name-maybe-plural x nitems strm) (write-string ":" strm) (write-char #\newline strm))