X-Git-Url: https://git.hcoop.net/clinton/lisp-on-lines.git/blobdiff_plain/598f1fa8d4a53d8b531ee283b69bba52f3a4bd13..b8c8985156e0ce7de77973d5899221116dcc3c96:/src/lisp-on-lines.lisp diff --git a/src/lisp-on-lines.lisp b/src/lisp-on-lines.lisp index ca00bc5..a5415ae 100644 --- a/src/lisp-on-lines.lisp +++ b/src/lisp-on-lines.lisp @@ -9,6 +9,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-define-view-for-table (table) " @@ -35,7 +36,7 @@ This involves creating a meta-model, a clsql view-class, and the setting up the (when attributes (setf args (cons `(:attributes ,attributes) args))) - `(mewa:make-presentation + `(mewa::make-presentation ,object :type ,type ,@(when args @@ -52,13 +53,13 @@ This involves creating a meta-model, a clsql view-class, and the setting up the (defmacro present-view ((object &optional (type :viewer) (parent 'self)) &body attributes-and-args) (arnesi:with-unique-names (view) - `(let ((,view (lol:make-view ,object + `(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)))) + (lol::present ,view)))) (defmacro call-view ((object &optional (type :viewer) (component 'self component-supplied-p)) @@ -101,8 +102,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