From 977623247cc209c4ccb6028510906fe9d922c5e5 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Wed, 16 Dec 2020 15:26:53 +0100 Subject: [PATCH 1/2] Safe iteration --- oai-harvester/CHANGELOG.md | 3 +++ oai-harvester/pom.xml | 2 +- .../gFeed/collectors/oai/OAICollector.java | 16 ++++++++++------ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/oai-harvester/CHANGELOG.md b/oai-harvester/CHANGELOG.md index f8457a4..4af665e 100644 --- a/oai-harvester/CHANGELOG.md +++ b/oai-harvester/CHANGELOG.md @@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.data-publishing.gFeed.oai-pmh +## [1.0.5-SNAPSHOT] - 2020-12-15 +Do not stop on single repository error + ## [1.0.4] - 2020-12-15 - Dependency management - Naming Convention diff --git a/oai-harvester/pom.xml b/oai-harvester/pom.xml index c25eb1c..de64494 100644 --- a/oai-harvester/pom.xml +++ b/oai-harvester/pom.xml @@ -9,7 +9,7 @@ oai-harvester oai-harvester - 1.0.4 + 1.0.5-SNAPSHOT scm:git:${gitBaseUrl}/gFeed diff --git a/oai-harvester/src/main/java/org/gcube/data/publishing/gFeed/collectors/oai/OAICollector.java b/oai-harvester/src/main/java/org/gcube/data/publishing/gFeed/collectors/oai/OAICollector.java index dfe29a3..8de784f 100644 --- a/oai-harvester/src/main/java/org/gcube/data/publishing/gFeed/collectors/oai/OAICollector.java +++ b/oai-harvester/src/main/java/org/gcube/data/publishing/gFeed/collectors/oai/OAICollector.java @@ -27,12 +27,16 @@ public class OAICollector implements DataCollector { AccessPoint point=epr.profile().accessPoints().asCollection().iterator().next(); String baseUrl=point.address(); log.debug("Address is "+baseUrl); - OAIClient client = new OAIClient(baseUrl); - point.properties().iterator().forEachRemaining((Property p)->{ - if(p.name().equals("set")) - client.getSpecifiedSets().add(p.value()); - }); - toReturn.addAll(client.getAll(OAIClient.DC_METADATA_PREFIX)); + try { + OAIClient client = new OAIClient(baseUrl); + point.properties().iterator().forEachRemaining((Property p)->{ + if(p.name().equals("set")) + client.getSpecifiedSets().add(p.value()); + }); + toReturn.addAll(client.getAll(OAIClient.DC_METADATA_PREFIX)); + }catch(Throwable t) { + log.warn("Unable to use repository "+epr.id()+" NAME : "+epr.profile().name(),t); + } } return toReturn; From 805ccd0998a4d5ac2012298535b7ce1924bdad78 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Wed, 16 Dec 2020 15:57:26 +0100 Subject: [PATCH 2/2] release --- oai-harvester/CHANGELOG.md | 2 +- oai-harvester/pom.xml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/oai-harvester/CHANGELOG.md b/oai-harvester/CHANGELOG.md index 4af665e..37f3e04 100644 --- a/oai-harvester/CHANGELOG.md +++ b/oai-harvester/CHANGELOG.md @@ -2,7 +2,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.data-publishing.gFeed.oai-pmh -## [1.0.5-SNAPSHOT] - 2020-12-15 +## [1.0.5] - 2020-12-15 Do not stop on single repository error ## [1.0.4] - 2020-12-15 diff --git a/oai-harvester/pom.xml b/oai-harvester/pom.xml index de64494..b4c56ea 100644 --- a/oai-harvester/pom.xml +++ b/oai-harvester/pom.xml @@ -2,14 +2,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.gcube.data-publishing.gFeed - gFeed-Suite - 1.0.4 - + + org.gcube.data-publishing.gFeed + gFeed-Suite + 1.0.4 + oai-harvester oai-harvester - 1.0.5-SNAPSHOT + 1.0.5 scm:git:${gitBaseUrl}/gFeed @@ -38,13 +38,13 @@ org.gcube.data-publishing.gFeed collectors-plugin-framework - - + + org.glassfish.jersey.media jersey-media-json-jackson - + org.slf4j slf4j-api