mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge branch 'master' of https://github.com/cbhaley/calibre into master
This commit is contained in:
commit
4b58b7e550
@ -388,13 +388,12 @@ class _Interpreter(object):
|
|||||||
try:
|
try:
|
||||||
name = self.expr(prog.expression)
|
name = self.expr(prog.expression)
|
||||||
res = getattr(self.parent_book, name, None)
|
res = getattr(self.parent_book, name, None)
|
||||||
if res is None:
|
if res is not None:
|
||||||
self.error(_('Unknown field {0}').format(name))
|
if isinstance(res, list):
|
||||||
if isinstance(res, list):
|
fm = self.parent_book.metadata_for_field(name)
|
||||||
fm = self.parent_book.metadata_for_field(name)
|
if fm is None:
|
||||||
if fm is None:
|
return ', '.join(res)
|
||||||
return ', '.join(res)
|
return fm['is_multiple']['list_to_ui'].join(res)
|
||||||
return fm['is_multiple']['list_to_ui'].join(res)
|
|
||||||
return unicode_type(res)
|
return unicode_type(res)
|
||||||
except ValueError as e:
|
except ValueError as e:
|
||||||
raise e
|
raise e
|
||||||
|
Loading…
x
Reference in New Issue
Block a user