From: Radek Czajka Date: Fri, 16 Dec 2011 16:12:33 +0000 (+0100) Subject: Merge branch 'picture' into pretty X-Git-Tag: 1.7~181^2~1 X-Git-Url: https://git.mdrn.pl/librarian.git/commitdiff_plain/05b19dad8ca44136e064abcc6beff5dac4489c60 Merge branch 'picture' into pretty Conflicts: librarian/dcparser.py --- 05b19dad8ca44136e064abcc6beff5dac4489c60 diff --cc librarian/dcparser.py index 57308c6,f5fd42a..69175e6 --- a/librarian/dcparser.py +++ b/librarian/dcparser.py @@@ -324,5 -332,24 +332,27 @@@ class WorkInfo(object) return result - def parse(file_name): - return BookInfo.from_file(file_name) + + class BookInfo(WorkInfo): + FIELDS = ( + Field( DCNS('audience'), 'audiences', salias='audience', multiple=True, + required=False), + Field( DCNS('contributor.editor'), 'editors', \ + as_person, salias='editor', multiple=True, default=[]), + Field( DCNS('contributor.translator'), 'translators', \ + as_person, salias='translator', multiple=True, default=[]), + Field( DCNS('contributor.technical_editor'), 'technical_editors', + as_person, salias='technical_editor', multiple=True, default=[]), + Field( DCNS('relation.hasPart'), 'parts', WLURI, multiple=True, required=False), + Field( DCNS('rights.license'), 'license', required=False), + Field( DCNS('rights'), 'license_description'), + Field( DCNS('language'), 'language'), + Field( DCNS('description'), 'description', required=False), ++ Field( DCNS('relation.cover_image.url'), 'cover_url', required=False), ++ Field( DCNS('relation.cover_image.attribution'), 'cover_by', required=False), ++ Field( DCNS('relation.cover_image.source'), 'cover_source', required=False), + ) + + + def parse(file_name, cls=BookInfo): + return cls.from_file(file_name)