From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Tue, 20 Dec 2011 09:35:55 +0000 (+0100)
Subject: Merge branch 'picture' into pretty
X-Git-Tag: 1.7~182
X-Git-Url: https://git.mdrn.pl/librarian.git/commitdiff_plain/262c7082c23ab266254175438d1524470996c4d2?ds=inline;hp=--cc

Merge branch 'picture' into pretty

Conflicts:
	librarian/dcparser.py
---

262c7082c23ab266254175438d1524470996c4d2
diff --cc librarian/dcparser.py
index 57308c6,a93ec0a..aacbdbe
--- a/librarian/dcparser.py
+++ b/librarian/dcparser.py
@@@ -142,15 -163,11 +163,10 @@@ 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('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),
 -
 -        )
 +    )
  
      @classmethod
      def from_string(cls, xml):
@@@ -324,5 -341,21 +340,26 @@@
  
          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('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('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),
++
+     )
+ 
+ 
+ def parse(file_name, cls=BookInfo):
+     return cls.from_file(file_name)