X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=example.lisp;h=e16bba54835954ff78f905ec240ebbe67a40410e;hb=86ec4d5f1d54cc100dec0882d5bf7ecaf8d39af7;hp=974a1e20af5717b456f39d26b6a5b8c7f3ee61a7;hpb=63b552ae64bb098d42c4f23c2850a03ff707f12a;p=hyperobject.git

diff --git a/example.lisp b/example.lisp
index 974a1e2..e16bba5 100644
--- a/example.lisp
+++ b/example.lisp
@@ -2,16 +2,14 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          hyperobject-plain-example.lisp
-;;;; Purpose:       Hyper Object Metaclass
+;;;; Name:          hyperobject-example.lisp
+;;;; Purpose:       Hyperobject Example file
 ;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  Apr 2000
+;;;; Date Started:  Oct 2002
 ;;;;
-;;;; This metaclass as functions to classes to allow display
-;;;; in Text, HTML, and XML formats. This includes hyperlinking
-;;;; capability and sub-objects.
+;;;; A simple example file for hyperobjects
 ;;;;
-;;;; $Id: example.lisp,v 1.1 2002/11/22 10:49:24 kevin Exp $
+;;;; $Id: example.lisp,v 1.6 2002/11/24 17:47:50 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -19,14 +17,19 @@
  
 (in-package :hyperobject-user)
 
-(define-hyperobject person ()
-  ((first-name :type string :reference find-person-by-last-name)
-   (last-name :type string)
-   (dob :type integer :initform 0 :format-func format-date)
-   (resume :type cdata)
-   (addresses :subobject t))
+
+(defclass person (hyperobject)
+  ((first-name :type string :initarg :first-name :reader first-name)
+   (last-name :type string :initarg :last-name :reader last-name
+	      :reference find-person-by-last-name)
+   (dob :type integer :initarg :dob :reader dob :print-formatter format-date)
+   (resume :type cdata :initarg :resume :reader resume)
+   (addresses :initarg :addresses :reader addresses :subobject t))
+  (:metaclass hyperobject-class)
+  (:default-initargs :first-name nil :last-name nil :dob 0 :resume nil) 
+  (:print-slots first-name last-name dob resume)
   (:title "Person")
-  (:documentation "Person hyperobject class"))
+  (:description "A Person"))
 
 (defun format-date (ut)
   (when (typep ut 'integer)
@@ -40,25 +43,32 @@
 		year
 		hr min sec))))
 
-(define-hyperobject address ()
-  ((title :type string)
-   (street :type string)
-   (phones :subobject t))
+(defclass address (hyperobject)
+  ((title :type string :initarg :title :reader title)
+   (street :type string :initarg :street :reader street)
+   (phones :initarg :phones :reader phones :subobject t))
+  (:metaclass hyperobject-class)
+  (:default-initargs :title nil :street nil) 
   (:title "Address")
-  (:documentation "Address hyperobject"))
+  (:print-slots title street)
+  (:description "An address"))
 
-(define-hyperobject phone ()
-  ((phone-number :type string))
+(defclass phone (hyperobject)
+  ((title :type string :initarg :title :reader title)
+   (phone-number :type string :initarg :phone-number :reader phone-number))
+  (:metaclass hyperobject-class)
   (:title "Phone Number")
-  (:documentation "Phone hyperobject"))
+  (:default-initargs :title nil :phone-number nil)
+  (:print-slots title phone-number)
+  (:description "A phone number"))
 
 
-(defparameter home-phone-1 (make-instance 'phone :phone-number "367-9812"))
-(defparameter home-phone-2 (make-instance 'phone :phone-number "367-9813"))
+(defparameter home-phone-1 (make-instance 'phone :title "Voice" :phone-number "367-9812"))
+(defparameter home-phone-2 (make-instance 'phone :title "Fax" :phone-number "367-9813"))
 
-(defparameter office-phone-1 (make-instance 'phone :phone-number "123-0001"))
-(defparameter office-phone-2 (make-instance 'phone :phone-number "123-0002"))
-(defparameter office-phone-3 (make-instance 'phone :phone-number "123-0005"))
+(defparameter office-phone-1 (make-instance 'phone :title "Main line" :phone-number "123-0001"))
+(defparameter office-phone-2 (make-instance 'phone :title "Staff line" :phone-number "123-0002"))
+(defparameter office-phone-3 (make-instance 'phone :title "Fax" :phone-number "123-0005"))
 
 (defparameter home (make-instance 'address :title "Home" :street "321 Shady Lane"
 				  :phones (list home-phone-1 home-phone-2)))