cvs server: Diffing .
Index: Makefile
===================================================================
RCS file: /project/elephant/cvsroot/elephant/Makefile,v
retrieving revision 1.6.2.1
diff -r1.6.2.1 Makefile
11c11,12
< DB43DIR=/usr/local/BerkeleyDB.4.3/
---
> #DB43DIR=/usr/local/BerkeleyDB.4.3/
> DB43DIR=/sw
13c14,15
< DBINCDIR=$(DB43DIR)/include/
---
> #DBINCDIR=$(DB43DIR)/include/
> DBINCDIR=$(DB43DIR)/include/db4/
cvs server: Diffing doc
cvs server: Diffing doc/includes
cvs server: Diffing src
Index: src/bdb-enable.lisp
===================================================================
RCS file: /project/elephant/cvsroot/elephant/src/Attic/bdb-enable.lisp,v
retrieving revision 1.1.2.1
diff -r1.1.2.1 bdb-enable.lisp
89c89,92
<        "/usr/local/BerkeleyDB.4.3/lib/libdb.dylib" 
---
>        ;; for Fink
>        "/sw/lib/libdb-4.3.dylib"
>        ;; a possible manual install
>        ;"/usr/local/BerkeleyDB.4.3/lib/libdb.dylib" 
Index: src/metaclasses.lisp
===================================================================
RCS file: /project/elephant/cvsroot/elephant/src/metaclasses.lisp,v
retrieving revision 1.7.2.1
diff -r1.7.2.1 metaclasses.lisp
79c79
<   (dbonnection-spec-pst :type list :accessor :dbcn-spc-pst :initarg :dbconnection-spec-pst
---
>   (dbonnection-spec-pst :type (or list string) :accessor :dbcn-spc-pst :initarg :dbconnection-spec-pst
Index: src/sql-collections.lisp
===================================================================
RCS file: /project/elephant/cvsroot/elephant/src/Attic/sql-collections.lisp,v
retrieving revision 1.1.2.2
diff -r1.1.2.2 sql-collections.lisp
63,66c63
< ;; Can this be right?
< 	    (let ((v (sql-get-from-clcn (oid (primary bt)) pk sc con)))
< 	      (values v T))
< 	    (values nil nil))
---
> 	    (sql-get-from-clcn (oid (primary bt)) pk sc con))
74,78c71
<       (let ((pk (sql-get-from-clcn (oid bt) key sc con)))
< 	(if pk 
< 	    (values pk T)
< 	    (values nil nil))
< 	)))
---
> 	(sql-get-from-clcn (oid bt) key sc con)))
Index: src/sql-controller.lisp
===================================================================
RCS file: /project/elephant/cvsroot/elephant/src/Attic/sql-controller.lisp,v
retrieving revision 1.1.2.1
diff -r1.1.2.1 sql-controller.lisp
147,151c147,148
< 	 (con (controller-db sc))
< 	 (v (sql-get-from-clcn (oid bt) key sc con)))
< 	   (if v 
< 	       (values v t)
< 	       (values nil nil))))
---
> 	 (con (controller-db sc)))
>     (sql-get-from-clcn (oid bt) key sc con)))
385c382
< 			      :database-type :postgresql
---
> 			      :database-type :sqlite3 ;DNK :postgresql
452c449
<     (if (and (not insert-only) (sql-get-from-clcn clcn key sc con))
---
>     (if (and (not insert-only) (sql-from-clcn-existsp clcn key con))
471,475c468
<   (let ((v (sql-get-from-clcn 0 key sc con)))
<     (if v 
< 	(values v t)
< 	(values nil nil)))
<   )
---
>   (sql-get-from-clcn 0 key sc con))
515,522c508,516
<     (if (< (length tuples) n)
< 	nil
< 	(nth n (sort 
< 		(mapcar 
< 		 #'(lambda (x)
< 		     (deserialize-from-base64-string (car x) :sc sc))
< 		 tuples)
< 		#'my-generic-less-than)))))
---
>     (if (< n (length tuples))
> 	(values (nth n (sort 
> 			(mapcar 
> 			 #'(lambda (x)
> 			     (deserialize-from-base64-string (car x) :sc sc))
> 			 tuples)
> 			#'my-generic-less-than))
> 		t)
> 	(values nil nil))))
547c541
<   (sql-get-from-clcn 0 key con)
---
>   (sql-from-clcn-existsp 0 key con)
640,645c634,638
<     (let ((v 
< 	   (sql-get-from-root
< 	    (form-slot-key (oid instance) name)
< 	    sc con
< 	    )))
<       (if v
---
>     (multiple-value-bind (v existsp)
> 	(sql-get-from-root
> 	 (form-slot-key (oid instance) name)
> 	 sc con)
>       (if existsp
652c645
< 	   (if (sql-get-from-root
---
> 	   (if (sql-from-root-existsp
654c647
< 		sc con )
---
> 		con )
cvs server: Diffing tests