From 8a0a978c526803acf6beb961009a1e3d56aeacee Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 26 Jul 2011 21:02:25 -0600
Subject: [PATCH] ...

---
 src/calibre/ebooks/mobi/debug.py        | 1 +
 src/calibre/ebooks/mobi/writer2/main.py | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/calibre/ebooks/mobi/debug.py b/src/calibre/ebooks/mobi/debug.py
index cb028b9055..fe1e928dea 100644
--- a/src/calibre/ebooks/mobi/debug.py
+++ b/src/calibre/ebooks/mobi/debug.py
@@ -182,6 +182,7 @@ class EXTHHeader(object):
         self.records = []
         for i in xrange(self.count):
             pos = self.read_record(pos)
+        self.records.sort(key=lambda x:x.type)
 
     def read_record(self, pos):
         type_, length = struct.unpack(b'>II', self.raw[pos:pos+8])
diff --git a/src/calibre/ebooks/mobi/writer2/main.py b/src/calibre/ebooks/mobi/writer2/main.py
index e614567508..8925d7f281 100644
--- a/src/calibre/ebooks/mobi/writer2/main.py
+++ b/src/calibre/ebooks/mobi/writer2/main.py
@@ -29,7 +29,6 @@ EXTH_CODES = {
     'identifier': 104,
     'subject': 105,
     'pubdate': 106,
-    'date': 106,
     'review': 107,
     'contributor': 108,
     'rights': 109,
@@ -479,16 +478,17 @@ class MobiWriter(object):
         nrecs += 1
 
         # Write cdetype
-        if not self.opts.mobi_periodical:
+        if (self.primary_index_record_idx is None or not
+                self.indexer.is_periodical):
             data = b'EBOK'
             exth.write(pack(b'>II', 501, len(data)+8))
             exth.write(data)
             nrecs += 1
 
         # Add a publication date entry
-        if oeb.metadata['date'] != [] :
+        if oeb.metadata['date']:
             datestr = str(oeb.metadata['date'][0])
-        elif oeb.metadata['timestamp'] != [] :
+        elif oeb.metadata['timestamp']:
             datestr = str(oeb.metadata['timestamp'][0])
 
         if datestr is not None: