Development: updated 'date' tag matching and removed redundancy

.github/workflows/pypi-publish.yml

@@ -10,16 +10,16 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
-          python-version: 2.7
+          python-version: 3.6
 
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade "pip>=20,<21" "setuptools>=40,<46" wheel
+          python -m pip install --upgrade "pip==21" "setuptools==40" wheel
       - name: Build package
         # Remove `compile_catalog` if the package has no translations.
         run: |

.github/workflows/tests.yml

@@ -24,27 +24,27 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        #python-version: [2.7, 3.6]
-        python-version: [2.7]
-        requirements-level: [min, pypi]
+        python-version: [3.6]
+        #python-version: [2.7]
+        requirements-level: [pypi]
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Generate dependencies
         run: |
-          python -m pip install --upgrade "pip>=20,<21" "setuptools>=40,<46" py
+          python -m pip install --upgrade "pip==21" "setuptools==40" py
           python -m pip install wheel coveralls requirements-builder configparser
           requirements-builder --level=${{ matrix.requirements-level }} setup.py > .${{ matrix.requirements-level }}-${{ matrix.python-version }}-requirements.txt
 
       - name: Cache pip
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('.${{ matrix.requirements-level }}-${{ matrix.python-version }}-requirements.txt') }}

cds_dojson/marc21/fields/base.py

@@ -24,7 +24,7 @@
                           ignore_value)
 
 from ..models.base import model
-from .utils import build_contributor, build_contributor_from_508
+from .utils import build_contributor, build_contributor_from_508, build_contributor_from_906
 
 
 @model.over('recid', '^001')
@@ -54,14 +54,22 @@ def report_number(self, key, value):
     return rn
 
 
-@model.over('contributors', '^(100|700|508)__')
+@model.over('contributors', '^(100|700|508|906)__')
 def contributors(self, key, value):
     """Contributors."""
     authors = self.get('contributors', [])
     if key in ['100__', '700__']:
         items = build_contributor(value)
-    else:
+    elif key == '508__':
         items = build_contributor_from_508(value)
+    else:
+        items = build_contributor_from_906(value)
+        if 'contributors' in self.keys():
+            names = [dic['name'] for dic in self['contributors']]
+            roles = [dic['role'] for dic in self['contributors']]
+            if items[0]['name'] in names:
+                if items[0]['role'] == roles[names.index(items[0]['name'])]:
+                    items = None
     # add only contributors that are not part of the authors
     if items:
         authors.extend(
@@ -87,17 +95,43 @@ def translations(self, key, value):
     translation = self.get('translations', [{}])[0]
     if key.startswith('246'):
         translation['title'] = {'title': value.get('a')}
+        if value.get('n'):
+            translation['description'] = value.get('n')
+        if value.get('p'):
+            translation['title']['subtitle'] = value.get('p')
     if key.startswith('590'):
         translation['description'] = value.get('a')
     translation['language'] = 'fr'
     self['translations'] = [translation]
     raise IgnoreKey('translations')
 
 
-@model.over('description', '^520__')
+@model.over('description', '(^511__)|(^5111_)|(^518__)|(^520__)')
 def description(self, key, value):
     """Description."""
-    return value.get('a')
+    if key == '511__' or key == '5111_':
+        if value.get('a'):
+            return 'Filmed people: ' + value.get('a')
+        elif value.get('1'):
+            return 'Filmed people: ' + value.get('1')
+        return ''
+
+    if key == '518__':
+        if value.get('a'):
+            if 'description' in self.keys():
+                return self['description'] + '\nPlace and/or date of event: ' + value.get('a')
+            return value.get('a')
+        if 'description' in self.keys():
+            return self['description']
+        return ''
+
+    if value.get('a'):
+        if 'description' in self.keys():
+            return self['description'] + '\nPlace and/or date of event: ' + value.get('a')
+        return value.get('a')
+    if 'description' in self.keys():
+        return self['description']
+    return ''
 
 
 @model.over('keywords', '^6531_')

cds_dojson/marc21/fields/utils.py

@@ -79,6 +79,7 @@ def _get_correct_video_contributor_role(role):
         'autor': 'Creator',
         'camera': 'Camera Operator',
         'camera & sound': 'Camera Operator',
+        'chairperson': 'Chairperson',
         'co-produced by': 'Co-Producer',
         'co-production': 'Co-Producer',
         'commentaire': 'Comments by',
@@ -119,6 +120,7 @@ def _get_correct_video_contributor_role(role):
         'made by': 'Creator',
         'montage': 'Editor',
         'narrator': 'Narrator',
+        'organiser': 'Organiser',
         'presentator': 'Reporter',
         'presented by': 'Reporter',
         'presenter': 'Reporter',
@@ -146,6 +148,7 @@ def _get_correct_video_contributor_role(role):
         'shooting and editing': ('Camera Operator', 'Editor'),
         'son': 'Music by',
         'speaker': 'Speaker',
+        'sponsor': 'Sponsor',
         'writen by': 'Screenwriter',
         'writer and director': ('Screenwriter', 'Director'),
         'written & directed by': ('Screenwriter', 'Director'),
@@ -227,8 +230,16 @@ def build_contributor(value):
         # Avoids a few calls
         value = get_author_info_from_people_collection(value)
 
-    role = _get_correct_video_contributor_role(
-        value.get('e', 'producer'))  # always unicode
+    if value.get('e'):
+        role = _get_correct_video_contributor_role(
+                value.get('e', 'producer'))  # always unicode
+    else:
+        try:
+            role = _get_correct_video_contributor_role(
+                    value.get('g', 'producer'))  # always unicode
+        except:
+            role = 'Producer'
+
     contributors = []
     contributor = {
         'ids': _extract_json_ids(value) or None,
@@ -270,3 +281,11 @@ def build_contributor_from_508(value):
             return contributors
     else:
         return build_contributor({'a': item.strip(), 'e': 'credits'})
+
+def build_contributor_from_906(value):
+    """Build contributors from field 508."""
+    contributor = {'name': value.get('p'), 'role': 'Speaker'}
+    if value.get('u'):
+        contributor['affiliations'] = (value.get('u'))
+
+    return [contributor]