X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/a1a95fe51f648a7fff2cf92c55a2706d6f7fa3e0..refs/heads/images:/librarian/dcparser.py diff --git a/librarian/dcparser.py b/librarian/dcparser.py index a93ec0a..d99aaf0 100644 --- a/librarian/dcparser.py +++ b/librarian/dcparser.py @@ -126,7 +126,7 @@ class Field(object): class DCInfo(type): def __new__(meta, classname, bases, class_dict): - fields = class_dict['FIELDS'] + fields = list(class_dict['FIELDS']) for base in bases[::-1]: if hasattr(base, 'FIELDS'): @@ -134,9 +134,9 @@ class DCInfo(type): try: fields.index(field) except ValueError: - fields = (field,) + fields + fields.insert(0, field) - class_dict['FIELDS'] = fields + class_dict['FIELDS'] = tuple(fields) return super(DCInfo, meta).__new__(meta, classname, bases, class_dict) @@ -144,7 +144,7 @@ class WorkInfo(object): __metaclass__ = DCInfo FIELDS = ( - Field( DCNS('creator'), 'author', as_person), + Field( DCNS('creator'), 'authors', as_person, salias='author', multiple=True), Field( DCNS('title'), 'title'), Field( DCNS('type'), 'type', required=False, multiple=True), @@ -163,11 +163,9 @@ class WorkInfo(object): 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): @@ -216,7 +214,6 @@ 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): @@ -354,6 +351,10 @@ class BookInfo(WorkInfo): Field( DCNS('contributor.translator'), 'translators', \ as_person, salias='translator', multiple=True, default=[]), Field( DCNS('relation.hasPart'), 'parts', WLURI, multiple=True, 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), )