[Zope3-checkins] CVS: Zope3/src/zodb/storage - fsdump.py:1.3.8.3

Jeremy Hylton jeremy@zope.com
Mon, 10 Mar 2003 15:17:32 -0500


Update of /cvs-repository/Zope3/src/zodb/storage
In directory cvs.zope.org:/tmp/cvs-serv24602

Modified Files:
      Tag: opaque-pickles-branch
	fsdump.py 
Log Message:
nrefs comes out of DATA_HDR before the dlen.


=== Zope3/src/zodb/storage/fsdump.py 1.3.8.2 => 1.3.8.3 ===
--- Zope3/src/zodb/storage/fsdump.py:1.3.8.2	Mon Mar 10 15:11:46 2003
+++ Zope3/src/zodb/storage/fsdump.py	Mon Mar 10 15:17:32 2003
@@ -74,7 +74,7 @@
         pos = self.file.tell()
         h = self.file.read(DATA_HDR_LEN)
         assert len(h) == DATA_HDR_LEN
-        oid, revid, prev, tloc, vlen, dlen, nrefs = struct.unpack(DATA_HDR, h)
+        oid, revid, prev, tloc, vlen, nrefs, dlen = struct.unpack(DATA_HDR, h)
         print >> self.dest, "-" * 60
         print >> self.dest, "offset: %d" % pos
         print >> self.dest, "oid: %s" % fmt(oid)
@@ -91,6 +91,7 @@
                   "previous version data offset: %d" % u64(sprevdata)
         print >> self.dest, 'numrefs:', nrefs
         self.file.read(nrefs * 8)
+        # XXX print out the oids?
         print >> self.dest, "len(data): %d" % dlen
         self.file.read(dlen)
         if not dlen: