From c11dad792c884e7f55331ddf9a683bc7932ef6a5 Mon Sep 17 00:00:00 2001
From: GRiker <griker@hotmail.com>
Date: Wed, 10 Mar 2010 04:56:37 -0700
Subject: [PATCH] GwR paranoia about '@' preceding dkey

---
 src/calibre/ebooks/metadata/topaz.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/metadata/topaz.py b/src/calibre/ebooks/metadata/topaz.py
index bed982011d..d7bbff0f7f 100644
--- a/src/calibre/ebooks/metadata/topaz.py
+++ b/src/calibre/ebooks/metadata/topaz.py
@@ -201,7 +201,8 @@ class MetadataUpdater(object):
                 break
         dkey = self.topaz_headers[x]
         dks = StringIO.StringIO()
-        dks.write('d@')
+        dks.write(self.eod)
+        dks.write(self.base_value)
         dks.write(self.encode_vwi(len(dkey['tag'])))
         offset += 1
         dks.write(dkey['tag'])
@@ -263,9 +264,10 @@ class MetadataUpdater(object):
             topaz_headers[x] = dict(tag=tag,blocks=blocks)
         self.topaz_headers = topaz_headers
 
-        eod = self.data[offset]
+        self.eod = self.data[offset]
         offset += 1
         self.base = offset
+        self.base_value = self.data[offset]
 
         return md_header_offset, topaz_headers