From: Marcin Koziej Date: Tue, 20 Dec 2011 10:16:31 +0000 (+0100) Subject: merged a conflict in dcparser fields X-Git-Tag: 1.7~181 X-Git-Url: https://git.mdrn.pl/librarian.git/commitdiff_plain/1f3e067b075c8c20609c4ebbada2c543f2717082?hp=808e7c2967440cacbc15af82cde171e10aea8a6a merged a conflict in dcparser fields --- diff --git a/librarian/dcparser.py b/librarian/dcparser.py index 4fd0f66..245cf92 100644 --- a/librarian/dcparser.py +++ b/librarian/dcparser.py @@ -148,18 +148,24 @@ class WorkInfo(object): Field( DCNS('title'), 'title'), Field( DCNS('type'), 'type', required=False, multiple=True), - Field( DCNS('subject.period'), 'epochs', salias='epoch', multiple=True), - Field( DCNS('subject.type'), 'kinds', salias='kind', multiple=True), - Field( DCNS('subject.genre'), 'genres', salias='genre', multiple=True), + Field( DCNS('contributor.editor'), 'editors', \ + as_person, salias='editor', multiple=True, default=[]), + Field( DCNS('contributor.technical_editor'), 'technical_editors', + as_person, salias='technical_editor', multiple=True, default=[]), Field( DCNS('date'), 'created_at', as_date), Field( DCNS('date.pd'), 'released_to_public_domain_at', as_date, required=False), Field( DCNS('publisher'), 'publisher'), + Field( DCNS('language'), 'language'), + Field( DCNS('description'), 'description', required=False), + Field( DCNS('source'), 'source_name', required=False), Field( DCNS('source.URL'), 'source_url', required=False), Field( DCNS('identifier.url'), 'url', WLURI), - ) + Field( DCNS('rights.license'), 'license', required=False), + Field( DCNS('rights'), 'license_description'), + ) @classmethod def from_string(cls, xml): @@ -208,6 +214,7 @@ class WorkInfo(object): fv.append(e.text) field_dict[e.tag] = fv + print field_dict return cls(desc.attrib, field_dict) def __init__(self, rdf_attrs, dc_fields): @@ -337,17 +344,15 @@ 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('subject.period'), 'epochs', salias='epoch', multiple=True), + Field( DCNS('subject.type'), 'kinds', salias='kind', multiple=True), + Field( DCNS('subject.genre'), 'genres', salias='genre', multiple=True), + 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), diff --git a/librarian/picture.py b/librarian/picture.py index 7830528..70b372f 100644 --- a/librarian/picture.py +++ b/librarian/picture.py @@ -30,9 +30,13 @@ class PictureInfo(WorkInfo): Dublin core metadata for a picture """ FIELDS = ( - Field(DCNS('format.dimensions.digital'), 'dimensions', required=False), - Field(DCNS('format.dimensions.original'), 'dimensions_original', required=False), - Field(DCNS('format.physical'), 'physical', required=False), + Field(DCNS('language'), 'language', required=False), + Field(DCNS('subject.period'), 'epochs', salias='epoch', multiple=True), + Field(DCNS('subject.type'), 'kinds', salias='kind', multiple=True), + + Field(DCNS('format.dimensions'), 'dimensions', required=False), + Field(DCNS('description.medium'), 'medium', required=False), + Field(DCNS('description.dimensions'), 'original_dimensions', required=False), Field(DCNS('format'), 'mime_type', required=False), Field(DCNS('identifier.url'), 'url', WLPictureURI), ) @@ -42,7 +46,7 @@ class PictureInfo(WorkInfo): WorkInfo has a language validation code only, which we do not need. """ pass - + class ImageStore(object): EXT = ['gif', 'jpeg', 'png', 'swf', 'psd', 'bmp' diff --git a/tests/files/picture/angelus-novus.xml b/tests/files/picture/angelus-novus.xml index ae2afbc..032545d 100644 --- a/tests/files/picture/angelus-novus.xml +++ b/tests/files/picture/angelus-novus.xml @@ -4,21 +4,24 @@ Klee, Paul Angelus Novus Fundacja Nowoczesna Polska + Sekuła, Aleksandra + Kwiatkowska, Katarzyna + Trzeciak, Weronika Modernizm Obraz - Akwarela Publikacja zrealizowana w ramach projektu Wolne Lektury (http://wolnelektury.pl). Reprodukcja cyfrowa wykonana przez Bibliotekę Narodową z egzemplarza pochodzącego ze zbiorów BN. + 31.8 × 24.2 cm + Akwarela na papierze http://wolnelektury.pl/katalog/obraz/angelus-novus http://katilifox.files.wordpress.com/2011/04/1190051611_angelus-novus.jpg - + Muzeum Narodowe, inw. 00000000. Domena publiczna - Paul Klee zm. 1940 1940 Image image/png 1645 x 2000 px - 31.8 × 24.2 cm - Akwarela na papierze 1920 + lat @@ -28,7 +31,7 @@
- +