Update of /project/elephant/cvsroot/elephant/src/elephant In directory common-lisp:/tmp/cvs-serv14267/src/elephant
Modified Files: backend.lisp controller.lisp metaclasses.lisp Log Message: Includes most SQL fixes - works under SBCL/ACL. Two problems remain in indexing under SQL for both SBCL/ACL
--- /project/elephant/cvsroot/elephant/src/elephant/backend.lisp 2006/02/19 16:22:43 1.2 +++ /project/elephant/cvsroot/elephant/src/elephant/backend.lisp 2006/02/19 20:06:04 1.3 @@ -41,8 +41,7 @@ #:controller-spec #:controller-root #:controller-class-root - #:root - #:class-root + #:root #:spec #:class-root #:flush-instance-cache ;; Collection generic functions #:build-indexed-btree #:build-btree #:existsp @@ -64,7 +63,6 @@ #:remove-indexed-element-and-adjust #:register-backend-con-init #:lookup-backend-con-init - #:form-slot-key ) (:export ;; Variables @@ -84,8 +82,7 @@ #:controller-spec #:controller-root #:controller-class-root - #:root - #:class-root + #:root #:spec #:class-root #:flush-instance-cache ;; Collection generic functions #:build-indexed-btree #:build-btree #:existsp @@ -107,6 +104,5 @@ #:remove-indexed-element-and-adjust #:register-backend-con-init #:lookup-backend-con-init - #:form-slot-key )) \ No newline at end of file --- /project/elephant/cvsroot/elephant/src/elephant/controller.lisp 2006/02/19 05:13:02 1.2 +++ /project/elephant/cvsroot/elephant/src/elephant/controller.lisp 2006/02/19 20:06:04 1.3 @@ -120,22 +120,6 @@ (progn ,@body) (close-controller *store-controller*))))
-;; ISE: 2/17 - Removing this as it's not clear what usage model requires -;; it unless your often closing a controller while keeping -;; the object around. Usage should be to toss a closed -;; controller so you don't end up with two! -;; -;; (defmacro with-open-controller ((&optional (sc '*store-controller*)) -;; &body body) -;; "Executes body with the specified controller open, closing -;; the controller unconditionally on exit." -;; `(unwind-protect -;; (progn -;; (let ((*store-controller* (open-controller ,sc))) -;; (declare (special *store-controller*)) -;; ,@body)) -;; (close-controller ,sc))) - ;; ;; COMMON STORE CONTROLLER FUNCTIONALITY ;; --- /project/elephant/cvsroot/elephant/src/elephant/metaclasses.lisp 2006/02/19 04:53:00 1.1 +++ /project/elephant/cvsroot/elephant/src/elephant/metaclasses.lisp 2006/02/19 20:06:04 1.2 @@ -326,11 +326,6 @@ when (eq (slot-definition-name slot-def) slot-name) do (return slot-def)))
-;; This this is not a good way to form a key... -(defun form-slot-key (oid name) - (format nil "~A ~A" oid name) - ) - #+(or cmu sbcl) (defun make-persistent-reader (name) (lambda (instance)