Merge 997a41a into 997749c

inspirehep · Sep 2, 2019 · c390495 · c390495
2 parents 997749c + 997a41a
commit c390495
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/inspire_schemas/utils.py b/inspire_schemas/utils.py
@@ -927,15 +927,15 @@ def _needs_a_hidden_pubnote(journal_title, journal_volume):
         if journal_title and journal_volume:
             match = _RE_TITLE_ENDS_WITH_A_LETTER.match(journal_title)
             if match and _needs_a_hidden_pubnote(journal_title, journal_volume):
-                _publication_info['journal_title'] = match.group('title')
+                _publication_info['journal_title'] = match.group('title').strip()
                 _publication_info['journal_volume'] = journal_volume + match.group('letter')
                 result.append(_publication_info)
                 _publication_info = copy.deepcopy(publication_info)
                 _publication_info['hidden'] = True
-                _publication_info['journal_title'] = match.group('title')
+                _publication_info['journal_title'] = match.group('title').strip()
                 _publication_info['journal_volume'] = match.group('letter') + journal_volume
             elif match and journal_title not in _JOURNALS_ALREADY_ENDING_WITH_A_LETTER:
-                _publication_info['journal_title'] = match.group('title')
+                _publication_info['journal_title'] = match.group('title').strip()
                 _publication_info['journal_volume'] = match.group('letter') + journal_volume
 
         result.append(_publication_info)

diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
@@ -890,6 +890,36 @@ def test_convert_new_publication_info_to_old_handles_year_added_to_volumes():
     assert expected == result
 
 
+def test_convert_new_publication_info_to_old_handles_journal_titles_without_dots():
+    schema = utils.load_schema('hep')
+    subschema = schema['properties']['publication_info']
+
+    publication_info = [
+        {
+            'artid': '30',
+            'journal_title': 'Physica D',
+            'journal_volume': '231',
+            'page_start': '30',
+            'year': 2017,
+        },
+    ]
+    assert utils.validate(publication_info, subschema) is None
+
+    expected = [
+        {
+            'artid': '30',
+            'journal_title': 'Physica',
+            'journal_volume': 'D231',
+            'page_start': '30',
+            'year': 2017,
+        },
+    ]
+    result = utils.convert_new_publication_info_to_old(publication_info)
+
+    assert utils.validate(result, subschema) is None
+    assert expected == result
+
+
 def test_convert_new_publication_info_to_old_handles_volumes_with_letters_in_the_middle():
     schema = utils.load_schema('hep')
     subschema = schema['properties']['publication_info']