Major refactoring of meta-model code + added dependancy on cl-pg-introspect + patches

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

diff --git a/src/packages.lisp b/src/packages.lisp
index 267ca22..29815b3 100644 (file)
--- a/src/packages.lisp
+++ b/src/packages.lisp
@@ -1,14 +1,13 @@
 (defpackage :meta-model
-  (:use :common-lisp :clsql)
+  (:use :common-lisp :clsql :clsql-pg-introspect)
+  (:shadow :primary-key-p)
   (:export
    :meta-model-class
    :meta-model.base-type
    :meta-model.instance
    :meta-model.metadata
-   :def-meta-model
-   :def-base-class
-   :%def-base-class
-   :def-view-class/table
+   :define-meta-model
+   :def-view-class-from-table
    :def-view-class/meta
    :view-class-metadata
    :create-table-from-model
@@ -32,7 +31,17 @@
    :list-has-many
    :list-many-to-many
    :sync-instance
-   :explode-has-many))
+   :explode-has-many
+   :expr-ends-with
+   :expr-starts-with
+   :expr-contains
+   :expr-=
+   :expr-<
+   :expr->
+   :expr-and
+   :expr-or
+   :expr-not
+   :select-instances))
 
 
 (defpackage :mewa 
@@ -40,21 +49,63 @@
   (:export 
    :mewa 
    :mewa-object-presentation 
-   :mewa-one-line-presentation 
+   :mewa-one-line-presentation
+   :mewa-list-presentation
+   :mewa-presentation-search
    :find-attribute 
    :set-default-attributes 
    :make-presentation 
    :call-presentation 
-   :label 
-   :set-attribute 
+   :label
+   :attributes
+   :set-attribute
+   :perform-set-attributes
+   :perform-set-attribute-properties
    :find-class-attributes 
    :default-attributes 
    :ok
    :edit-instance
    :save-instance
    :cancel-save-instance
-   :global-properties))
-
+   :ensure-instance-sync
+   :instance-is-stored-p
+   :global-properties
+   :search-expr
+   :search-query))
 
 (defpackage :lisp-on-lines
-  (:use :mewa :meta-model :common-lisp :it.bese.ucw))
\ No newline at end of file
+  (:use :mewa :meta-model :common-lisp :it.bese.ucw :js)
+  (:nicknames :lol)
+  (:export 
+   ;;;; LoL 
+   :initialize-lol-for-table
+   :initialize-lol-for-database
+
+
+
+   ;;;; Mewa Exports
+   :mewa ;the superclass of all mewa-presentations
+   :make-presentation
+   :call-presentation
+   ;;attributes
+   :attributes
+   :set-default-attributes
+   :set-attribute
+   :find-attribute
+   :perform-set-attributes
+   ;;
+   :perform-set-attribute-properties
+
+   ;; presentation objects
+   :mewa-object-presentation
+   :mewa-one-line-presentation
+   :mewa-list-presentation
+
+   ;; CRUD
+   :instance-is-stored-p
+
+   ;;;; Meta Model Exports))
+   :def-view-class/table
+   :def-view-class/meta
+   :list-slot-types
+   ))
\ No newline at end of file