openaire: grant links generation and test fixes

Signed-off-by: Alexander Ioannidis <a.ioannidis@cern.ch>
zenodo · Jun 1, 2017 · e131d50 · e131d50
1 parent 31b6972
commit e131d50
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/tests/unit/records/test_schemas_openaire_json.py b/tests/unit/records/test_schemas_openaire_json.py
@@ -93,6 +93,7 @@ def test_grants(app, db, minimal_oai_record, recid_pid):
     minimal_oai_record['grants'] = [
         {
             'acronym': 'WorkAble',
+            'title': 'Making Capabilities/Design Work',
             'identifiers': {
                 'eurepo': 'info:eu-repo/grantAgreement/EC/FP7/244909/'
             },
@@ -103,7 +104,8 @@ def test_grants(app, db, minimal_oai_record, recid_pid):
     obj = openaire_json_v1.transform_record(
         recid_pid, Record(minimal_oai_record))
     assert obj['linksToProjects'] == [
-        'info:eu-repo/grantAgreement/EC/FP7/244909///WorkAble'
+        'info:eu-repo/grantAgreement/EC/FP7/244909/'
+        '/Making Capabilities%2FDesign Work/WorkAble'
     ]
 
 

diff --git a/zenodo/modules/deposit/views.py b/zenodo/modules/deposit/views.py
@@ -43,13 +43,13 @@
 from invenio_pidstore.resolver import Resolver
 from invenio_records_files.models import RecordsBuckets
 
+from zenodo.modules.deposit.utils import delete_record
 from zenodo.modules.records.permissions import record_permission_factory
 
 from .api import ZenodoDeposit
 from .fetchers import zenodo_deposit_fetcher
 from .forms import RecordDeleteForm
 from .tasks import datacite_inactivate, datacite_register
-from zenodo.modules.deposit.utils import delete_record
 
 blueprint = Blueprint(
     'zenodo_deposit',

diff --git a/zenodo/modules/openaire/helpers.py b/zenodo/modules/openaire/helpers.py
@@ -100,6 +100,7 @@ def openaire_original_id(record, oatype):
 
     return prefix, value
 
+
 def openaire_link(record):
     """Compute an OpenAIRE link."""
     oatype = openaire_type(record)

diff --git a/zenodo/modules/openaire/schema.py b/zenodo/modules/openaire/schema.py
@@ -26,15 +26,13 @@
 
 from __future__ import absolute_import, print_function
 
-from collections import namedtuple
-
 from flask import current_app
 from marshmallow import Schema, fields, missing
 
 from zenodo.modules.records.models import ObjectType
 from zenodo.modules.records.serializers.fields import DateString
 
-from .helpers import openaire_original_id, openaire_type
+from .helpers import openaire_original_id
 
 
 class RecordSchemaOpenAIREJSON(Schema):
@@ -123,11 +121,12 @@ def get_links_to_projects(self, obj):
         grants = metadata.get('grants', [])
         links = []
         for grant in grants:
-            # Add grant acronynm to the link:
-            #   [info:eu-repo/grantAgreement/EC/FP6/027819/] + [//ICEA]
-            eurepo = grant.get('identifiers', {}).get('eurepo')
-            links.append('{eurepo}//{acronym}'.format(
-                eurepo=eurepo, acronym=grant.get('acronym', '')))
+            eurepo = grant.get('identifiers', {}).get('eurepo', '')
+            if eurepo:
+                links.append('{eurepo}/{title}/{acronym}'.format(
+                    eurepo=eurepo,
+                    title=grant.get('title', '').replace('/', '%2F'),
+                    acronym=grant.get('acronym', '')))
         return links or missing
 
     def get_pids(self, obj):