diff --git a/cds_dojson/marc21/fields/base.py b/cds_dojson/marc21/fields/base.py index 9a5d27d4..be1625a0 100644 --- a/cds_dojson/marc21/fields/base.py +++ b/cds_dojson/marc21/fields/base.py @@ -20,10 +20,11 @@ from __future__ import absolute_import, print_function -from dojson.utils import IgnoreKey, filter_values, for_each_value, \ - force_list, ignore_value +from dojson.utils import (IgnoreKey, filter_values, for_each_value, force_list, + ignore_value) from ..models.base import model +from .utils import build_contributor, build_contributor_from_508 @model.over('recid', '^001') diff --git a/cds_dojson/marc21/fields/utils.py b/cds_dojson/marc21/fields/utils.py index 11a26973..d3a462d1 100644 --- a/cds_dojson/marc21/fields/utils.py +++ b/cds_dojson/marc21/fields/utils.py @@ -350,7 +350,7 @@ def _extract_json_ids(info, provenence='source'): 'AUTHOR|(CDS)': 'CDS', 'AUTHOR|(SzGeCERN)': 'CERN' } - regex = re.compile(r'(AUTHOR\|\((CDS|INSPIRE|SzGeCERN)\))(.*)') + regex = re.compile(r'((AUTHOR\|\((CDS|INSPIRE)\))|(\(SzGeCERN\)))(.*)') ids = [] author_ids = force_list(info.get('0', '')) for author_id in author_ids: diff --git a/cds_dojson/marc21/utils.py b/cds_dojson/marc21/utils.py index 0a9a127c..9810ddb3 100644 --- a/cds_dojson/marc21/utils.py +++ b/cds_dojson/marc21/utils.py @@ -18,7 +18,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. """Utilities for converting MARC21.""" -from dojson.contrib.marc21.utils import MARC21_DTD +from dojson.contrib.marc21.utils import MARC21_DTD, split_stream from lxml import etree from six import StringIO, binary_type, text_type diff --git a/tests/test_utils.py b/tests/test_utils.py index 0e93673d..5082fd5c 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -21,7 +21,6 @@ import json import os - import pytest from dojson.utils import filter_values