From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Thu, 5 Dec 2002 19:57:12 +0000 (+0000)
Subject: r3565: *** empty log message ***
X-Git-Tag: debian-2.11.0-2~245
X-Git-Url: http://git.kpe.io/?p=hyperobject.git;a=commitdiff_plain;h=57c467a7e55fee49e7c383c36dff8b339f9f0b91

r3565: *** empty log message ***
---

diff --git a/views.lisp b/views.lisp
index d994e4d..b0811c4 100644
--- a/views.lisp
+++ b/views.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: views.lisp,v 1.8 2002/12/05 19:15:02 kevin Exp $
+;;;; $Id: views.lisp,v 1.9 2002/12/05 19:57:12 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -485,24 +485,17 @@
 
 (defgeneric fmt-obj-data-with-ref (obj fmt s label refvars))
 (defmethod fmt-obj-data-with-ref (x (fmt textformat) s label refvars)
-  (let ((refstr (make-ref-data-str x fmt label))
-	(refvalues nil)
-	(field-values 
-	 (multiple-value-list
-	  (funcall (funcall (obj-data-value-func fmt) x) x))))
-    
+  (let ((refvalues '()))
     ;; make list of hyperlink link fields for printing to refstr template
-    (dolist (ref (hyperobject-class-hyperlinks x))
-      (let ((print-pos (position (name ref) (hyperobject-class-print-slots x))))
-	(when print-pos
-	  (let ((link-start (make-link-start x (link-ref fmt) (name ref) (lookup ref)
-					     (nth print-pos field-values)
-					     (append (link-parameters ref) refvars)))
-		(link-end (make-link-end x (link-ref fmt) (name ref))))
-	    (push link-start refvalues)
-	    (push link-end refvalues)))))
+    (dolist (name (hyperobject-class-print-slots x))
+      (let-when (hyperlink (find name (hyperobject-class-hyperlinks x) :key #'name))
+	(push  (make-link-start x (link-ref fmt) name (lookup hyperlink)
+				(slot-value x name)
+				(append (link-parameters hyperlink) refvars))
+	       refvalues)
+	  (push (make-link-end x (link-ref fmt) name) refvalues)))
     (setq refvalues (nreverse refvalues))
-    (apply #'format s refstr refvalues)))
+    (apply #'format s (make-ref-data-str x fmt label) refvalues)))
 
 (defgeneric obj-data (obj))
 (defmethod obj-data (x)