random fixes

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

diff --git a/src/packages.lisp b/src/packages.lisp
index ab26337..234d6ec 100644 (file)
--- a/src/packages.lisp
+++ b/src/packages.lisp
@@ -1,14 +1,13 @@
 (defpackage :meta-model
 (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
   (: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
    :def-view-class/meta
    :view-class-metadata
    :create-table-from-model


@@ -54,12 +53,13 @@
    :mewa-list-presentation
    :mewa-presentation-search
    :find-attribute 
    :mewa-list-presentation
    :mewa-presentation-search
    :find-attribute 

-   :set-default-leattributes 
+   :set-default-attributes 

    :make-presentation 
    :call-presentation 
    :label
    :attributes
    :set-attribute
    :make-presentation 
    :call-presentation 
    :label
    :attributes
    :set-attribute

+   :set-attribute-properties

    :perform-set-attributes
    :perform-set-attribute-properties
    :find-class-attributes 
    :perform-set-attributes
    :perform-set-attribute-properties
    :find-class-attributes 


@@ -69,16 +69,27 @@
    :save-instance
    :cancel-save-instance
    :ensure-instance-sync
    :save-instance
    :cancel-save-instance
    :ensure-instance-sync

+   :instance-is-stored-p

    :global-properties
    :search-expr
    :search-query))
 
 (defpackage :lisp-on-lines
    :global-properties
    :search-expr
    :search-query))
 
 (defpackage :lisp-on-lines

-  (:use :mewa :meta-model :common-lisp :it.bese.ucw)
+  (:use :mewa :meta-model :common-lisp :it.bese.ucw :js)
+  (:nicknames :lol)

   (:export 
   (:export 

+   ;;;; LoL 
+   :initialize-lol-for-table
+   :initialize-lol-for-database
+
+   ;;;; Ajax
+   :auto-complete
+   :call-auto-complete
+

    ;;;; Mewa Exports
    ;;;; Mewa Exports

+   :mewa ;the superclass of all mewa-presentations

    :make-presentation
    :make-presentation

-
+   :call-presentation

    ;;attributes
    :attributes
    :set-default-attributes
    ;;attributes
    :attributes
    :set-default-attributes


@@ -92,6 +103,13 @@
    :mewa-object-presentation
    :mewa-one-line-presentation
    :mewa-list-presentation
    :mewa-object-presentation
    :mewa-one-line-presentation
    :mewa-list-presentation

+
+   ;; CRUD
+   :instance-is-stored-p
+

    ;;;; Meta Model Exports))
    ;;;; Meta Model Exports))

-   :def-view-class/table
-   :def-view-class/meta))
\ No newline at end of file
+   :define-meta-model
+   :def-view-class-from-table
+   :def-view-class/meta
+   :list-slot-types
+   ))
\ No newline at end of file