# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: user@zedonline.net-20120604154847-t7guptjke0hxc2ge
# target_branch: http://bazaar.launchpad.net/~kovid/calibre/trunk/
# testament_sha1: db5b255026cd4d709d424862a5c19594693a2b4f
# timestamp: 2012-06-04 08:49:02 -0700
# base_revision_id: kovid@kovidgoyal.net-20120604125830-\
#   rtnbscvq73yat7u0
# 
# Begin patch
=== modified file 'src/calibre/devices/prst1/driver.py'
--- src/calibre/devices/prst1/driver.py	2012-06-04 04:25:47 +0000
+++ src/calibre/devices/prst1/driver.py	2012-06-04 15:48:47 +0000
@@ -276,7 +276,7 @@
 
     def get_database_min_id(self, source_id):
         sequence_min = 0L
-        if source_id == '1':
+        if source_id == 1:
             sequence_min = 4294967296L
 
         return sequence_min
@@ -304,6 +304,8 @@
         sequence_max = sequence_min
         sequence_dirty = 0
 
+        debug_print("Book Sequence Min: %d, Source Id: %d"%(sequence_min,source_id))
+
         try:
             cursor = connection.cursor()
 
@@ -334,6 +336,7 @@
 
         # If the database is 'dirty', then we should fix up the Ids and the sequence number
         if sequence_dirty == 1:
+            debug_print("Book Sequence Dirty for Source Id: %d"%source_id)
             sequence_max = sequence_max + 1
             for book, bookId in db_books.items():
                 if bookId < sequence_min:
@@ -370,6 +373,7 @@
                     cursor.execute(query, t)
 
             self.set_database_sequence_id(connection, 'books', sequence_max)
+            debug_print("Book Sequence Max: %d, Source Id: %d"%(sequence_max,source_id))
 
         cursor.close()
         return db_books
@@ -469,6 +473,8 @@
         sequence_max = sequence_min
         sequence_dirty = 0
 
+        debug_print("Collection Sequence Min: %d, Source Id: %d"%(sequence_min,source_id))
+
         try:
             cursor = connection.cursor()
 
@@ -496,6 +502,7 @@
 
         # If the database is 'dirty', then we should fix up the Ids and the sequence number
         if sequence_dirty == 1:
+            debug_print("Collection Sequence Dirty for Source Id: %d"%source_id)
             sequence_max = sequence_max + 1
             for collection, collectionId in db_collections.items():
                 if collectionId < sequence_min:
@@ -514,11 +521,14 @@
                     cursor.execute(query, t)
 
             self.set_database_sequence_id(connection, 'collection', sequence_max)
+            debug_print("Collection Sequence Max: %d, Source Id: %d"%(sequence_max,source_id))
 
         # Fix up the collections table now...
         sequence_dirty = 0
         sequence_max = sequence_min
 
+        debug_print("Collections Sequence Min: %d, Source Id: %d"%(sequence_min,source_id))
+
         query = 'SELECT _id FROM collections'
         cursor.execute(query)
 
@@ -531,6 +541,7 @@
                 sequence_max = max(sequence_max, row[0])
 
         if sequence_dirty == 1:
+            debug_print("Collections Sequence Dirty for Source Id: %d"%source_id)
             sequence_max = sequence_max + 1
             for pairId in db_collection_pairs:
                 if pairId < sequence_min:
@@ -541,6 +552,7 @@
                     sequence_max = sequence_max + 1
 
             self.set_database_sequence_id(connection, 'collections', sequence_max)
+            debug_print("Collections Sequence Max: %d, Source Id: %d"%(sequence_max,source_id))
 
         cursor.close()
         return db_collections

# Begin bundle
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