also dont add tuples to lists sleepy man.

[librarian.git] / librarian / dcparser.py

diff --git a/librarian/dcparser.py b/librarian/dcparser.py
index aacbdbe..534cd27 100644 (file)
--- 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):
 
 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'):
 
         for base in bases[::-1]:
             if hasattr(base, 'FIELDS'):


@@ -134,9 +134,9 @@ class DCInfo(type):
                     try:
                         fields.index(field)
                     except ValueError:
                     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)
 
 
         return super(DCInfo, meta).__new__(meta, classname, bases, class_dict)
 
 


@@ -144,7 +144,7 @@ class WorkInfo(object):
     __metaclass__ = DCInfo
 
     FIELDS = (
     __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),
 
         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('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'),
     )
         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),
         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),

-

     )
 
 
     )