[elephant-cvs] CVS elephant/src/elephant

[ieslick]

Update of /project/elephant/cvsroot/elephant/src/elephant
In directory clnet:/tmp/cvs-serv27196/src/elephant

Modified Files:
	backend.lisp package.lisp query-example.lisp query.lisp 
Log Message:
Fixed package bug.  Minor tweaks elsewhere

--- /project/elephant/cvsroot/elephant/src/elephant/backend.lisp	2007/03/30 23:36:53	1.15
+++ /project/elephant/cvsroot/elephant/src/elephant/backend.lisp	2007/04/01 20:56:19	1.16
@@ -56,6 +56,10 @@
    #:controller-deserialize
    #:root #:spec #:class-root
 
+   ;; Collections
+   #:build-btree
+   #:build-indexed-btree
+
    ;; Serializer tools/api's
    #:serialize #:deserialize
    #:deserialize-from-base64-string
--- /project/elephant/cvsroot/elephant/src/elephant/package.lisp	2007/03/30 14:55:54	1.27
+++ /project/elephant/cvsroot/elephant/src/elephant/package.lisp	2007/04/01 20:56:19	1.28
@@ -206,9 +206,9 @@
    #:persistent #:persistent-object #:persistent-metaclass #:defpclass
    #:persistent-collection #:drop-pobject
 
-   #:btree #:build-btree
+   #:btree #:make-btree
    #:get-value #:remove-kv #:existsp
-   #:indexed-btree #:build-indexed-btree 
+   #:indexed-btree #:make-indexed-btree 
    #:btree-index
    #:add-index #:get-index #:remove-index #:map-indices
    #:get-primary-key #:primary #:key-form #:key-fn
@@ -260,6 +260,9 @@
    #:lookup-persistent-symbol-id
 
    #:struct-constructor
+
+   #:map-class-query
+   #:get-query-instances
    )
   )
 
--- /project/elephant/cvsroot/elephant/src/elephant/query-example.lisp	2007/03/01 02:45:45	1.1
+++ /project/elephant/cvsroot/elephant/src/elephant/query-example.lisp	2007/04/01 20:56:19	1.2
@@ -61,7 +61,7 @@
 	  (slot-value (slot-value person 'department) 'name)))
 
 (defun example-query1 ()
-  "Performs a query against a single class.  Trivial string & integer matchingA"
+  "Performs a query against a single class.  Trivial string & integer matching"
   (map-class-query #'print-person
 		   '((person name = "Greg")
 		     (person salary >= 100000))))
--- /project/elephant/cvsroot/elephant/src/elephant/query.lisp	2007/03/30 14:34:35	1.2
+++ /project/elephant/cvsroot/elephant/src/elephant/query.lisp	2007/04/01 20:56:19	1.3
@@ -41,6 +41,7 @@
       
 (defun get-query-instances (constraints)
   "Get a list of instances according to the query constraints"
+  (declare (dynamic-extent constraints))
   (let ((list nil))
     (flet ((collect (inst)
 	     (push inst list)))
@@ -52,6 +53,7 @@
    slot indices (for last query) and stack allocated test closures.  This is
    a minimally optimizing version that uses the first index it finds, and 
    then does a nested loop join on the rest of the parameters."
+  (declare (dynamic-extent constraints))
   (assert (not (null constraints)))
   (destructuring-bind (class slot relation &rest values) (first constraints)
     (flet ((filter-by-relation (inst)