X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=mop.lisp;h=d1567ab5ac4254c6c9df828328f106355c348a48;hb=a7f7ec44e3acd442817630a912b5a0c581e23538;hp=327c76bd259c8f995ec5953ee2d58795898274df;hpb=9e616a490d6d4f03682a7bd7e9ea6587fecf2015;p=hyperobject.git

diff --git a/mop.lisp b/mop.lisp
index 327c76b..d1567ab 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.8 2002/12/09 10:39:38 kevin Exp $
+;;;; $Id: mop.lisp,v 1.11 2002/12/13 08:25:45 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -27,41 +27,40 @@
 (defclass hyperobject-class (standard-class)
   ( ;; slots initialized in defclass
    (user-name :initarg :user-name :type string :initform nil
-	  :documentation "User name for class")
-   (print-slots :initarg :print-slots :type list :initform nil
-		:documentation "List of slots to print")
+	      :accessor user-name
+	      :documentation "User name for class")
+   (default-print-slots :initarg :default-print-slots :type list :initform nil
+			:accessor default-print-slots
+			:documentation "Defaults slots for a view")
    (description :initarg :description :initform nil
+		:accessor description
 		:documentation "Class description")
    (version :initarg :version :initform nil
-		:documentation "Version number for class")
+	    :accessor version
+	    :documentation "Version number for class")
    (sql-name :initarg :table-name :initform nil)
 
    ;;; The remainder of these fields are calculated one time
    ;;; in finalize-inheritence.
    
-   (subobjects :initform nil :documentation
+   (subobjects :initform nil :accessor subobjects
+	       :documentation
 	       "List of fields that contain a list of subobjects objects.")
-   (hyperlinks :type list :initform nil :documentation 
-	       "List of fields that have hyperlinks")
-   (class-id :type integer :initform nil :documentation
-	     "Unique ID for the class")
-   
+   (hyperlinks :type list :initform nil :accessor hyperlinks
+	       :documentation "List of fields that have hyperlinks")
+   (class-id :type integer :initform nil
+	     :accessor class-id
+	     :documentation "Unique ID for the class")
+
+   ;; SQL commands
    (create-table-cmd :initform nil :reader create-table-cmd)
    (create-indices-cmds :initform nil :reader create-index-cmds)
    (drop-table-cmd :initform nil :reader drop-table-cmd)
 
-   (value-func :initform nil :type function)
-   (xmlvalue-func :initform nil :type function)
-   (fmtstr-text :initform nil :type string)
-   (fmtstr-html :initform nil :type string)
-   (fmtstr-xml :initform nil :type string)
-   (fmtstr-text-labels :initform nil :type string)
-   (fmtstr-html-labels :initform nil :type string)
-   (fmtstr-xml-labels :initform nil :type string)
-   (fmtstr-html-ref :initform nil :type string)
-   (fmtstr-xml-ref :initform nil :type string)
-   (fmtstr-html-ref-labels :initform nil :type string)
-   (fmtstr-xml-ref-labels :initform nil :type string)
+   (views :type list :initform nil :initarg :views :accessor views
+	  :documentation "List of views")
+   (default-view :initform nil :initarg :default-view :accessor default-view
+		 :documentation "The default view for a class")
    )
   (:documentation "Metaclass for Markup Language classes."))
 
@@ -93,7 +92,8 @@
   t)
 
 (defmethod finalize-inheritance :after ((cl hyperobject-class))
-  (init-hyperobject-class cl))
+  (init-hyperobject-class cl)
+  )
 
 ;; Slot definitions
 (defmethod direct-slot-definition-class ((cl hyperobject-class) 
@@ -144,7 +144,11 @@
 		       `(,(intern (symbol-name x))
 			  :initarg
 			  ,(intern (symbol-name x) (symbol-name :keyword))
-			  :initform nil))
+			  :initform nil
+			  :accessor
+			  ,(intern (concatenate 'string
+						(symbol-name :dsd-)
+						(symbol-name x)))))
 		   *slot-options*))))
   (eval
    `(defclass hyperobject-esd (standard-effective-slot-definition)
@@ -152,17 +156,36 @@
 		     `(,(intern (symbol-name x))
 			:initarg
 			,(intern (symbol-name x) (symbol-name :keyword))
-			:initform nil))
-		  (append *slot-options* *slot-options-no-initarg*)))))
+			:initform nil
+			:accessor
+			,(intern (concatenate 'string
+					      (symbol-name :esd-)
+					      (symbol-name x)))))
+		 (append *slot-options* *slot-options-no-initarg*)))))
   ) ;; eval-when
-  
-(defmethod compute-effective-slot-definition :around
-    ((cl hyperobject-class) #+(or allegro lispworks) name dsds)
+
+(defun intern-in-keyword (obj)
+  (cond
+    ((null obj)
+     nil)
+    ((eq t obj)
+     t)
+    ((atom obj)
+     (intern (symbol-name obj) (find-package 'keyword)))
+    ((consp obj)
+     (cons (intern-in-keyword (car obj) ) (intern-in-keyword (cdr obj))))
+    (t
+     obj)))
+
+(defmethod compute-effective-slot-definition :around ((cl hyperobject-class)
+						      #+(or allegro lispworks) name
+						      dsds)
   #+allergo (declare (ignore name))
   (let* ((dsd (car dsds))
-	 (ho-type (slot-value dsd 'type))
+	 (ho-type (intern-in-keyword (slot-value dsd 'type)))
 	 (sql-type (ho-type-to-sql-type ho-type))
 	 (length (when (consp ho-type) (cadr ho-type))))
+  #+allergo (declare (ignore name))
     (setf (slot-value dsd 'ho-type) ho-type)
     (setf (slot-value dsd 'sql-type) sql-type)
     (setf (slot-value dsd 'type) (ho-type-to-lisp-type ho-type))
@@ -186,7 +209,7 @@
   (when (consp ho-type)
     (setq ho-type (car ho-type)))
   (check-type ho-type symbol)
-  (case (intern (symbol-name ho-type) (symbol-name :keyword))
+  (case ho-type
     ((or :string :cdata :varchar :char)
      'string)
     (:character
@@ -201,7 +224,7 @@
      'single-float)
     (:double-float
      'double-float)
-    (:nil
+    (nil
      t)
     (otherwise
      ho-type)))
@@ -210,7 +233,7 @@
   (when (consp ho-type)
     (setq ho-type (car ho-type)))
   (check-type ho-type symbol)
-  (case (intern (symbol-name ho-type) (symbol-name :keyword))
+  (case ho-type
     ((or :string :cdata)
      'string)
     (:fixnum
@@ -223,7 +246,7 @@
      'single-float)
     (:double-float
      'double-float)
-    (:nil
+    (nil
      t)
     (otherwise
      ho-type)))
@@ -250,10 +273,10 @@
 
 (defun finalize-subobjects (cl)
   "Process class subobjects slot"
-  (setf (slot-value cl 'subobjects)
+  (setf (subobjects cl)
     (let ((subobjects '()))
       (dolist (slot (class-slots cl))
-	(let-when (subobj-def (slot-value slot 'subobject))
+	(let-when (subobj-def (esd-subobject slot))
           (let ((subobject (make-instance 'subobject
 					  :name-class (class-name cl)
 					  :name-slot (slot-definition-name slot)
@@ -286,16 +309,28 @@
   (let ((*print-circle* nil))
     (setf (documentation (class-name cl) 'class)
       (format nil "Hyperobject~A~A~A~A"
-	      (aif (slot-value cl 'user-name)
+	      (aif (user-name cl)
 		   (format nil ": ~A" it ""))
-	      (aif (slot-value cl 'description)
+	      (aif (description cl)
 		   (format nil "~%Class description: ~A" it) "")
-	      (aif (slot-value cl 'subobjects)
+	      (aif (subobjects cl)
 		   (format nil "~%Subobjects:~{ ~A~}" (mapcar #'name-slot it)) "")
-	      (aif (slot-value cl 'print-slots)
-		   (format nil "~%Print-slots:~{ ~A~}" it) "")
+	      (aif (default-print-slots cl)
+		   (format nil "~%Default print slots:~{ ~A~}" it) "")
 	      ))))
 
+(defun finalize-hyperlinks (cl)
+  (let ((hyperlinks '()))
+    (dolist (esd (class-slots cl))
+      (awhen (slot-value esd 'hyperlink)
+        (push
+	 (make-instance 'hyperlink
+			:name (slot-definition-name esd)
+			:lookup it
+			:link-parameters (slot-value esd 'hyperlink-parameters))
+	 hyperlinks)))
+    (setf (slot-value cl 'hyperlinks) hyperlinks)))
+
 (defun init-hyperobject-class (cl)
   "Initialize a hyperobject class. Calculates all class slots"
   (finalize-subobjects cl)
@@ -312,59 +347,18 @@
 (defun find-slot-by-name (cl name)
   (find name (class-slots cl) :key #'slot-definition-name))
 
-(defun hyperobject-class-fmtstr-text (obj)
-  (slot-value (class-of obj) 'fmtstr-text))
-
-(defun hyperobject-class-fmtstr-html (obj)
-  (slot-value (class-of obj) 'fmtstr-html))
-
-(defun hyperobject-class-fmtstr-xml (obj)
-  (slot-value (class-of obj) 'fmtstr-xml))
-
-(defun hyperobject-class-fmtstr-text-labels (obj)
-  (slot-value (class-of obj) 'fmtstr-text-labels))
-
-(defun hyperobject-class-fmtstr-html-labels (obj)
-  (slot-value (class-of obj) 'fmtstr-html-labels))
-
-(defun hyperobject-class-fmtstr-xml-labels (obj)
-  (slot-value (class-of obj) 'fmtstr-xml-labels))
-
-(defun hyperobject-class-value-func (obj)
-  (slot-value (class-of obj) 'value-func))
-
-(defun hyperobject-class-xmlvalue-func (obj)
-  (slot-value (class-of obj) 'xmlvalue-func))
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  
-  (defun hyperobject-class-user-name (obj)
-    (awhen (slot-value (class-of obj) 'user-name)
-	   (if (consp it)
-	       (car it)
-	       it))))
+(defun hyperobject-class-user-name (obj)
+  (awhen (user-name (class-of obj))
+	 (if (consp it)
+	     (car it)
+	     it)))
 
 (defun hyperobject-class-subobjects (obj)
-  (slot-value (class-of obj) 'subobjects))
+  (subobjects (class-of obj)))
 
 (defun hyperobject-class-hyperlinks (obj)
-  (slot-value (class-of obj) 'hyperlinks))
+  (hyperlinks (class-of obj)))
 
 (defun hyperobject-class-fields (obj)
   (class-slots (class-of obj)))
 
-(defun hyperobject-class-print-slots (obj)
-  (slot-value (class-of obj) 'print-slots))
-
-(defun hyperobject-class-fmtstr-html-ref (obj)
-  (slot-value (class-of obj) 'fmtstr-html-ref))
-
-(defun hyperobject-class-fmtstr-xml-ref (obj)
-  (slot-value (class-of obj) 'fmtstr-xml-ref))
-
-(defun hyperobject-class-fmtstr-html-ref-labels (obj)
-  (slot-value (class-of obj) 'fmtstr-html-ref-labels))
-
-(defun hyperobject-class-fmtstr-xml-ref-labels (obj)
-  (slot-value (class-of obj) 'fmtstr-xml-ref-labels))
-