0005781: Errors with Merge Citations. Amended so it checks whether the first citation processed for a particular page/volume/confidence/date (as applicable) has notes.

svn: r19762
2012-06-05 18:19:13 +00:00
parent 7bf5c1147e
commit 2a9c9dd07f
1 changed files with 1 additions and 1 deletions
--- a/src/plugins/tool/MergeCitations.py
+++ b/src/plugins/tool/MergeCitations.py
@@ -215,7 +215,7 @@ class MergeCitations(tool.BatchTool,ManagedWindow.ManagedWindow):
                            "citation backlink handles", \
                            list(db.find_backlink_handles(citation.get_handle()))
                        num_merges += 1
-                    else:
+                    elif (not dont_merge_notes or len(citation.note_list) == 0):
                        dict[key] = citation_handle
                    self.progress.step()
        db.enable_signals()