ammend last patch

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

diff --git a/src/lisp-on-lines.lisp b/src/lisp-on-lines.lisp
index 465ec5f..3c02bd9 100644 (file)
--- a/src/lisp-on-lines.lisp
+++ b/src/lisp-on-lines.lisp
@@ -8,7 +8,41 @@
 ;;;; or Meta-Model.
 
 ;;;; ** Initialisation
+(defmethod find-default-attributes ((object t))
+  "return the default attributes for a given object using the meta-model's meta-data"
+  (append (mapcar #'(lambda (s) 
+                     (cons (car s) 
+                           (gen-pslot 
+                            (if (meta-model:foreign-key-p object (car s))
+                                'foreign-key
+                                (cadr s))
+                            (string (car s)) (car s)))) 
+                 (meta-model:list-slot-types object))
+         (mapcar #'(lambda (s) 
+                     (cons s (append (gen-pslot 'has-many (string s) s) 
+                                     `(:presentation 
+                                       (make-presentation 
+                                        ,object 
+                                        :type :one-line)))))
+                 (meta-model:list-has-many object))
+         (find-default-presentation-attribute-definitions)))
+
+(defmethod set-default-attributes ((object t))
+  "Set the default attributes for MODEL"
+  (clear-attributes object)
+  (mapcar #'(lambda (x) 
+             (setf (find-attribute object (car x)) (cdr x)))
+         (find-default-attributes object)))
+
+;;;; This automagically initialises any meta model
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (defmethod meta-model::generate-base-class-expander :after (meta-model name args)
+    (set-default-attributes name)))
+
 ;;;; The following macros are used to initialise a set of database tables as LoL objects.
+
+
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defun generate-define-view-for-table (table)
     "
@@ -29,42 +63,59 @@ This involves creating a meta-model, a clsql view-class, and the setting up the
   "expands to init-i-f-t using the listing of tables provided by meta-model"
   `(define-view-for-table ,@(meta-model::list-tables)))
 
+
+
+;;;; These are some macros over the old presentation system.
+;;;; Considered depreciated, they will eventually be implemented in terms of the new
+;;;; display system, and delegated to backwards-compat-0.2.lisp
+
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (defun %make-view (object type &rest attributes-and-args)
-    (let ((attributes (car attributes-and-args))
-         (args (cdr attributes-and-args)))
-      `(mewa:make-presentation
-       ,object
-       :type ,type
-       :initargs
-       '(,@ (when attributes
-              `(:attributes ,attributes))) 
-       ,@args)))) 
-
-(defmethod make-view (object &rest args &key (type :viewer) (attributes nil)
+  (defun %make-view (object type attributes args)
+   
+    (when attributes
+      (setf args
+           (cons `(:attributes ,attributes) args)))
+    `(mewa::make-presentation
+      ,object
+      :type ,type
+      ,@(when args
+             `(:initargs
+               '(,@ (mapcan #'identity args)))))))
+
+(defmethod make-view (object &rest args &key (type :viewer)
                      &allow-other-keys )
-  (apply #'make-presentation (cdr (%make-view object type (cons attributes args)))))
+  (remf args :type)
+  ;(warn "~A ~A" args `(:type ,type :initargs ,@args))
+  (apply #'make-presentation object `(:type ,type ,@ (when args
+                                                      `(:initargs ,args)))))
 
-(defmacro present-view ((object &optional (type :viewer))
+(defmacro present-view ((object &optional (type :viewer) (parent 'self))
                        &body attributes-and-args)
-  `(present ,(%make-view object type attributes-and-args)))
+  (arnesi:with-unique-names (view)
+    `(let ((,view (lol::make-view ,object
+                                :type ,type
+                                ,@(when (car attributes-and-args)
+                                        `(:attributes ',(car attributes-and-args))) 
+                                ,@ (cdr attributes-and-args))))
+      (setf (ucw::parent ,view) ,parent)
+      (lol::present ,view))))
 
 
 (defmacro call-view ((object &optional (type :viewer) (component 'self component-supplied-p))
-                    &body attributes-and-args)
-  
-  
+                    &body attributes-and-args)  
   `(ucw:call-component
     ,component
-    ,(%make-view object type attributes-and-args)))
+    ,(%make-view object type (car attributes-and-args) (cdr attributes-and-args))))
 
 (defmethod slot-view ((self mewa) slot-name)
   (mewa::find-attribute-slot self slot-name))
 
 (defmethod present-slot-view ((self mewa) slot-name &optional (instance (instance self)))
-  (present-slot (slot-view self slot-name) instance))
-
+  (let ((v (slot-view self slot-name)))
 
+     (if v
+        (present-slot v instance)
+        (<:as-html slot-name))))
 
 
 (defmethod find-slots-of-type (model &key (type 'string)
@@ -79,6 +130,10 @@ This involves creating a meta-model, a clsql view-class, and the setting up the
             (lisp-on-lines::list-slot-types model)))))
 
 
+
+
+
+
 (defmethod word-search (class-name slots search-terms 
                        &key (limit 10) (where (sql-and t)))
   (select class-name 
@@ -90,8 +145,7 @@ This involves creating a meta-model, a clsql view-class, and the setting up the
 
 
 (defmethod word-search (class-name slots (s string) &rest args)
-  (apply #'word-search class-name slots 
-        (split-sequence:split-sequence #\Space s) args))
+  (apply #'word-search class-name slots (list s) args))
 
 (defmethod word-search-where (class-name slots search-terms &key (format-string "%~a%"))
   (sql-or 
@@ -104,3 +158,5 @@ This involves creating a meta-model, a clsql view-class, and the setting up the
                              slots)))
           search-terms)))
 
+
+  
\ No newline at end of file