Fix catalog generation when catalog title contains ampersands. Fixes #1078020 (cannot create epub catalogue)

This commit is contained in:
Kovid Goyal 2012-11-13 07:27:09 +05:30
commit dd4570c02b
2 changed files with 3 additions and 3 deletions

View File

@ -408,8 +408,8 @@ class EPUB_MOBI(CatalogPlugin):
# Run ebook-convert # Run ebook-convert
from calibre.ebooks.conversion.plumber import Plumber from calibre.ebooks.conversion.plumber import Plumber
plumber = Plumber(os.path.join(catalog.catalog_path, plumber = Plumber(os.path.join(catalog.catalog_path, opts.basename + '.opf'),
opts.basename + '.opf'), path_to_output, log, report_progress=notification, path_to_output, log, report_progress=notification,
abort_after_input_dump=False) abort_after_input_dump=False)
plumber.merge_ui_recommendations(recommendations) plumber.merge_ui_recommendations(recommendations)
plumber.run() plumber.run()

View File

@ -3905,7 +3905,7 @@ class CatalogBuilder(object):
mtc = 0 mtc = 0
titleTag = Tag(soup, "dc:title") titleTag = Tag(soup, "dc:title")
titleTag.insert(0,self.opts.catalog_title) titleTag.insert(0,escape(self.opts.catalog_title))
metadata.insert(mtc, titleTag) metadata.insert(mtc, titleTag)
mtc += 1 mtc += 1