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 Binary files a/openbis_standard_technologies/dist/core-plugins/eln-lims-life-sciences/1/as/master-data/data-model.xls and b/openbis_standard_technologies/dist/core-plugins/eln-lims-life-sciences/1/as/master-data/data-model.xls differ 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 Binary files a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/master-data/data-model.xls and b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/master-data/data-model.xls differ 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 cc77ea6f8cfc5d2c91b4292696d89990276b2b7b..d172528c3ff79f9d887466243c0ee593a8ee74a8 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 be1dd798a3369d52923b64d6be25380fc00e7337..ffe21051279224270fb98c46ed23b9c07a231403 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')) \