From c0d7503d6636b6d5adb762258fdb20c1b4ceb53a Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Fri, 29 Nov 2002 23:14:38 +0000 Subject: [PATCH] r3522: *** empty log message *** --- examples/{example.lisp => person.lisp} | 2 +- mop.lisp | 16 +++++++------- {examples => old}/example-no-mop.lisp | 2 +- .../hyperobject-no-mop.lisp | 2 +- views.lisp | 22 +++++++++---------- 5 files changed, 22 insertions(+), 22 deletions(-) rename examples/{example.lisp => person.lisp} (98%) rename {examples => old}/example-no-mop.lisp (97%) rename hyperobject-no-mop.lisp => old/hyperobject-no-mop.lisp (99%) diff --git a/examples/example.lisp b/examples/person.lisp similarity index 98% rename from examples/example.lisp rename to examples/person.lisp index 0d6b3d5..81e37f4 100644 --- a/examples/example.lisp +++ b/examples/person.lisp @@ -9,7 +9,7 @@ ;;;; ;;;; A simple example file for hyperobjects ;;;; -;;;; $Id: example.lisp,v 1.2 2002/11/26 21:51:10 kevin Exp $ +;;;; $Id: person.lisp,v 1.1 2002/11/29 23:14:32 kevin Exp $ ;;;; ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg ;;;; diff --git a/mop.lisp b/mop.lisp index 9601951..1e83ae3 100644 --- a/mop.lisp +++ b/mop.lisp @@ -11,7 +11,7 @@ ;;;; in Text, HTML, and XML formats. This includes hyperlinking ;;;; capability and sub-objects. ;;;; -;;;; $Id: mop.lisp,v 1.2 2002/11/29 05:05:29 kevin Exp $ +;;;; $Id: mop.lisp,v 1.3 2002/11/29 23:14:31 kevin Exp $ ;;;; ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg ;;;; @@ -40,8 +40,8 @@ (subobjects :initform nil :documentation "List of fields that contain a list of subobjects objects.") - (references :type list :initform nil :documentation - "List of fields that have references") + (hyperlinks :type list :initform nil :documentation + "List of fields that have hyperlinks") (class-id :type integer :initform nil :documentation "Unique ID for the class") @@ -68,13 +68,13 @@ (print-unreadable-object (obj s :type t :identity t) (format s "~S" (name obj)))) -(defclass reference () +(defclass hyperlink () ((name :type symbol :initform nil :initarg :name :reader name) (lookup :type function :initform nil :initarg :lookup :reader lookup) (link-parameters :type list :initform nil :initarg :link-parameters :reader link-parameters))) -(defmethod print-object ((obj reference) (s stream)) +(defmethod print-object ((obj hyperlink) (s stream)) (print-unreadable-object (obj s :type t :identity t) (format s "~S" (name obj)))) @@ -162,7 +162,7 @@ :sql-type sql-type :print-formatter (slot-value dsd 'print-formatter) :subobject (slot-value dsd 'subobject) - :reference (slot-value dsd 'reference) + :hyperlink (slot-value dsd 'hyperlink) :description (slot-value dsd 'description) ia))) ) @@ -291,8 +291,8 @@ (defun hyperobject-class-subobjects (obj) (slot-value (class-of obj) 'subobjects)) -(defun hyperobject-class-references (obj) - (slot-value (class-of obj) 'references)) +(defun hyperobject-class-hyperlinks (obj) + (slot-value (class-of obj) 'hyperlinks)) (defun hyperobject-class-fields (obj) (class-slots (class-of obj))) diff --git a/examples/example-no-mop.lisp b/old/example-no-mop.lisp similarity index 97% rename from examples/example-no-mop.lisp rename to old/example-no-mop.lisp index c2393f1..a94428d 100644 --- a/examples/example-no-mop.lisp +++ b/old/example-no-mop.lisp @@ -11,7 +11,7 @@ ;;;; in Text, HTML, and XML formats. This includes hyperlinking ;;;; capability and sub-objects. ;;;; -;;;; $Id: example-no-mop.lisp,v 1.1 2002/11/25 04:47:23 kevin Exp $ +;;;; $Id: example-no-mop.lisp,v 1.1 2002/11/29 23:14:32 kevin Exp $ ;;;; ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg ;;;; diff --git a/hyperobject-no-mop.lisp b/old/hyperobject-no-mop.lisp similarity index 99% rename from hyperobject-no-mop.lisp rename to old/hyperobject-no-mop.lisp index bb104d3..e932b90 100644 --- a/hyperobject-no-mop.lisp +++ b/old/hyperobject-no-mop.lisp @@ -9,7 +9,7 @@ ;;;; ;;;; This is a rewrite of hyperobjec't to avoid using metaclasses. ;;;; -;;;; $Id: hyperobject-no-mop.lisp,v 1.6 2002/11/25 07:45:35 kevin Exp $ +;;;; $Id: hyperobject-no-mop.lisp,v 1.1 2002/11/29 23:14:32 kevin Exp $ ;;;; ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg ;;;; diff --git a/views.lisp b/views.lisp index a62baf0..2626743 100644 --- a/views.lisp +++ b/views.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Apr 2000 ;;;; -;;;; $Id: views.lisp,v 1.3 2002/11/29 05:05:29 kevin Exp $ +;;;; $Id: views.lisp,v 1.4 2002/11/29 23:14:31 kevin Exp $ ;;;; ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg ;;;; @@ -40,7 +40,7 @@ (xmlvalue-func '()) (classname (class-name cl)) (package (symbol-package (class-name cl))) - (references nil)) + (hyperlinks nil)) (declare (ignore classname)) (check-type (slot-value cl 'print-slots) list) (dolist (slot-name (slot-value cl 'print-slots)) @@ -88,15 +88,15 @@ (string-append fmtstr-html-labels html-label-str) (string-append fmtstr-xml-labels xml-label-str) - (if (slot-value slot 'reference) + (if (slot-value slot 'hyperlink) (progn (string-append fmtstr-html-ref "<~~a>" value-fmt "") (string-append fmtstr-xml-ref "<~~a>" value-fmt "") (string-append fmtstr-html-ref-labels "" namestr-lower " <~~a>" value-fmt "") (string-append fmtstr-xml-ref-labels " <~~a>" value-fmt "") - (push (make-instance 'reference :name name - :lookup (slot-value slot 'reference)) - references)) + (push (make-instance 'hyperlink :name name + :lookup (slot-value slot 'hyperlink)) + hyperlinks)) (progn (string-append fmtstr-html-ref html-str) (string-append fmtstr-xml-ref xml-str) @@ -115,7 +115,7 @@ (setq xmlvalue-func (append xmlvalue-func plain-value-func))) ))) - (setf (slot-value cl 'references) references) + (setf (slot-value cl 'hyperlinks) hyperlinks) (if value-func (setq value-func `(lambda (x) (values ,@value-func))) @@ -320,7 +320,7 @@ :fmtstr-labels nil :page-name "disp-func1" :href-head nil :href-end nil :ampersand nil) - (:documentation "Formatting for a linked reference")) + (:documentation "Formatting for a linked hyperlink")) (defclass html-link-ref (link-ref) () @@ -478,8 +478,8 @@ (multiple-value-list (funcall (funcall (obj-data-value-func fmt) x) x)))) - ;; make list of reference link fields for printing to refstr template - (dolist (ref (hyperobject-class-references x)) + ;; 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) @@ -505,7 +505,7 @@ (defgeneric make-ref-data-str (obj fmt &optional label)) (defmethod make-ref-data-str (x (fmt textformat) &optional (label nil)) - "Return fmt string for that contains ~a slots for reference link start and end" + "Return fmt string for that contains ~a slots for hyperlink link start and end" (unless (link-ref fmt) (error "fmt does not contain a link-ref")) (let ((refstr -- 2.34.1