X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=views.lisp;h=6c7b9faef997129baff6515a300461f4dd9601fa;hb=647d539c69157228c414905a06253e5d3b193718;hp=ee6008e818e190e8bef5821b5d9d811e66afea3a;hpb=d9d94a840a96a47da55d76b641f1140991ac410c;p=hyperobject.git
diff --git a/views.lisp b/views.lisp
index ee6008e..6c7b9fa 100644
--- 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.45 2003/05/16 07:35:09 kevin Exp $
;;;;
;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
;;;; *************************************************************************
@@ -161,9 +161,16 @@
)
(defmacro write-simple (v s)
- `(if (stringp ,v)
- (write-string ,v ,s)
- (write-string (write-to-string ,v) ,s)))
+ `(typecase ,v
+ (string
+ (write-string ,v ,s))
+ #+allegro
+ (fixnum
+ (excl::print-fixnum ,s 10 ,v))
+ (symbol
+ (write-string (symbol-name ,v) ,s))
+ (t
+ (write-string (write-to-string ,v) ,s))))
(defun write-ho-value (obj name type formatter cdata strm)
(declare (ignorable type))
@@ -272,6 +279,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 +298,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 +306,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)))
@@ -363,143 +373,6 @@
(setf (link-href-end view) "html:a")
(setf (link-ampersand view) "&"))))
-#+ignore
-(defun initialize-view-by-category (obj-cl view)
- "Initialize a view based upon a preset category"
- (let ((fmtstr nil)
- (first-field t)
- (value-func '())
- (links '())
- (category (category view)))
-
- (unless (in category :compact-text :compact-text-labels
- :html :html-labels :html-link-labels
- :xhtml :xhtml-labels :xhtml-link-labels
- :xml :xml-labels :xml-link :ie-xml-link
- :xml-link-labels :ie-xml-link-labels)
- (error "Unknown view category ~A" category))
-
- (unless (slots view)
- (setf (slots view) (default-print-slots obj-cl)))
- (dolist (slot-name (slots view))
- (let ((slot (find-slot-by-name obj-cl slot-name)))
- (unless slot
- (error "Slot ~A is not found in class ~S" slot-name obj-cl))
- (let* ((name (slot-definition-name slot))
- (namestr-lower (string-downcase (symbol-name name)))
- (xml-namestr (escape-xml-string namestr-lower))
- (xml-tag (escape-xml-string namestr-lower))
- (type (slot-value slot 'type))
- (print-formatter (esd-print-formatter slot)))
-
- (cond
- (first-field
- (setq fmtstr "")
- (setq first-field nil))
- (t
- (string-append fmtstr " ")))
-
- (let ((value-fmt
- (case type
- ((or :integer :fixnum)
- "~d")
- (:boolean
- "~a")
- (otherwise
- "~a"))))
- (case category
- (:compact-text
- (string-append fmtstr value-fmt))
- (:compact-text-labels
- (string-append fmtstr namestr-lower " " value-fmt))
- ((or :html :xhtml)
- (string-append fmtstr (concatenate 'string "" value-fmt "")))
- (:xml
- (string-append fmtstr (concatenate 'string "<" namestr-lower ">" value-fmt "")))
- (:html-labels
- (string-append fmtstr (concatenate 'string "" namestr-lower " " value-fmt "")))
- (:xhtml-labels
- (string-append fmtstr (concatenate 'string "" xml-namestr " " value-fmt "")))
- (:xml-labels
- (string-append fmtstr (concatenate 'string " <" xml-tag ">" value-fmt "")))
- ((or :html-link :xhtml-link)
- (push name links)
- (if (esd-hyperlink slot)
- (string-append fmtstr "<~~a>" value-fmt "")
- (string-append fmtstr (concatenate 'string "" value-fmt ""))))
- ((or :xml-link :ie-xml-link)
- (push name links)
- (if (esd-hyperlink slot)
- (string-append fmtstr "<~~a>" value-fmt "")
- (string-append fmtstr (concatenate 'string "<" xml-tag ">" value-fmt ""))))
- (:html-link-labels
- (push name links)
- (if (esd-hyperlink slot)
- (string-append fmtstr "" namestr-lower " <~~a>" value-fmt "")
- (string-append fmtstr (concatenate 'string "" namestr-lower " " value-fmt ""))))
- (:xhtml-link-labels
- (push name links)
- (if (esd-hyperlink slot)
- (string-append fmtstr "" xml-namestr " <~~a>" value-fmt "")
- (string-append fmtstr (concatenate 'string "" xml-namestr " " value-fmt ""))))
- ((or :xml-link-labels :ie-xml-link-labels)
- (push name links)
- (if (esd-hyperlink slot)
- (string-append fmtstr " <~~a>" value-fmt "")
- (string-append fmtstr (concatenate 'string " <" xml-tag ">" value-fmt "")))))
- ) ;; let value-fmt
-
- (let ((func (if print-formatter
- `(,print-formatter (slot-value x (quote ,name)))
- `(slot-value x (quote ,name)))))
- (when (and (in category :xml :xhtml :xml-link :xhtml-link
- :xml-labels :ie-xml-labels
- :xhtml-link-labels :xml-link-labels :ie-xml-link
- :ie-xml-link-labels)
- (or print-formatter
- (lisp-type-is-a-string type)))
- (setq func `(kmrcl:xml-cdata ,func)))
- (push func value-func))
- )))
-
- (when value-func
- (setq value-func
- (compile nil (eval `(lambda (x) (values ,@(nreverse value-func)))))))
-
- (setf (obj-data-fmtstr view) fmtstr)
- (setf (obj-data-value-func view) value-func)
- (setf (link-slots view) (nreverse links))
-
- (case category
- ((or :compact-text :compact-text-labels)
- (initialize-text-view view))
- ((or :html :xhtml :html-labels :xhtml-labels)
- (initialize-html-view view))
- ((or :xml :xml-labels)
- (initialize-xml-view view))
- ((or :html-link :html-link-labels)
- (initialize-html-view view)
- (setf (link-href-start view) "a href=")
- (setf (link-href-end view) "a")
- (setf (link-ampersand view) "&"))
- ((or :xhtml-link :xhtml-link-labels)
- (initialize-html-view view)
- (setf (link-href-start view) "a href=")
- (setf (link-href-end view) "a")
- (setf (link-ampersand view) "&"))
- ((or :xml-link :xml-link-labels)
- (initialize-xml-view view)
- (setf (link-href-start view)
- "xmllink xlink:type=\"simple\" xlink:href=")
- (setf (link-href-end view) "xmllink")
- (setf (link-ampersand view) "&"))
- ((or :ie-xml-link :ie-xml-link-labels)
- (initialize-xml-view view)
- (setf (link-href-start view) "html:a href=")
- (setf (link-href-end view) "html:a")
- (setf (link-ampersand view) "&"))))
- view)
-
;;;; *************************************************************************
;;;; View Data Format Section
@@ -548,7 +421,7 @@
(setf (obj-start-str-or-func view) "")
(setf (obj-end-indent view) t)
(setf (obj-end-str-or-func view) (format nil "~%"))
- (setf (obj-data-indent view) t))
+ (setf (obj-data-indent view) nil))
(defun initialize-xhtml-view (view)
(initialize-text-view view)
@@ -562,7 +435,7 @@
(setf (obj-start-str-or-func view) "")
(setf (obj-end-indent view) t)
(setf (obj-end-str-or-func view) (format nil "~%"))
- (setf (obj-data-indent view) t))
+ (setf (obj-data-indent view) nil))
(defun xmlformat-list-end-func (x strm)
(write-string "