X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=views.lisp;h=b0811c44a0050f954297d7610ae674fcc40f046e;hb=57c467a7e55fee49e7c383c36dff8b339f9f0b91;hp=f6f052f9c23e2e821c3ac6ff8e0ffa892e458e3c;hpb=4e25bac9b8399979850118a2a16be0329e1226b8;p=hyperobject.git

diff --git a/views.lisp b/views.lisp
index f6f052f..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.7 2002/12/05 18:31:36 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,26 +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 ((link-start 
-	     (make-link-start x (link-ref fmt) (name ref) (lookup ref)
-			      (nth (position (name ref)
-					     (slot-value x 'print-slots))
-				   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)