From a1a95fe51f648a7fff2cf92c55a2706d6f7fa3e0 Mon Sep 17 00:00:00 2001
From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Mon, 19 Dec 2011 10:42:34 +0100
Subject: [PATCH] DC fixups for Pictures

---
 librarian/dcparser.py                 | 28 ++++++++++++++++-----------
 librarian/picture.py                  | 12 ++++++++----
 tests/files/picture/angelus-novus.xml | 13 ++++++++-----
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/librarian/dcparser.py b/librarian/dcparser.py
index f5fd42a..a93ec0a 100644
--- a/librarian/dcparser.py
+++ b/librarian/dcparser.py
@@ -148,17 +148,25 @@ 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
@@ -208,6 +216,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 +346,14 @@ 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),
     )
 
 
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..ae72d55 100644
--- a/tests/files/picture/angelus-novus.xml
+++ b/tests/files/picture/angelus-novus.xml
@@ -4,21 +4,24 @@
       <dc:creator xml:lang="pl">Klee, Paul</dc:creator>
       <dc:title xml:lang="la">Angelus Novus</dc:title>
       <dc:publisher xml:lang="pl">Fundacja Nowoczesna Polska</dc:publisher>
+      <dc:contributor.editor xml:lang="pl" xmlns:dc="http://purl.org/dc/elements/1.1/">Sekuła, Aleksandra</dc:contributor.editor>
+      <dc:contributor.editor xml:lang="pl" xmlns:dc="http://purl.org/dc/elements/1.1/">Kwiatkowska, Katarzyna</dc:contributor.editor>
+      <dc:contributor.technical_editor xml:lang="pl" xmlns:dc="http://purl.org/dc/elements/1.1/">Trzeciak, Weronika</dc:contributor.technical_editor>
       <dc:subject.period xml:lang="pl">Modernizm</dc:subject.period>
       <dc:subject.type xml:lang="pl">Obraz</dc:subject.type>
-      <dc:subject.genre xml:lang="pl">Akwarela</dc:subject.genre>
       <dc:description xml:lang="pl">Publikacja zrealizowana w ramach projektu Wolne Lektury (http://wolnelektury.pl). Reprodukcja cyfrowa wykonana przez Bibliotekę Narodową z egzemplarza pochodzącego ze zbiorów BN.</dc:description>
+      <dc:description.dimensions xml:lang="pl">31.8 × 24.2 cm</dc:description.dimensions>
+      <dc:description.medium xml:lang="pl">Akwarela na papierze</dc:description.medium>
       <dc:identifier.url xml:lang="pl">http://wolnelektury.pl/katalog/obraz/angelus-novus</dc:identifier.url>
       <dc:source.URL xml:lang="pl">http://katilifox.files.wordpress.com/2011/04/1190051611_angelus-novus.jpg</dc:source.URL>
-      <dc:source xml:lang="pl"></dc:source>
+      <dc:source xml:lang="pl">Muzeum Narodowe, inw. 00000000.</dc:source>
       <dc:rights xml:lang="pl">Domena publiczna - Paul Klee zm. 1940</dc:rights>
       <dc:date.pd xml:lang="pl">1940</dc:date.pd>
       <dc:type>Image</dc:type>
       <dc:format xml:lang="pl">image/png</dc:format>
       <dc:format.dimensions.digital xml:lang="pl">1645 x 2000 px</dc:format.dimensions.digital>
-      <dc:format.dimensions.original xml:lang="pl">31.8 × 24.2 cm</dc:format.dimensions.original>
-      <dc:format.physical xml:lang="pl">Akwarela na papierze</dc:format.physical>
       <dc:date xml:lang="pl">1920</dc:date>
+      <dc:language xml:lang="pl" xmlns:dc="http://purl.org/dc/elements/1.1/"></dc:language>
     </rdf:Description>
   </rdf:RDF>
 
@@ -28,7 +31,7 @@
   <sem type="motif" motif="spojrzenie">
     <div type="area" x1="688" y1="500" x2="1054" y2="618"/>
   </sem>
-  <sem type="motif" motif="skrzydło">
+  <sem type="object" name="skrzydło">
     <div type="area" x1="468" y1="741" x2="694" y2="1027"/>
     <div type="area" x1="1044" y1="762" x2="1260" y2="1041"/>
   </sem>
-- 
2.20.1