r3465: *** empty log message ***

diff --git a/debian/rules b/debian/rules
index c954bf39928c7839a899b0064193815616495409..1dee9fbaf3bcb47c67fd009ef6df895ede8c9dd9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,7 @@ install: build
        dh_clean -k
        # Add here commands to install the package into debian/hyperobject.
        dh_installdirs $(clc-systems) $(clc-hyperobject) $(doc-dir)
-       dh_install hyperobject.asd hyperobject.lisp hyperobject-no-mop.lisp $(clc-hyperobject)
+       dh_install hyperobject.asd package.lisp hyperobject.lisp hyperobject-no-mop.lisp $(clc-hyperobject)
        dh_link $(clc-hyperobject)/hyperobject.asd $(clc-systems)/hyperobject.asd
 
 # Build architecture-independent files here.
@@ -51,7 +51,7 @@ binary-indep: build install
        dh_testroot -i
 #      dh_installdebconf       
        dh_installdocs -i
-       dh_installexamples -i example.lisp no-mop-example.lisp
+       dh_installexamples -i $(wilcard example*.lisp)
 #      dh_installmenu
 #      dh_installlogrotate
 #      dh_installemacsen

diff --git a/hyperobject-no-mop.lisp b/hyperobject-no-mop.lisp
index 56c7f5e31b7f51c19697ee235f4a0d64229e34e4..e315706a4ff0fbb26f379776f652ac9a2c4c1807 100644 (file)
--- a/hyperobject-no-mop.lisp
+++ b/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.3 2002/11/23 18:41:45 kevin Exp $
+;;;; $Id: hyperobject-no-mop.lisp,v 1.4 2002/11/23 22:19:17 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -197,9 +197,6 @@
        (symbol-name doc)
        doc)))
 
-(defun fmt-comma-integer (i)
-  (format nil "~:d" i))
-
 ;;;; Class initialization function
 (defun init-hyperobject-class (name meta)
     (let ((fmtstr-text "")

diff --git a/no-mop-example.lisp b/no-mop-example.lisp
deleted file mode 100644 (file)
index 88d5a88..0000000
--- a/no-mop-example.lisp
+++ /dev/null
@@ -1,80 +0,0 @@
-;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; *************************************************************************
-;;;; FILE IDENTIFICATION
-;;;;
-;;;; Name:          hyperobject-plain-example.lisp
-;;;; Purpose:       Hyper Object Metaclass
-;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  Apr 2000
-;;;;
-;;;; This metaclass as functions to classes to allow display
-;;;; in Text, HTML, and XML formats. This includes hyperlinking
-;;;; capability and sub-objects.
-;;;;
-;;;; $Id: no-mop-example.lisp,v 1.3 2002/11/23 18:41:45 kevin Exp $
-;;;;
-;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
-;;;;
-;;;; *************************************************************************
- 
-(in-package :hyperobject-no-mop-user)
-
-(define-hyperobject person ()
-  ((first-name :type string :reference find-person-by-last-name)
-   (last-name :type string)
-   (dob :type integer :initform 0 :print-formatter format-date)
-   (resume :type cdata)
-   (addresses :subobject t))
-  (:title "Person")
-  (:documentation "Person hyperobject class"))
-
-(defun format-date (ut)
-  (when (typep ut 'integer)
-      (multiple-value-bind (sec min hr day mon year dow daylight-p zone)
-         (decode-universal-time ut)
-       (declare (ignore daylight-p zone))
-       (format nil "~[Mon~;Tue~;Wed~;Thu~;Fri~;Sat~;Sun~], ~d ~[Jan~;Feb~;Mar~;Apr~;May~;Jun~;Jul~;Aug~;Sep~;Oct~;Nov~;Dec~] ~d ~2,'0d:~2,'0d:~2,'0d" 
-               dow
-               day
-               (1- mon)
-               year
-               hr min sec))))
-
-(define-hyperobject address ()
-  ((title :type string)
-   (street :type string)
-   (phones :subobject t))
-  (:title "Address")
-  (:documentation "Address hyperobject"))
-
-(define-hyperobject phone ()
-  ((phone-number :type string))
-  (:title "Phone Number")
-  (:documentation "Phone hyperobject"))
-
-
-(defparameter home-phone-1 (make-instance 'phone :phone-number "367-9812"))
-(defparameter home-phone-2 (make-instance 'phone :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 home (make-instance 'address :title "Home" :street "321 Shady Lane"
-                                 :phones (list home-phone-1 home-phone-2)))
-
-(defparameter office (make-instance 'address :title "Office" :street "113 Main St."
-                                   :phones (list office-phone-1 office-phone-2 office-phone-3)))
-
-                             
-(defparameter mary (make-instance 'person :first-name "Mary" :last-name "Jackson"
-                           :dob (get-universal-time)
-                           :addresses (list home office)
-                           :resume "Style & Grace"))
-
-
-(format t "~&Text Format~%")
-(print-hyperobject mary :subobjects t)
-
-(format t "~&XML Format with field labels and hyperlinks~%")
-(print-hyperobject mary :subobjects t :label t :format :xmlref)

diff --git a/package.lisp b/package.lisp
index 82e138b76204ea566148aadf1a42029da90e6a56..dac580ddd583aee1848b59a473f474b40823fc50 100644 (file)
--- a/package.lisp
+++ b/package.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: package.lisp,v 1.8 2002/11/23 20:59:47 kevin Exp $
+;;;; $Id: package.lisp,v 1.9 2002/11/23 22:19:17 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -26,7 +26,6 @@
    #:hyperobject-class-title
    #:load-all-subobjects
    #:print-hyperobject
-   #:comma-integer
    ))
 
 (defpackage #:hyperobject-no-mop