From 6f41dbe4bc268216ecfa2c292ee83638e577b5f4 Mon Sep 17 00:00:00 2001
From: Viktor Kovtun <viktor.kovtun@id.ethz.ch>
Date: Fri, 13 Sep 2019 11:45:32 +0200
Subject: [PATCH] SSDM-8751 Fixing wrong link submitted back from Zenodo and
shown in the application report.
---
.../1/as/master-data/data-model.xls | Bin 105984 -> 105984 bytes
.../eln-lims/1/as/master-data/data-model.xls | Bin 74752 -> 74752 bytes
.../zenodo-exports-api/plugin.properties | 4 ++--
.../zenodo-exports-api/zenodoExports.py | 6 +++---
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims-life-sciences/1/as/master-data/data-model.xls b/openbis_standard_technologies/dist/core-plugins/eln-lims-life-sciences/1/as/master-data/data-model.xls
index 3ee993ae6e5fcd4df2a656c6551274769709d661..dc41839238990f7688c5a4b4f956986f3414f318 100644
GIT binary patch
delta 25
gcmZqJ!`85eZ9@(Vn}c-Fud>YMB9`q%ER20K0e#L1e*gdg
delta 25
hcmZqJ!`85eZ9@(V+lF<Kf_Iafi&(Z7u`u?{1OSEz3IPBB
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/master-data/data-model.xls b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/master-data/data-model.xls
index 37c2bad5fbab86274c8b255a9d2fae259fbb991b..21bc5da6b913898b698b337c5eaa1dd604c75b92 100644
GIT binary patch
delta 160
zcmZoT!P0PoWkU`NTfw|do69pd7qOVJvNd=YgV^gh%^3L}oLvWGUu9(I-3X*7f8r`a
z6WUzFUBrwo_KB|uUF+r|0lPI!3=W$&?U7*x(vvS7^kJN{S@zIE3&!P>_y5x1+ra<=
Qj0`(~kbz<I*I(S407hj)%m4rY
delta 160
zcmZoT!P0PoWkU`N+X5c>70;757qOVJvN7D-y&TA1$7#mM$B@qh6u-(Sa9RRLPyWPJ
zgeJ7Ph`WdxUF;KI5xUmRMFMtfm_FEV-n2)C6-ZCMaL|WQXtV60g%*sallTA9;0t45
UVPIfjWC#O77M9Ile{pL907)=D0{{R3
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/zenodo-exports-api/plugin.properties b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/zenodo-exports-api/plugin.properties
index cc77ea6f8cf..d172528c3ff 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/zenodo-exports-api/plugin.properties
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/zenodo-exports-api/plugin.properties
@@ -2,5 +2,5 @@ label = Zenodo Exports API
class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython.JythonIngestionService
script-path = zenodoExports.py
limit-data-size-megabytes=${zenodo-exports-api-limit-data-size-megabytes:4000}
-zenodoUrl=${zenodo-exports-api-zenodoUrl:https://localhost}
-accessToken=${zenodo-exports-api-accessToken}
\ No newline at end of file
+zenodoUrl=https://sandbox.zenodo.org
+accessToken=dkN5iagpbJfh4wmK2fM4sVyzCyNmCF6aM5XCZufT9t986HGmk1RGGwUjIdlb
\ No newline at end of file
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/zenodo-exports-api/zenodoExports.py b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/zenodo-exports-api/zenodoExports.py
index be1dd798a33..ffe21051279 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/zenodo-exports-api/zenodoExports.py
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/zenodo-exports-api/zenodoExports.py
@@ -225,7 +225,7 @@ class ZenodoCallable(object):
actionCompleted = True
elif publicationJson.get('submitted'):
operationLog.info('Publication #%d submitted. Registering metadata.' % publicationJson.get('id'))
- self.registerPublicationInOpenbis(publicationJson.get('metadata'))
+ self.registerPublicationInOpenbis(publicationJson.get('metadata'), publicationJson.get('links'))
actionCompleted = True
else:
operationLog.info('Publication #%d not submitted yet.' % publicationJson.get('id'))
@@ -244,13 +244,13 @@ class ZenodoCallable(object):
return actionCompleted
- def registerPublicationInOpenbis(self, publicationMetadataJson):
+ def registerPublicationInOpenbis(self, publicationMetadataJson, publicationLinksJson):
sessionToken = self.params.get('sessionToken')
v3 = ServiceProvider.getV3ApplicationService()
id = CustomASServiceCode('publication-api')
options = CustomASServiceExecutionOptions() \
.withParameter('method', 'insertPublication') \
- .withParameter('publicationURL', self.selfUrl) \
+ .withParameter('publicationURL', publicationLinksJson.get('doi')) \
.withParameter('openBISRelatedIdentifiers', self.permIdsStr) \
.withParameter('name', publicationMetadataJson.get('title')) \
.withParameter('publicationDescription', publicationMetadataJson.get('description')) \
--
GitLab