merged a conflict in dcparser fields

diff --combined librarian/dcparser.py
index aacbdbe,4fd0f66..245cf92
--- 1/librarian/dcparser.py
--- 2/librarian/dcparser.py
+++ b/librarian/dcparser.py
@@@ -144,29 -144,22 +144,28 @@@ 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),
  
 -        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
      def from_string(cls, xml):
@@@ -215,7 -208,6 +214,7 @@@
              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):
@@@ -345,19 -337,20 +344,18 @@@ 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),
 +
          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),
- 
      )