Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed problems that bibliography ignores media attached to citations, so if that is the only 'interesting' thing about the citation, the citation media is not output

Browse Source 
svn: r20771
This commit is contained in:
Tim G L Lyons 2012-12-05 22:55:51 +00:00
parent e0fb0efbea
commit 7f2b854632
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gen/plug/report/_bibliography.py
View File

@ -109,7 +109,8 @@ class Bibliography(object):
MODE_PAGE = 2**1 MODE_PAGE = 2**1
MODE_CONF = 2**2 MODE_CONF = 2**2
MODE_NOTE = 2**3 MODE_NOTE = 2**3
MODE_ALL = MODE_DATE | MODE_PAGE | MODE_CONF | MODE_NOTE MODE_MEDIA = 2**4
MODE_ALL = MODE_DATE | MODE_PAGE | MODE_CONF | MODE_NOTE | MODE_MEDIA
def __init__(self, mode=MODE_ALL): def __init__(self, mode=MODE_ALL):
""" """
@ -123,6 +124,7 @@ class Bibliography(object):
MODE_PAGE MODE_PAGE
MODE_CONF MODE_CONF
MODE_NOTE MODE_NOTE
MODE_MEDIA
MODE_ALL MODE_ALL
If you only care about pages, set "mode=MODE_PAGE". If you only care about pages, set "mode=MODE_PAGE".
@ -218,6 +220,9 @@ class Bibliography(object):
if ( self.mode & self.MODE_NOTE ) == self.MODE_NOTE: if ( self.mode & self.MODE_NOTE ) == self.MODE_NOTE:
if len(source_ref.get_note_list()) != 0: if len(source_ref.get_note_list()) != 0:
return True return True
if ( self.mode & self.MODE_MEDIA ) == self.MODE_MEDIA:
if len(source_ref.get_media_list()) != 0:
return True
# Can't find anything interesting. # Can't find anything interesting.
return False return False
@ -258,5 +263,13 @@ class Bibliography(object):
for notehandle in nl1: for notehandle in nl1:
if notehandle not in nl2: if notehandle not in nl2:
return False return False
if ( self.mode & self.MODE_MEDIA ) == self.MODE_MEDIA:
nl1 = source_ref1.get_media_list()
nl2 = source_ref2.get_media_list()
if len(nl1) != len(nl2):
return False
for mediahandle in nl1:
if mediahandle not in nl2:
return False
# Can't find anything different. They must be equal. # Can't find anything different. They must be equal.
return True return True