ugly fix (error reporting)

[librarian.git] / librarian / dcparser.py

diff --git a/librarian/dcparser.py b/librarian/dcparser.py
index 062dc9f..afcefa0 100644 (file)
--- a/librarian/dcparser.py
+++ b/librarian/dcparser.py
@@ -95,6 +95,7 @@ class Field(object):
         self.default = kwargs.get('default', [] if multiple else [None])
 
     def validate_value(self, val, strict=False):
         self.default = kwargs.get('default', [] if multiple else [None])
 
     def validate_value(self, val, strict=False):

+        val = [v.strip() if v is not None else v for v in val]

         if strict and self.strict is not None:
             validator = self.strict
         else:
         if strict and self.strict is not None:
             validator = self.strict
         else:


@@ -138,7 +139,7 @@ class Field(object):
         return self.validate_value(f, strict=strict)
 
     def __eq__(self, other):
         return self.validate_value(f, strict=strict)
 
     def __eq__(self, other):

-        if isinstance(other, Field) and other.name == self.name:
+        if isinstance(other, Field) and other.name == self.name and other.uri == self.uri:

             return True
         return False
 
             return True
         return False
 


@@ -163,11 +164,13 @@ class WorkInfo(object):
     __metaclass__ = DCInfo
 
     FIELDS = (
     __metaclass__ = DCInfo
 
     FIELDS = (

-        Field( DCNS('creator.expert'), 'authors', as_person, salias='author', multiple=True),
-        Field( DCNS('creator.scenario'), 'authors', as_person, salias='author', multiple=True),
-        Field( DCNS('creator.textbook'), 'authors', as_person, salias='author', multiple=True),
+        Field( DCNS('creator.expert'), 'authors_expert', as_person, salias='author', required=False, multiple=True),
+        Field( DCNS('creator.methodologist'), 'authors_methodologist', as_person, salias='author', required=False, multiple=True),
+        Field( DCNS('creator.scenario'), 'authors_scenario', as_person, salias='author', required=False, multiple=True),
+        Field( DCNS('creator.textbook'), 'authors_textbook', as_person, salias='author', required=False, multiple=True),
+        Field( DCNS('requires'), 'requires', required=False, multiple=True),

         Field( DCNS('title'), 'title'),
         Field( DCNS('title'), 'title'),

-        Field( DCNS('type'), 'type', required=False, multiple=True),
+        Field( DCNS('type'), 'type', required=False),

 
         Field( DCNS('contributor.editor'), 'editors', \
             as_person, salias='editor', multiple=True, default=[]),
 
         Field( DCNS('contributor.editor'), 'editors', \
             as_person, salias='editor', multiple=True, default=[]),


@@ -178,6 +181,9 @@ class WorkInfo(object):
         Field( DCNS('date.pd'), 'released_to_public_domain_at', as_date, required=False),
         Field( DCNS('publisher'), 'publisher'),
 
         Field( DCNS('date.pd'), 'released_to_public_domain_at', as_date, required=False),
         Field( DCNS('publisher'), 'publisher'),
 

+        Field( DCNS('subject.competence'), 'competences', multiple=True, required=False),
+        Field( DCNS('subject.curriculum'), 'curriculum', multiple=True, required=False),
+

         Field( DCNS('language'), 'language'),
         Field( DCNS('description'), 'description', required=False),
 
         Field( DCNS('language'), 'language'),
         Field( DCNS('description'), 'description', required=False),
 


@@ -248,6 +254,8 @@ class WorkInfo(object):
         for field in self.FIELDS:
             value = field.validate(dc_fields, fallbacks=fallbacks,
                             strict=strict)
         for field in self.FIELDS:
             value = field.validate(dc_fields, fallbacks=fallbacks,
                             strict=strict)

+            if field.multiple:
+                value = getattr(self, 'prop_' + field.name, []) + value

             setattr(self, 'prop_' + field.name, value)
             self.fmap[field.name] = field
             if field.salias: self.fmap[field.salias] = field
             setattr(self, 'prop_' + field.name, value)
             self.fmap[field.name] = field
             if field.salias: self.fmap[field.salias] = field


@@ -367,13 +375,15 @@ class BookInfo(WorkInfo):
                 required=False),
         Field( DCNS('subject.genre'), 'genres', salias='genre', multiple=True,
                 required=False),
                 required=False),
         Field( DCNS('subject.genre'), 'genres', salias='genre', multiple=True,
                 required=False),

-                
+

         Field( DCNS('contributor.translator'), 'translators', \
             as_person,  salias='translator', multiple=True, default=[]),
         Field( DCNS('contributor.translator'), 'translators', \
             as_person,  salias='translator', multiple=True, default=[]),

-        Field( DCNS('relation.hasPart'), 'parts', 
+        Field( DCNS('relation.hasPart'), 'parts',

             WLURI, strict=as_wluri_strict, multiple=True, required=False),
             WLURI, strict=as_wluri_strict, multiple=True, required=False),

-        Field( DCNS('relation.isVariantOf'), 'variant_of', 
+        Field( DCNS('relation.isVariantOf'), 'variant_of',

             WLURI, strict=as_wluri_strict, required=False),
             WLURI, strict=as_wluri_strict, required=False),

+        Field( DCNS('relation'), 'relations',
+            WLURI, strict=as_wluri_strict, multiple=True, required=False),

 
         Field( DCNS('relation.coverImage.url'), 'cover_url', required=False),
         Field( DCNS('relation.coverImage.attribution'), 'cover_by', required=False),
 
         Field( DCNS('relation.coverImage.url'), 'cover_url', required=False),
         Field( DCNS('relation.coverImage.attribution'), 'cover_by', required=False),