[cl-prevalence-cvs] CVS update: cl-prevalence/src/prevalence.lisp

[Sven Van Caekenberghe]

Update of /project/cl-prevalence/cvsroot/cl-prevalence/src
In directory common-lisp.net:/tmp/cvs-serv5940/src

Modified Files:
	prevalence.lisp 
Log Message:
snapshot & backup were broken (thanks to eric blood)

Date: Tue Jul 13 03:30:28 2004
Author: scaekenberghe

Index: cl-prevalence/src/prevalence.lisp
diff -u cl-prevalence/src/prevalence.lisp:1.5 cl-prevalence/src/prevalence.lisp:1.6
--- cl-prevalence/src/prevalence.lisp:1.5	Mon Jun 28 04:56:35 2004
+++ cl-prevalence/src/prevalence.lisp	Tue Jul 13 03:30:28 2004
@@ -1,6 +1,6 @@
 ;;;; -*- mode: Lisp -*-
 ;;;;
-;;;; $Id: prevalence.lisp,v 1.5 2004/06/28 11:56:35 scaekenberghe Exp $
+;;;; $Id: prevalence.lisp,v 1.6 2004/07/13 10:30:28 scaekenberghe Exp $
 ;;;;
 ;;;; Object Prevalence in Common Lisp
 ;;;;
@@ -238,14 +238,14 @@
 	(snapshot (get-snapshot system)))
     (close-open-streams system)
     (when (probe-file snapshot)
-      (copy-file snapshot (merge-pathnames (make-pathname :name (get-snapshot-filename timetag)
+      (copy-file snapshot (merge-pathnames (make-pathname :name (get-snapshot-filename system timetag)
                                                           :type (get-file-extension system))
                                            snapshot)))
     (with-open-file (out snapshot
 			 :direction :output :if-does-not-exist :create :if-exists :supersede)
       (funcall (get-serializer system) (get-root-objects system) out (get-serialization-state system)))
     (when (probe-file transaction-log)
-      (copy-file transaction-log (merge-pathnames (make-pathname :name (get-transaction-log-filename timetag)
+      (copy-file transaction-log (merge-pathnames (make-pathname :name (get-transaction-log-filename system timetag)
                                                                  :type (get-file-extension system))
                                                   transaction-log))
       (delete-file transaction-log))))
@@ -255,10 +255,10 @@
   (let* ((timetag (timetag))
 	 (transaction-log (get-transaction-log system))
 	 (snapshot (get-snapshot system))
-	 (transaction-log-backup (merge-pathnames (make-pathname :name (get-transaction-log-filename timetag)
+	 (transaction-log-backup (merge-pathnames (make-pathname :name (get-transaction-log-filename system timetag)
                                                                  :type (get-file-extension system))
 						  (or directory transaction-log)))
-	 (snapshot-backup (merge-pathnames (make-pathname :name (get-snapshot-filename timetag)
+	 (snapshot-backup (merge-pathnames (make-pathname :name (get-snapshot-filename system timetag)
                                                           :type (get-file-extension system))
 					   (or directory snapshot))))
     (close-open-streams system)