X-Git-Url: https://git.hcoop.net/clinton/lisp-on-lines.git/blobdiff_plain/d25124264c5fc11612eee640a7ef568ed08d7db6..1d51a2eea8537084e9e681c297422047ae858989:/src/packages.lisp

diff --git a/src/packages.lisp b/src/packages.lisp
dissimilarity index 92%
index da10eed..ba61e89 100644
--- a/src/packages.lisp
+++ b/src/packages.lisp
@@ -1,113 +1,106 @@
-(defpackage :meta-model
-  (: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
-   :define-meta-model
-   :def-view-class-from-table
-   :def-view-class/meta
-   :view-class-metadata
-   :create-table-from-model
-   :list-slots
-   :list-slot-types
-   :slot-type
-   :display-slot
-   :list-joins
-   :list-join-attributes
-   :list-keys
-   :list-view-classes
-   :display-slot
-   :primary-key-p
-   :list-foreign-keys
-   :foreign-key-p
-   :explode-foreign-key
-   :find-join-class
-   :find-join-key
-   :find-default-value
-   :explode-foreign-key
-   :list-has-many
-   :list-many-to-many
-   :sync-instance
-   :explode-has-many
-   :expr-ends-with
-   :expr-starts-with
-   :expr-contains
-   :expr-=
-   :expr-<
-   :expr->
-   :expr-and
-   :expr-or
-   :expr-not
-   :select-instances))
-
-
-(defpackage :mewa 
-  (:use :ucw :common-lisp)
-  (:export 
-   :mewa 
-   :mewa-object-presentation 
-   :mewa-one-line-presentation
-   :mewa-list-presentation
-   :mewa-presentation-search
-   :find-attribute 
-   :set-default-attributes 
-   :make-presentation 
-   :call-presentation 
-   :label
-   :attributes
-   :set-attribute
-   :perform-set-attributes
-   :perform-set-attribute-properties
-   :find-class-attributes 
-   :default-attributes 
-   :ok
-   :edit-instance
-   :save-instance
-   :cancel-save-instance
-   :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 :js)
-  (:nicknames :lol)
-  (:export 
-   ;;;; LoL 
-   :initialize-lol-for-table
-   :initialize-lol-for-database
-
-   ;;;; Ajax
-   :auto-complete
-   :call-auto-complete
-
-   ;;;; 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
+(defpackage :lisp-on-lines
+  (:use :arnesi
+	;:iterate
+	;:meta-model
+	:common-lisp
+	;:it.bese.ucw
+	;:clsql
+	:contextl)
+  (:nicknames :lol :mewa)
+
+  #+nil(:shadowing-import-from
+   :ucw
+   :parent)
+  
+  #+nil(:shadowing-import-from
+   :iterate
+   :with)
+
+#+nil  (:shadowing-import-from
+   :clsql
+   :time-difference
+   :make-time
+   :time-ymd
+   :date-ymd
+   :date
+   :get-time
+   :time-element
+   :time+
+   :date-element)
+  
+  (:export
+
+   #:find-description
+   #:ensure-description
+   #:define-description
+
+   #:define-display
+   #:display
+   #:*display*
+   #:*object*
+   
+   #:find-attribute
+   #:attribute-label
+
+
+
+   ;;;; CLSQL meta-model/default attributes definers
+   ;;;; TODO: should be moved to meta-model,
+   ;;;; with lol specific function implemented like the
+   ;;;; CLOS meta-model
+   :define-view-for-table
+   :define-views-for-database
+
+
+   ;;;; The LoL 3 displays
+   #:defdisplay
+   #:defdescription
+   #:defattribute
+   #:display
+   #:display*
+   #:display-using-description
+   #:display-attribute
+   #:call-display
+
+   #:standard-attribute
+   #:attribute.name
+
+;;;; Standard Layers
+
+   #:editor
+   #:one-line
+   #:as-string
+   #:as-table
+;;;; Wrapping layers
+   #:wrap-div
+   #:wrap-link
+   
+   #:show-attribute-labels
+   ;;;; "Lines", the newest creation.
+   :defline
+
+   ;;;; A macro shortcut for creating ucw actions
+   :action
+
+   ;;;; Mewa Exports
+   :find-occurence
+
+   ;;attributes
+   :attributes
+   :attribute-value
+   :define-attributes
+   :with-default-attributes
+   :set-default-attributes
+   :set-attribute
+   :find-attribute
+
+   ;; Some CRUD
+   #:crud
+   #:crud-editor
+   #:crud-viewer
+   #:crud-summary
+   #:crud-database
+   #:instance))
+
+(cl:defpackage #:lol-test
+  (:use :cl :lisp-on-lines :stefil :contextl))
\ No newline at end of file