r4933: *** empty log message ***

diff --git a/base-class.lisp b/base-class.lisp
index 4251cf1e88bdc2f087da3601b357d304ad196307..93eed698c6befd4686fd2591f98f4be37db44be8 100644 (file)
--- a/base-class.lisp
+++ b/base-class.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: base-class.lisp,v 1.7 2003/05/14 05:29:48 kevin Exp $
+;;;; $Id: base-class.lisp,v 1.8 2003/05/14 08:30:38 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -23,6 +23,6 @@
   (:description "Basic hyperobject class"))
 
 (defmethod print-object ((obj hyperobject) (s stream))
-  (print-unreadable-object (obj s :type t :identity t)
+  (print-unreadable-object (obj s :type t :identity nil)
     (funcall (obj-data-func (get-category-view obj :compact-text)) obj s nil)))
 

diff --git a/tests.lisp b/tests.lisp
index dd8035a6f8f5d456df37bf7998ea96eb4debe311..31bd7fafeb8bf239182e9e736c8de67ca238d285 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.6 2003/05/14 05:38:09 kevin Exp $
+;;;; $Id: tests.lisp,v 1.7 2003/05/14 08:30:38 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -25,6 +25,7 @@
              :value-type (varchar 30)
              :value-constraint stringp
              :hyperlink find-person-by-last-name
+             :hyperlink-parameters (("narrow" . "yes"))
              :null-allowed nil)
    (full-name :value-type string :stored nil)
    (dob :initarg :dob :accessor dob
@@ -68,7 +69,8 @@
          :value-constraint stringp)
    (phone-number :initarg :phone-number :accessor phone-number
                 :value-type (varchar 16)
-                :value-constraint stringp))
+                :value-constraint stringp
+                :hyperlink search-phone-number))
   (:metaclass hyperobject-class)
   (:user-name "Phone Number")
   (:default-initargs :title nil :phone-number nil)
@@ -127,23 +129,23 @@
 
 (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>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\">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>Addresses:</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>
     <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>
@@ -152,12 +154,95 @@
 </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><![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> 
+
+
+(deftest p5 (view-to-string mary :subobjects t :category :html)
+  "<p><b>Person:</b></p><div class=\"person\"><ul>
+<li><span class=\"first-name\">Mary</span> <span class=\"last-name\">Jackson</span> <span class=\"dob\">Thu, 4 May 2000 03:02:01</span> <span class=\"resume\">Style & Grace</span>
+  <p><b>Addresses:</b></p><div class=\"address\"><ul>
+  <li><span class=\"title\">Home</span> <span class=\"street\">321 Shady Lane</span>
+    <p><b>Phone Numbers:</b></p><div class=\"phone\"><ul>
+    <li><span class=\"title\">Voice</span> <span class=\"phone-number\">367-9812</span>
+    </li>
+    <li><span class=\"title\">Fax</span> <span class=\"phone-number\">367-9813</span>
+    </li>
+    </ul></div>
+  </li>
+  <li><span class=\"title\">Office</span> <span class=\"street\">113 Main St.</span>
+    <p><b>Phone Numbers:</b></p><div class=\"phone\"><ul>
+    <li><span class=\"title\">Main line</span> <span class=\"phone-number\">123-0001</span>
+    </li>
+    <li><span class=\"title\">Staff line</span> <span class=\"phone-number\">123-0002</span>
+    </li>
+    <li><span class=\"title\">Fax</span> <span class=\"phone-number\">123-0005</span>
+    </li>
+    </ul></div>
+  </li>
+  </ul></div>
+</li>
+</ul></div>
+")
+
+(deftest p6 (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>Addresses:</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>
+    <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>
+    <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>
+    <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>
+    <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>
+    </ul></div>
+  </li>
+  </ul></div>
+</li>
+</ul></div>
+")
+
+(deftest p7 (view-to-string mary :subobjects t :category :xml)
+  "<personlist><title>Person:</title>
+<person><first-name><![CDATA[Mary]]></first-name> <last-name><![CDATA[Jackson]]></last-name> <dob><![CDATA[Thu, 4 May 2000 03:02:01]]></dob> <resume><![CDATA[Style & Grace]]></resume>
+  <addresslist><title>Addresses:</title>
+  <address><title><![CDATA[Home]]></title> <street><![CDATA[321 Shady Lane]]></street>
+    <phonelist><title>Phone Numbers:</title>
+    <phone><title><![CDATA[Voice]]></title> <phone-number><![CDATA[367-9812]]></phone-number>
+</phone>
+    <phone><title><![CDATA[Fax]]></title> <phone-number><![CDATA[367-9813]]></phone-number>
+</phone>
+    </phonelist>
+</address>
+  <address><title><![CDATA[Office]]></title> <street><![CDATA[113 Main St.]]></street>
+    <phonelist><title>Phone Numbers:</title>
+    <phone><title><![CDATA[Main line]]></title> <phone-number><![CDATA[123-0001]]></phone-number>
+</phone>
+    <phone><title><![CDATA[Staff line]]></title> <phone-number><![CDATA[123-0002]]></phone-number>
+</phone>
+    <phone><title><![CDATA[Fax]]></title> <phone-number><![CDATA[123-0005]]></phone-number>
+</phone>
+    </phonelist>
+</address>
+  </addresslist>
+</person>
+</personlist>
+")
+
+(deftest p8 (view-to-string mary :subobjects t  :category :xml-labels)
+  "<personlist><title>Person:</title>
+<person><label>first-name</label> <first-name><![CDATA[Mary]]></first-name> <label>last-name</label> <last-name><![CDATA[Jackson]]></last-name> <label>dob</label> <dob><![CDATA[Thu, 4 May 2000 03:02:01]]></dob> <label>resume</label> <resume><![CDATA[Style & Grace]]></resume>
+  <addresslist><title>Addresses:</title>
   <address><label>title</label> <title><![CDATA[Home]]></title> <label>street</label> <street><![CDATA[321 Shady Lane]]></street>
-    <phonelist><title>Phone Numbers:</title> 
+    <phonelist><title>Phone Numbers:</title>
     <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><![CDATA[Fax]]></title> <label>phone-number</label> <phone-number><![CDATA[367-9813]]></phone-number>
@@ -165,7 +250,7 @@
     </phonelist>
 </address>
   <address><label>title</label> <title><![CDATA[Office]]></title> <label>street</label> <street><![CDATA[113 Main St.]]></street>
-    <phonelist><title>Phone Numbers:</title> 
+    <phonelist><title>Phone Numbers:</title>
     <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><![CDATA[Staff line]]></title> <label>phone-number</label> <phone-number><![CDATA[123-0002]]></phone-number>
@@ -178,3 +263,139 @@
 </person>
 </personlist>
 ")
+
+(deftest p9 (view-to-string mary :subobjects t  :category :ie-xml-link-labels)
+  "<personlist><title>Person:</title>
+<person><label>first-name</label> <first-name><![CDATA[Mary]]></first-name> <label>last-name</label> <html:a href=\"disp-func1?func=FIND-PERSON-BY-LAST-NAME&amp;key=Jackson&amp;narrow=yes\"><![CDATA[Jackson]]></html:a> <label>dob</label> <dob><![CDATA[Thu, 4 May 2000 03:02:01]]></dob> <label>resume</label> <resume><![CDATA[Style & Grace]]></resume>
+  <addresslist><title>Addresses:</title>
+  <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><![CDATA[Voice]]></title> <label>phone-number</label> <html:a href=\"disp-func1?func=SEARCH-PHONE-NUMBER&amp;key=367-9812\"><![CDATA[367-9812]]></html:a>
+</phone>
+    <phone><label>title</label> <title><![CDATA[Fax]]></title> <label>phone-number</label> <html:a href=\"disp-func1?func=SEARCH-PHONE-NUMBER&amp;key=367-9813\"><![CDATA[367-9813]]></html:a>
+</phone>
+    </phonelist>
+</address>
+  <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><![CDATA[Main line]]></title> <label>phone-number</label> <html:a href=\"disp-func1?func=SEARCH-PHONE-NUMBER&amp;key=123-0001\"><![CDATA[123-0001]]></html:a>
+</phone>
+    <phone><label>title</label> <title><![CDATA[Staff line]]></title> <label>phone-number</label> <html:a href=\"disp-func1?func=SEARCH-PHONE-NUMBER&amp;key=123-0002\"><![CDATA[123-0002]]></html:a>
+</phone>
+    <phone><label>title</label> <title><![CDATA[Fax]]></title> <label>phone-number</label> <html:a href=\"disp-func1?func=SEARCH-PHONE-NUMBER&amp;key=123-0005\"><![CDATA[123-0005]]></html:a>
+</phone>
+    </phonelist>
+</address>
+  </addresslist>
+</person>
+</personlist>
+")
+
+(deftest p10 (view-to-string mary :subobjects t  :category :xml-link-labels)
+  "<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&amp;narrow=yes\"><![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>Addresses:</title>
+  <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><![CDATA[Voice]]></title> <label>phone-number</label> <xmllink xlink:type=\"simple\" xlink:href=\"disp-func1?func=SEARCH-PHONE-NUMBER&amp;key=367-9812\"><![CDATA[367-9812]]></xmllink>
+</phone>
+    <phone><label>title</label> <title><![CDATA[Fax]]></title> <label>phone-number</label> <xmllink xlink:type=\"simple\" xlink:href=\"disp-func1?func=SEARCH-PHONE-NUMBER&amp;key=367-9813\"><![CDATA[367-9813]]></xmllink>
+</phone>
+    </phonelist>
+</address>
+  <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><![CDATA[Main line]]></title> <label>phone-number</label> <xmllink xlink:type=\"simple\" xlink:href=\"disp-func1?func=SEARCH-PHONE-NUMBER&amp;key=123-0001\"><![CDATA[123-0001]]></xmllink>
+</phone>
+    <phone><label>title</label> <title><![CDATA[Staff line]]></title> <label>phone-number</label> <xmllink xlink:type=\"simple\" xlink:href=\"disp-func1?func=SEARCH-PHONE-NUMBER&amp;key=123-0002\"><![CDATA[123-0002]]></xmllink>
+</phone>
+    <phone><label>title</label> <title><![CDATA[Fax]]></title> <label>phone-number</label> <xmllink xlink:type=\"simple\" xlink:href=\"disp-func1?func=SEARCH-PHONE-NUMBER&amp;key=123-0005\"><![CDATA[123-0005]]></xmllink>
+</phone>
+    </phonelist>
+</address>
+  </addresslist>
+</person>
+</personlist>
+")
+
+(deftest p11 (view-to-string mary :subobjects t :category :xhtml)
+  "<p><b>Person:</b></p><div class=\"person\"><ul>
+<li><span class=\"first-name\"><![CDATA[Mary]]></span> <span class=\"last-name\"><![CDATA[Jackson]]></span> <span class=\"dob\"><![CDATA[Thu, 4 May 2000 03:02:01]]></span> <span class=\"resume\"><![CDATA[Style & Grace]]></span>
+  <p><b>Addresses:</b></p><div class=\"address\"><ul>
+  <li><span class=\"title\"><![CDATA[Home]]></span> <span class=\"street\"><![CDATA[321 Shady Lane]]></span>
+    <p><b>Phone Numbers:</b></p><div class=\"phone\"><ul>
+    <li><span class=\"title\"><![CDATA[Voice]]></span> <span class=\"phone-number\"><![CDATA[367-9812]]></span>
+    </li>
+    <li><span class=\"title\"><![CDATA[Fax]]></span> <span class=\"phone-number\"><![CDATA[367-9813]]></span>
+    </li>
+    </ul></div>
+  </li>
+  <li><span class=\"title\"><![CDATA[Office]]></span> <span class=\"street\"><![CDATA[113 Main St.]]></span>
+    <p><b>Phone Numbers:</b></p><div class=\"phone\"><ul>
+    <li><span class=\"title\"><![CDATA[Main line]]></span> <span class=\"phone-number\"><![CDATA[123-0001]]></span>
+    </li>
+    <li><span class=\"title\"><![CDATA[Staff line]]></span> <span class=\"phone-number\"><![CDATA[123-0002]]></span>
+    </li>
+    <li><span class=\"title\"><![CDATA[Fax]]></span> <span class=\"phone-number\"><![CDATA[123-0005]]></span>
+    </li>
+    </ul></div>
+  </li>
+  </ul></div>
+</li>
+</ul></div>
+")
+
+(deftest p12 (view-to-string mary :subobjects t :category :xhtml-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>Addresses:</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>
+    <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>
+    <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>
+    <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>
+    <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>
+    </ul></div>
+  </li>
+  </ul></div>
+</li>
+</ul></div>
+")
+
+(deftest p13 (view-to-string mary :subobjects t :category :xhtml-link-labels)
+  "<p><b>Person:</b></p><div class=\"person\"><ul>
+<li><span class=\"label\">first-name</span> <span class=\"first-name\"><![CDATA[Mary]]></span> <label>last-name</label> <a href=\"disp-func1?func=FIND-PERSON-BY-LAST-NAME&amp;key=Jackson&amp;narrow=yes\"><![CDATA[Jackson]]></a> <span class=\"label\">dob</span> <span class=\"dob\"><![CDATA[Thu, 4 May 2000 03:02:01]]></span> <span class=\"label\">resume</span> <span class=\"resume\"><![CDATA[Style & Grace]]></span>
+  <p><b>Addresses:</b></p><div class=\"address\"><ul>
+  <li><span class=\"label\">title</span> <span class=\"title\"><![CDATA[Home]]></span> <span class=\"label\">street</span> <span class=\"street\"><![CDATA[321 Shady Lane]]></span>
+    <p><b>Phone Numbers:</b></p><div class=\"phone\"><ul>
+    <li><span class=\"label\">title</span> <span class=\"title\"><![CDATA[Voice]]></span> <label>phone-number</label> <a href=\"disp-func1?func=SEARCH-PHONE-NUMBER&amp;key=367-9812\"><![CDATA[367-9812]]></a>
+    </li>
+    <li><span class=\"label\">title</span> <span class=\"title\"><![CDATA[Fax]]></span> <label>phone-number</label> <a href=\"disp-func1?func=SEARCH-PHONE-NUMBER&amp;key=367-9813\"><![CDATA[367-9813]]></a>
+    </li>
+    </ul></div>
+  </li>
+  <li><span class=\"label\">title</span> <span class=\"title\"><![CDATA[Office]]></span> <span class=\"label\">street</span> <span class=\"street\"><![CDATA[113 Main St.]]></span>
+    <p><b>Phone Numbers:</b></p><div class=\"phone\"><ul>
+    <li><span class=\"label\">title</span> <span class=\"title\"><![CDATA[Main line]]></span> <label>phone-number</label> <a href=\"disp-func1?func=SEARCH-PHONE-NUMBER&amp;key=123-0001\"><![CDATA[123-0001]]></a>
+    </li>
+    <li><span class=\"label\">title</span> <span class=\"title\"><![CDATA[Staff line]]></span> <label>phone-number</label> <a href=\"disp-func1?func=SEARCH-PHONE-NUMBER&amp;key=123-0002\"><![CDATA[123-0002]]></a>
+    </li>
+    <li><span class=\"label\">title</span> <span class=\"title\"><![CDATA[Fax]]></span> <label>phone-number</label> <a href=\"disp-func1?func=SEARCH-PHONE-NUMBER&amp;key=123-0005\"><![CDATA[123-0005]]></a>
+    </li>
+    </ul></div>
+  </li>
+  </ul></div>
+</li>
+</ul></div>
+")
+

diff --git a/views.lisp b/views.lisp
index ee6008e818e190e8bef5821b5d9d811e66afea3a..293e07ef5aa989afe597194308665cf470c9e480 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.41 2003/05/14 07:05:24 kevin Exp $
+;;;; $Id: views.lisp,v 1.42 2003/05/14 08:30:38 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -272,6 +272,8 @@
           (ppfc-xml xml-tag name type formatter cdata print-func)))
       (:html-link-labels
        (if hyperlink
+          (ppfc-html-link-labels namestr-lower name type formatter cdata nlink
+                                 print-func)
           (ppfc-html-labels namestr-lower name type formatter cdata print-func)))
       (:xhtml-link-labels
        (if hyperlink
@@ -289,7 +291,7 @@
 
 (defun view-has-links-p (view)
   (in (category view) :html-link :xhtml-link :xml-link :ie-xml-link
-      :html-link-labels :xhtml-links-labels :xml-link-labels
+      :html-link-labels :xhtml-link-labels :xml-link-labels
       :ie-xml-link-labels))
 
 (defun initialize-view-by-category (obj-cl view)
@@ -297,6 +299,7 @@
   (unless (in (category view) :compact-text :compact-text-labels
              :html :html-labels :html-link-labels
              :xhtml :xhtml-labels :xhtml-link-labels
+             :xhtml-link :html-link
              :xml :xml-labels :xml-link :ie-xml-link
              :xml-link-labels :ie-xml-link-labels)
     (error "Unknown view category ~A" (category view)))
@@ -548,7 +551,7 @@
   (setf (obj-start-str-or-func view) "<li>")
   (setf (obj-end-indent view)  t)
   (setf (obj-end-str-or-func view)  (format nil "</li>~%"))
-  (setf (obj-data-indent view) t))
+  (setf (obj-data-indent view) nil))
 
 (defun initialize-xhtml-view (view)
   (initialize-text-view view)
@@ -562,7 +565,7 @@
   (setf (obj-start-str-or-func view) "<li>")
   (setf (obj-end-indent view)  t)
   (setf (obj-end-str-or-func view) (format nil "</li>~%"))
-  (setf (obj-data-indent view) t))
+  (setf (obj-data-indent view) nil))
 
 (defun xmlformat-list-end-func (x strm)
   (write-string "</" strm)