fixed autocomplete to be more specific

[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 81a33c9..31892be 100644 (file)
--- a/src/lisp-on-lines.lisp
+++ b/src/lisp-on-lines.lisp
@@ -10,7 +10,7 @@
 ;;;; ** Initialisation
 ;;;; The following macros are used to initialise a set of database tables as LoL objects.
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (defun generate-initialize-lol-for-table (table)
+  (defun generate-define-view-for-table (table)
     "
 Generates a form that, when evaluated, initialises the given table as an lol object.
 This involves creating a meta-model, a clsql view-class, and the setting up the default attributes for a mewa presentation"
@@ -19,12 +19,100 @@ This involves creating a meta-model, a clsql view-class, and the setting up the
       (def-view-class-from-table ,table)
       (set-default-attributes (quote ,(meta-model::sql->sym table))))))
     
-(defmacro initialize-lol-for-table (&rest tables)
+(defmacro define-view-for-table (&rest tables)
   " expand to a form which initialises TABLES for use with LOL"
   `(progn
-    ,@(loop for tbl in tables collect (generate-initialize-lol-for-table tbl))
+    ,@(loop for tbl in tables collect (generate-define-view-for-table tbl))
     (values)))
 
-(defmacro initialize-lol-for-database ()
+(defmacro define-views-for-database ()
   "expands to init-i-f-t using the listing of tables provided by meta-model"
-  `(initialize-lol-for-table ,@(meta-model::list-tables)))
\ No newline at end of file
+  `(define-view-for-table ,@(meta-model::list-tables)))
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (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 )
+  (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) (parent 'self))
+                       &body 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)  
+  `(ucw:call-component
+    ,component
+    ,(%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))
+
+
+(defmethod find-slots-of-type (model &key (type 'string)
+                             (types '((string)) types-supplied-p))
+  "returns a list of slots matching TYPE, or matching any of TYPES"
+  (let (ty)
+    (if types-supplied-p 
+       (setf ty types)
+       (setf ty (list type)))
+    (remove nil (mapcar #'(lambda (st) (when (member (second st) ty)
+                                        (first st)))
+            (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 
+         :where (sql-and
+                 where
+                 (word-search-where class-name slots search-terms :format-string "~a%"))
+                          :flatp t
+                          :limit limit))
+
+
+(defmethod word-search (class-name slots (s string) &rest 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 
+   (mapcar #'(lambda (term)
+              (apply #'sql-or 
+                     (mapcar #'(lambda (slot)  
+                                 (sql-uplike
+                                  (sql-slot-value class-name slot)
+                                  (format nil format-string  term)))
+                             slots)))
+          search-terms)))
+
+
+  
\ No newline at end of file