Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Catalogs: Fixed a problem occurring when merging comments with a custom field whose type is a list.

Browse Source
This commit is contained in:
Kovid Goyal 2012-11-13 18:48:03 +05:30
commit 19a8736724
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/library/catalogs/epub_mobi_builder.py
View File

@ -4615,6 +4615,8 @@ class CatalogBuilder(object):
index_is_id=True) index_is_id=True)
if addendum is None: if addendum is None:
addendum = '' addendum = ''
elif type(addendum) is list:
addendum = (', '.join(addendum))
include_hr = eval(self.merge_comments_rule['hr']) include_hr = eval(self.merge_comments_rule['hr'])
if self.merge_comments_rule['position'] == 'before': if self.merge_comments_rule['position'] == 'before':
merged = addendum merged = addendum
@ -4631,10 +4633,12 @@ class CatalogBuilder(object):
merged += '\n' merged += '\n'
merged += addendum merged += addendum
else: else:
# Return the custom field contents # Return only the custom field contents
merged = self.db.get_field(record['id'], merged = self.db.get_field(record['id'],
self.merge_comments_rule['field'], self.merge_comments_rule['field'],
index_is_id=True) index_is_id=True)
if type(merged) is list:
merged = (', '.join(merged))
return merged return merged