From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
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=262c7082c23ab266254175438d1524470996c4d2

merged a conflict in dcparser fields
---

diff --git a/librarian/cover.py b/librarian/cover.py
index f93e709..63e4aa0 100644
--- a/librarian/cover.py
+++ b/librarian/cover.py
@@ -118,7 +118,7 @@ class Cover(object):
         }
 
     def __init__(self, book_info):
-        self.author = book_info.author.readable()
+        self.author = ", ".join(auth.readable() for auth in book_info.authors)
         self.title = book_info.title
 
     def pretty_author(self):
diff --git a/librarian/dcparser.py b/librarian/dcparser.py
index aacbdbe..245cf92 100644
--- a/librarian/dcparser.py
+++ b/librarian/dcparser.py
@@ -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,7 +163,6 @@ 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'),
     )
@@ -357,7 +356,6 @@ class BookInfo(WorkInfo):
         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/setup.py b/setup.py
index 4d8ec9b..b1ea926 100755
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def whole_tree(prefix, path):
 
 setup(
     name='librarian',
-    version='1.4',
+    version='1.4.1',
     description='Converter from WolneLektury.pl XML-based language to XHTML, TXT and other formats',
     author="Marek Stępniowski",
     author_email='marek@stepniowski.com',