projects
/
hyperobject.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r4965: Automatic commit for debian_version_2_8_4-1
[hyperobject.git]
/
views.lisp
diff --git
a/views.lisp
b/views.lisp
index 3d87a7c7d1c3272b47c724d38dc75beb9cbfa90b..d5536ce698344e96f249bdcc8f05eaa58319e35e 100644
(file)
--- a/
views.lisp
+++ b/
views.lisp
@@
-7,7
+7,7
@@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: views.lisp,v 1.
39 2003/05/14 06:54:04
kevin Exp $
+;;;; $Id: views.lisp,v 1.
44 2003/05/14 21:18:12
kevin Exp $
;;;;
;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
;;;; *************************************************************************
;;;;
;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
;;;; *************************************************************************
@@
-160,6
+160,17
@@
)
)
)
)
+(defmacro write-simple (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))
(defun write-ho-value (obj name type formatter cdata strm)
(declare (ignorable type))
@@
-170,13
+181,8
@@
(data (if cdata
(kmrcl:xml-cdata fmt-data)
fmt-data)))
(data (if cdata
(kmrcl:xml-cdata fmt-data)
fmt-data)))
- (typecase data
- (string
- (write-string data strm))
- (number
- (write-string (write-to-string data) strm))
- (t
- (format strm "~A" data)))))
+ (write-simple data strm)))
+
(defun ppfc-html (title name type formatter cdata print-func)
(vector-push-extend '(write-string "<span class=\"" s) print-func)
(defun ppfc-html (title name type formatter cdata print-func)
(vector-push-extend '(write-string "<span class=\"" s) print-func)
@@
-273,6
+279,8
@@
(ppfc-xml xml-tag name type formatter cdata print-func)))
(:html-link-labels
(if hyperlink
(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
(ppfc-html-labels namestr-lower name type formatter cdata print-func)))
(:xhtml-link-labels
(if hyperlink
@@
-290,7
+298,7
@@
(defun view-has-links-p (view)
(in (category view) :html-link :xhtml-link :xml-link :ie-xml-link
(defun view-has-links-p (view)
(in (category view) :html-link :xhtml-link :xml-link :ie-xml-link
- :html-link-labels :xhtml-link
s
-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)
:ie-xml-link-labels))
(defun initialize-view-by-category (obj-cl view)
@@
-298,6
+306,7
@@
(unless (in (category view) :compact-text :compact-text-labels
:html :html-labels :html-link-labels
:xhtml :xhtml-labels :xhtml-link-labels
(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)))
:xml :xml-labels :xml-link :ie-xml-link
:xml-link-labels :ie-xml-link-labels)
(error "Unknown view category ~A" (category view)))
@@
-549,7
+558,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-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)
(defun initialize-xhtml-view (view)
(initialize-text-view view)
@@
-563,7
+572,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-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)
(defun xmlformat-list-end-func (x strm)
(write-string "</" strm)
@@
-643,39
+652,24
@@
;;; Object Data
;;; Object Data
+
(defun make-link-start (view fieldfunc fieldvalue refvars)
(with-output-to-string (s)
(write-string (link-href-start view) s)
(write-char #\" s)
(write-string (make-url (link-page-name view)) s)
(write-string "?func=" s)
(defun make-link-start (view fieldfunc fieldvalue refvars)
(with-output-to-string (s)
(write-string (link-href-start view) s)
(write-char #\" s)
(write-string (make-url (link-page-name view)) s)
(write-string "?func=" s)
- (write-s
tring
fieldfunc s)
+ (write-s
imple
fieldfunc s)
(write-string (link-ampersand view) s)
(write-string "key=" s)
(write-string (link-ampersand view) s)
(write-string "key=" s)
- (write-s
tring
fieldvalue s)
+ (write-s
imple
fieldvalue s)
(dolist (var refvars)
(write-string (link-ampersand view) s)
(dolist (var refvars)
(write-string (link-ampersand view) s)
- (write-s
tring
(car var) s)
+ (write-s
imple
(car var) s)
(write-char #\= s)
(write-char #\= s)
- (write-s
tring
(cdr var) s))
+ (write-s
imple
(cdr var) s))
(write-char #\" s)))
(write-char #\" s)))
-
-(defun make-link-start-old (view fieldfunc fieldvalue refvars)
- (format nil "~a\"~a?func=~a~akey=~a~a\""
- (link-href-start view)
- (make-url (link-page-name view))
- fieldfunc
- (link-ampersand view) fieldvalue
- (if refvars
- (let ((varstr ""))
- (dolist (var refvars)
- (string-append
- varstr (link-ampersand view)
- (format nil "~a=~a" (car var) (cdr var))))
- varstr)
- "")))
-
(defun make-link-end (obj view fieldname)
(declare (ignore obj fieldname))
(link-href-end view))
(defun make-link-end (obj view fieldname)
(declare (ignore obj fieldname))
(link-href-end view))