added perform-set-attribute and a few other fixes to this builds again.

[clinton/lisp-on-lines.git] / src / mewa / mewa.lisp

diff --git a/src/mewa/mewa.lisp b/src/mewa/mewa.lisp
index e384f74..e440551 100644 (file)
--- a/src/mewa/mewa.lisp
+++ b/src/mewa/mewa.lisp
@@ -1,9 +1,16 @@
+

 (in-package :mewa)
  
 (defparameter *default-type* :ucw)
 
 ;;; maps meta-model slot-types to slot-presentation
 (in-package :mewa)
  
 (defparameter *default-type* :ucw)
 
 ;;; maps meta-model slot-types to slot-presentation

-(defparameter *slot-type-map* '(number ucw:currency))
+(defparameter *slot-type-map*
+  '(boolean   ucw::mewa-boolean
+    string    ucw::mewa-string
+    number    ucw::mewa-currency
+    integer   ucw::mewa-integer
+    currency  ucw::mewa-currency
+    ))

 
 ;;; an alist of model-class-name . attributes
 ;;; should really be a hash-table.
 
 ;;; an alist of model-class-name . attributes
 ;;; should really be a hash-table.


@@ -27,7 +34,7 @@
   (mapcar #'(lambda (x) (gen-pslot (cadr x) 
                                   (string (car x)) 
                                   (car x))) 
   (mapcar #'(lambda (x) (gen-pslot (cadr x) 
                                   (string (car x)) 
                                   (car x))) 

-         (list-slot-types instance)))
+         (meta-model:list-slot-types instance)))

 
 
 (defun gen-pslot (type label slot-name)
 
 
 (defun gen-pslot (type label slot-name)


@@ -83,19 +90,26 @@ attributes is an alist keyed on the attribute nreeame."
                         (cddr (find-attribute model name))))
            definition)))
 
                         (cddr (find-attribute model name))))
            definition)))
 

+(defmethod perform-set-attributes ((model t) definitions)
+  (dolist (def definitions)
+    (funcall #'set-attribute model (first def) (rest def))))

 
 (defmethod default-attributes ((model t))
   "return the default attributes for a given model using the meta-model's meta-data"
   (append (mapcar #'(lambda (s) 
                      (cons (car s) 
                            (gen-pslot 
 
 (defmethod default-attributes ((model t))
   "return the default attributes for a given model using the meta-model's meta-data"
   (append (mapcar #'(lambda (s) 
                      (cons (car s) 
                            (gen-pslot 

-                            (if (meta-model:foreign-key-p model
-                                                          'ucw::foreign-key
-                                                          (car s))
-                                                  (cadr s))
-                                                (string (car s)) (car s)))) 
-         (meta-model:list-slot-types model))
-         (mapcar #'(lambda (s) (cons s (append (gen-pslot 'ucw::has-many (string s) s) `(:presentation (make-presentation ,model :type :one-line)))))
+                            (if (meta-model:foreign-key-p model (car s))
+                                'ucw::foreign-key
+                                (cadr s))
+                            (string (car s)) (car s)))) 
+                 (meta-model:list-slot-types model))
+         (mapcar #'(lambda (s) 
+                     (cons s (append (gen-pslot 'ucw::has-many (string s) s) 
+                                     `(:presentation 
+                                       (make-presentation 
+                                        ,model 
+                                        :type :one-line)))))

                  (meta-model:list-has-many model))))
 
 (defmethod set-default-attributes ((model t))
                  (meta-model:list-has-many model))))
 
 (defmethod set-default-attributes ((model t))


@@ -261,15 +275,17 @@ attributes is an alist keyed on the attribute nreeame."
   (setf (slots to) (mapcar #'(lambda (x) (prog2 
                                             (setf (component.place x) (component.place from))
                                             x))
   (setf (slots to) (mapcar #'(lambda (x) (prog2 
                                             (setf (component.place x) (component.place from))
                                             x))

-                            (slots to))))
+                            (slots to))))

 
 (defmacro call-presentation (object &rest args)
   `(present-object ,object :presentation (make-presentation ,object ,@args)))
 
 
 (defmacro call-presentation (object &rest args)
   `(present-object ,object :presentation (make-presentation ,object ,@args)))
 

-
-

 (defaction cancel-save-instance ((self mewa))
 (defaction cancel-save-instance ((self mewa))

-  (answer nil))
+  (cond  
+    ((slot-value (instance self) 'clsql-sys::view-database)
+      (meta-model::update-instance-from-records (instance self))
+      (answer self))
+    (t (answer nil))))

 
 (defaction save-instance ((self mewa))
   (meta-model:sync-instance (instance self))
 
 (defaction save-instance ((self mewa))
   (meta-model:sync-instance (instance self))


@@ -277,9 +293,7 @@ attributes is an alist keyed on the attribute nreeame."
        (answer self))
 
 
        (answer self))
 
 

-(defaction ok ((self mewa) &optional arg)
-  "Returns the component if it has not been modified. if it has been, prompt user to save or cancel"
-  (declare (ignore arg))
+(defaction ensure-instance-sync ((self mewa))

   (when (modifiedp self)
     (let ((message (format nil "Record has been modified, Do you wish to save the changes?<br/> ~a" (print (modifications self)))))
       (case (call 'option-dialog 
   (when (modifiedp self)
     (let ((message (format nil "Record has been modified, Do you wish to save the changes?<br/> ~a" (print (modifications self)))))
       (case (call 'option-dialog 


@@ -289,11 +303,18 @@ attributes is an alist keyed on the attribute nreeame."
        (:cancel
         (cancel-save-instance self))
        (:save 
        (:cancel
         (cancel-save-instance self))
        (:save 

-        (save-instance self)))))
+        (save-instance self))))))
+
+(defaction ok ((self mewa) &optional arg)
+  "Returns the component if it has not been modified. if it has been, prompt user to save or cancel"
+  (declare (ignore arg))
+  (ensure-instance-sync self)

   (answer self))
 
 
 
   (answer self))
 
 
 

+
+

 (defmethod (setf presentation-slot-value) :around (value (slot slot-presentation) instance)
   (let* ((old (prog1 
                 (presentation-slot-value slot instance)
 (defmethod (setf presentation-slot-value) :around (value (slot slot-presentation) instance)
   (let* ((old (prog1 
                 (presentation-slot-value slot instance)


@@ -303,4 +324,12 @@ attributes is an alist keyed on the attribute nreeame."
   (unless (equal new old )
     (let ((self (ucw::parent slot)))
       (setf (modifiedp self) instance
   (unless (equal new old )
     (let ((self (ucw::parent slot)))
       (setf (modifiedp self) instance

-           (modifications self)  (append (list  (type-of new) (type-of old) (type-of value) slot instance )))))))
\ No newline at end of file
+           (modifications self)  (append (list  (type-of new) (type-of old) (type-of value) slot instance )))))))
+
+
+;; This software is Copyright (c) Drew Crampsie, 2004-2005.
+;; You are granted the rights to distribute
+;; and use this software as governed by the terms
+;; of the Lisp Lesser GNU Public License
+;; (http://opensource.franz.com/preamble.html),
+;; known as the LLGPL.