X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=views.lisp;h=b9274aafb7834e10e19c95505d9dc0cbec94e07c;hb=920865199d81789ced3a9e0a24f4c95b3ec6fa7f;hp=d22f6232a9fc0acb2c7ea20dfa36bc52d3a416e8;hpb=0817a8721cbefca2205dcde535ff6b164033abef;p=hyperobject.git
diff --git a/views.lisp b/views.lisp
index d22f623..b9274aa 100644
--- a/views.lisp
+++ b/views.lisp
@@ -2,16 +2,16 @@
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
-;;;; Name: views.lisp
-;;;; Purpose: View methods for Hyperobjects
-;;;; Programmer: Kevin M. Rosenberg
-;;;; Date Started: Apr 2000
+;;;; Name: views.lisp
+;;;; Purpose: View methods for Hyperobjects
+;;;; Author: Kevin M. Rosenberg
+;;;; Created: Apr 2000
;;;;
;;;; $Id$
;;;;
-;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
+;;;; This file is Copyright (c) 2000-2004 by Kevin M. Rosenberg
;;;; *************************************************************************
-
+
(in-package #:hyperobject)
@@ -23,7 +23,7 @@
:documentation "List of effective slots for object to be viewed.")
(id :initform nil :initarg :id :accessor id
:documentation "id for this view.")
- (source-code :initform nil :initarg :source-code :accessor source-code
+ (source-code :initform nil :initarg :source-code :accessor source-code
:documentation "Source code for generating view.")
(country-language :initform :en :initarg :country-language
:documentation "Country's Language for this view.")
@@ -89,10 +89,9 @@
:accessor link-href-end)
(link-ampersand :type (or string null) :initform nil :initarg :link-ampersand
:accessor link-ampersand))
- (:default-initargs :link-page "lookup-func1")
+ (:default-initargs :link-page "meta-search.html")
(:documentation "View class for a hyperobject"))
-
(defun get-default-view-id (obj-cl)
(aif (views obj-cl)
(id (car it))
@@ -112,8 +111,8 @@
(make-instance (class-name obj-cl))
(setq cpl (class-precedence-list obj-cl))))
(find-view-id-in-class-precedence (second cpl) vid)))))
-
-
+
+
(defun get-view-id (obj vid &optional slots)
"Find or make a category view for an object"
(let ((obj-cl (class-of obj)))
@@ -148,7 +147,7 @@
((typep view-def 'object-view)
view-def)
((eq view-def :default)
- (make-instance 'object-view
+ (make-instance 'object-view
:object-class (class-name cl)
:id :compact-text))
((consp view-def)
@@ -161,11 +160,11 @@
(error "Invalid parameter to make-object-view: ~S" view-def))))
(defmethod initialize-instance :after ((self object-view)
- &rest initargs
+ &rest initargs
&key
&allow-other-keys)
(initialize-view self))
-
+
(defun initialize-view (view)
"Calculate all view slots for a hyperobject class"
(let ((obj-cl (find-class (object-class view))))
@@ -184,20 +183,20 @@
"Initialize a view based upon a source code"
(let* ((source-code (source-code view))
(printer `(lambda
- (,(intern (symbol-name '#:self)
+ (,(intern (symbol-name '#:self)
(symbol-package (object-class view)))
- ,(intern (symbol-name '#:s)
+ ,(intern (symbol-name '#:s)
(symbol-package (object-class view))))
- (declare (ignorable
- ,(intern (symbol-name '#:self)
+ (declare (ignorable
+ ,(intern (symbol-name '#:self)
(symbol-package (object-class view)))
- ,(intern (symbol-name '#:s)
+ ,(intern (symbol-name '#:s)
(symbol-package (object-class view)))))
- (with-slots ,(slots view)
- ,(intern (symbol-name '#:self)
+ (with-slots ,(slots view)
+ ,(intern (symbol-name '#:self)
(symbol-package (object-class view)))
,@source-code))))
- (setf (printer view)
+ (setf (printer view)
(compile nil (eval printer)))))
(defmacro write-simple (v s)
@@ -218,7 +217,7 @@
(funcall formatter slot-data)
slot-data)))
(if cdata
- (write-xml-cdata fmt-data strm)
+ (write-cdata fmt-data strm)
(write-simple fmt-data strm))))
(defun ppfc-html (title name type formatter cdata print-func)
@@ -237,6 +236,11 @@
(vector-push-extend `(write-string ,tag s) print-func)
(vector-push-extend '(write-char #\> s) print-func))
+(defun ppfc-display-table (title name type formatter cdata print-func)
+ (vector-push-extend '(write-string "
" s) print-func)
+ (ppfc-html title name type formatter cdata print-func)
+ (vector-push-extend '(write-string " | " s) print-func))
+
(defun ppfc-html-labels (label name type formatter cdata print-func)
(vector-push-extend '(write-string "" s) print-func)
(vector-push-extend `(write-string ,label s) print-func)
@@ -258,11 +262,11 @@
(defun ppfc-html-link (name type formatter cdata nlink print-func)
(declare (fixnum nlink))
(vector-push-extend '(write-char #\< s) print-func)
- (vector-push-extend `(write-string (nth ,(+ nlink nlink) links) s) print-func)
+ (vector-push-extend `(write-string (nth ,(+ nlink nlink) links) s) print-func)
(vector-push-extend '(write-char #\> s) print-func)
(vector-push-extend `(write-ho-value x ',name ',type ',formatter ,cdata s) print-func)
(vector-push-extend '(write-string "" s) print-func)
- (vector-push-extend `(write-string (nth ,(+ nlink nlink 1) links) s) print-func)
+ (vector-push-extend `(write-string (nth ,(+ nlink nlink 1) links) s) print-func)
(vector-push-extend '(write-char #\> s) print-func))
(defun ppfc-html-link-labels (label name type formatter cdata nlink print-func)
@@ -277,7 +281,8 @@
(user-name (esd-user-name slot))
(xml-user-name (escape-xml-string user-name))
(xml-tag (escape-xml-string user-name))
- (type (slot-value slot 'type))
+ (type (slot-value slot #-sbcl 'type
+ #+sbcl 'sb-pcl::%type))
(cdata (not (null
(and (in vid :xml :xhtml :xml-link :xhtml-link
:xml-labels :ie-xml-labels
@@ -286,7 +291,7 @@
(or formatter
(lisp-type-is-a-string type))))))
(hyperlink (esd-hyperlink slot)))
-
+
(case vid
(:compact-text
(vector-push-extend
@@ -304,6 +309,8 @@
(ppfc-html-labels user-name name type formatter cdata print-func))
(:xhtml-labels
(ppfc-xhtml-labels xml-user-name user-name name type formatter cdata print-func))
+ ((:display-table :display-table-labels)
+ (ppfc-display-table user-name name type formatter cdata print-func))
(:xml-labels
(ppfc-xml-labels xml-user-name xml-tag name type formatter cdata print-func))
((or :html-link :xhtml-link)
@@ -347,17 +354,17 @@
:xhtml-link :html-link
:xml :xml-labels :xml-link :ie-xml-link
:xml-link-labels :ie-xml-link-labels
- :display-table :edit-table))
+ :display-table :display-table-labels :edit-table :edit-table-labels))
(defun initialize-view-by-id (obj-cl view)
"Initialize a view based upon a preset vid"
(unless (creatable-view-id-p obj-cl (id view))
(error "Unable to automatically create view id ~A" (id view)))
-
+
(unless (slots view) (setf (slots view) (default-print-slots obj-cl)))
(let ((links '())
- (print-func (make-array 10 :fill-pointer 0 :adjustable t)))
+ (print-func (make-array 20 :fill-pointer 0 :adjustable t)))
(do* ((slots (slots view) (cdr slots))
(slot-name (car slots) (car slots))
@@ -366,7 +373,7 @@
((null slots))
(unless slot
(error "Slot ~A is not found in class ~S" slot-name obj-cl))
-
+
(push-print-fun-code (id view) slot (length links) print-func)
(when (> (length slots) 1)
(vector-push-extend '(write-char #\space s) print-func))
@@ -380,7 +387,7 @@
,@(map 'list #'identity print-func)))
(setf (obj-data-printer view)
(compile nil (eval (obj-data-print-code view))))
-
+
(setf (link-slots view) (nreverse links)))
(finalize-view-by-id view)
@@ -406,6 +413,13 @@
(setf (link-href-start view) "a href=")
(setf (link-href-end view) "a")
(setf (link-ampersand view) "&"))
+ ((or :display-table :display-table-labels :edit-tables)
+ (initialize-table-view view)
+ (when (in (id view) :display-table-labels :edit-table-labels)
+ (setf (list-start-printer view) #'table-label-list-start-func))
+ (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)
@@ -449,7 +463,7 @@
(setf (indenter view) #'indent-spaces))
(defun html-list-start-func (obj nitems indent strm)
- (write-string "" strm)
(write-user-name-maybe-plural obj nitems strm)
@@ -475,14 +489,47 @@
(setf (obj-data-indent view) nil))
(defun xhtml-list-start-func (obj nitems indent strm)
- (write-string "
" strm)
+ (write-user-name-maybe-plural obj nitems strm)
+ (write-string "
" strm)
+ (write-string "
" strm)
+ (write-char #\newline strm))
+
+(defun table-list-start-func (obj nitems indent strm)
+ (write-string "
" strm)
+ (write-user-name-maybe-plural obj nitems strm)
+ (write-string "
" strm)
+ (write-char #\newline strm)
+ (write-string "
" strm)
+ (write-string "" strm)
+ (write-char #\newline strm))
+
+(defun table-label-list-start-func (obj nitems indent strm)
+ (write-string "" strm)
(write-user-name-maybe-plural obj nitems strm)
(write-string "
" strm)
- (write-string "" strm)
+ (write-string "" strm)
+ (dolist (slot (default-print-slots (class-of obj)))
+ (write-string "" strm)
+ (write-string (write-to-string slot) strm)
+ (write-string " | " strm))
+ (write-string "" strm)
+ (write-char #\newline strm)
+ (write-string "
" strm)
(write-char #\newline strm))
(defun html-obj-start (obj indent strm)
@@ -503,6 +550,21 @@
(setf (obj-end-printer view) (format nil "~%"))
(setf (obj-data-indent view) nil))
+(defun initialize-table-view (view)
+ (initialize-text-view view)
+ (setf (indenter view) #'indent-spaces)
+ (setf (file-start-str view) (format nil "~%"))
+ (setf (file-end-str view) (format nil "~%"))
+ (setf (list-start-indent view) nil)
+ (setf (list-start-printer view) #'table-list-start-func)
+ (setf (list-end-printer view) (format nil "~%
~%"))
+ (setf (list-end-indent view) nil)
+ (setf (obj-start-indent view) nil)
+ (setf (obj-start-printer view) #'html-obj-start)
+ (setf (obj-start-printer view) (format nil "
"))
+ (setf (obj-end-printer view) (format nil "
~%"))
+ (setf (obj-data-indent view) nil))
+
(defun xmlformat-list-end-func (x strm)
(write-string "" strm)
(write-string (class-name-of x) strm)
@@ -528,6 +590,7 @@
(setf (list-end-printer view) #'xmlformat-list-end-func)
(setf (obj-start-printer view) (format nil "<~(~a~)>" name))
(setf (obj-start-indent view) t)
+ (setf (obj-end-printer view) (format nil "~(~a~)>~%" name))
(setf (subobj-end-printer view) (format nil "~(~a~)>~%" name))
(setf (subobj-end-indent view) nil)
(setf (obj-data-indent view) nil)))
@@ -579,7 +642,7 @@
(defun fmt-obj-end (obj view strm indent)
(when (obj-end-indent view)
(awhen (indenter view)
- (funcall it indent strm)))
+ (funcall it indent strm)))
(awhen (obj-end-printer view)
(if (stringp it)
(write-string it strm)
@@ -597,13 +660,13 @@
(defun fmt-subobj-end (obj view strm indent)
(when (subobj-end-indent view)
(awhen (indenter view)
- (funcall it indent strm)))
+ (funcall it indent strm)))
(awhen (subobj-end-printer view)
(if (stringp it)
(write-string it strm)
(funcall it obj strm))))
-
-;;; Object Data
+
+;;; Object Data
(defun make-link-start (view fieldfunc fieldvalue refvars link-printer)
@@ -627,7 +690,7 @@
(link-printer
(funcall link-printer link-page fieldfunc fieldvalue refvars s))))
(write-char #\" s)))
-
+
(defun make-link-end (obj view fieldname)
(declare (ignore obj fieldname))
(link-href-end view))
@@ -690,7 +753,7 @@
strm vid (1+ indent) filter subobjects refvars
link-printer)))))
-
+
(defun view-hyperobject (objs view strm &optional vid (indent 0) filter
subobjects refvars link-printer)
"Display a single or list of hyperobject-class instances and their subobjects"
@@ -710,11 +773,13 @@
(fmt-obj-start obj view strm indent)
(fmt-obj-data obj view strm (1+ indent) refvars link-printer)
(fmt-obj-end obj view strm indent)
- (when subobjects
- (fmt-subobj-start obj view strm indent)
- (view-subobjects obj strm vid indent filter subobjects
- refvars link-printer)
- (fmt-subobj-end obj view strm indent))))
+ (if subobjects
+ (progn
+ (fmt-subobj-start obj view strm indent)
+ (view-subobjects obj strm vid indent filter subobjects
+ refvars link-printer)
+ (fmt-subobj-end obj view strm indent))
+ (fmt-subobj-start obj view strm indent))))
(fmt-list-end (car objlist) view strm indent nobjs)))
objs)