From c6fe3b3815a4d0ded1437c30415356823cace591 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Fri, 11 Nov 2022 18:07:28 +0100 Subject: [PATCH 1/5] Removed tagging extraction --- .../src/main/resources/profiles/HarvestedObject.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/oai-harvester/src/main/resources/profiles/HarvestedObject.xml b/oai-harvester/src/main/resources/profiles/HarvestedObject.xml index 0619fae..6f9d94a 100644 --- a/oai-harvester/src/main/resources/profiles/HarvestedObject.xml +++ b/oai-harvester/src/main/resources/profiles/HarvestedObject.xml @@ -56,7 +56,7 @@ false String * - onValue + relation @@ -81,7 +81,7 @@ false String * - onValue + title @@ -94,6 +94,6 @@ false String * - onValue + \ No newline at end of file From 519fdda14759d71f39f7aab473b1e92c3757f468 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Fri, 11 Nov 2022 18:11:27 +0100 Subject: [PATCH 2/5] Removed tagging extraction --- oai-harvester/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oai-harvester/pom.xml b/oai-harvester/pom.xml index 2d79f1a..176be5d 100644 --- a/oai-harvester/pom.xml +++ b/oai-harvester/pom.xml @@ -9,7 +9,7 @@ oai-harvester oai-harvester - 1.0.7 + 1.0.8-SNAPSHOT scm:git:${gitBaseUrl}/gFeed From d70fe5c9dbe76d10fc26bcd36065c2e931763f25 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Fri, 11 Nov 2022 18:16:41 +0100 Subject: [PATCH 3/5] Removed tagging extraction --- oai-harvester/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/oai-harvester/CHANGELOG.md b/oai-harvester/CHANGELOG.md index bb738e4..913a945 100644 --- a/oai-harvester/CHANGELOG.md +++ b/oai-harvester/CHANGELOG.md @@ -2,6 +2,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.data-publishing.gFeed.oai-pmh +## [v1.0.8-SNAPSHOT] +Harvested Object profile update + + ## [v1.0.7] - Pom updates From 87703c97c52bebba3a7d7921871135a73c6cbcd6 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Mon, 14 Nov 2022 12:26:35 +0100 Subject: [PATCH 4/5] Empty response check --- .../publishing/gFeed/collectors/oai/OAIClient.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/oai-harvester/src/main/java/org/gcube/data/publishing/gFeed/collectors/oai/OAIClient.java b/oai-harvester/src/main/java/org/gcube/data/publishing/gFeed/collectors/oai/OAIClient.java index 80529ea..e8d47b8 100644 --- a/oai-harvester/src/main/java/org/gcube/data/publishing/gFeed/collectors/oai/OAIClient.java +++ b/oai-harvester/src/main/java/org/gcube/data/publishing/gFeed/collectors/oai/OAIClient.java @@ -116,6 +116,8 @@ public class OAIClient { } + log.trace("Calling {} ",target.getUri()); + Response resp=target.request("application/xml").get(); @@ -127,11 +129,13 @@ public class OAIClient { //No errors, thus reset attempt counter currentAttempt=1; - toReturn.addAll(msg.getResponseRecords().getRecords()); + if(msg.getResponseRecords().getRecords()!=null) + toReturn.addAll(msg.getResponseRecords().getRecords()); + else log.info("NB {} didn't returned any record",msg.getRequest().getPath()); log.debug("Parsed "+toReturn.size()+" records so far."); - - Token t=msg.getResponseRecords().getResumptionToken(); + + Token t=msg.getResponseRecords().getResumptionToken(); log.debug("Obtained token : "+t); if(t!=null && t.getId()!=null && !t.getId().isEmpty()) { @@ -144,7 +148,7 @@ public class OAIClient { isComplete=true; } }catch(Throwable t) { - log.warn("Unexpected ERROR "+t.getMessage()); + log.warn("Unexpected ERROR ",t); log.debug("Current attempt number = "+currentAttempt," max attempt Number = "+MAX_ATTEMPTS+", attempts delay factor = "); isComplete=currentAttempt>MAX_ATTEMPTS; try { From 794898ba99b7c5ca02a78f24b839fe4614ef326c Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Mon, 14 Nov 2022 16:45:02 +0100 Subject: [PATCH 5/5] Release oai-harvester 1.0.8 --- oai-harvester/CHANGELOG.md | 2 +- oai-harvester/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oai-harvester/CHANGELOG.md b/oai-harvester/CHANGELOG.md index 913a945..75f6538 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 -## [v1.0.8-SNAPSHOT] +## [v1.0.8] Harvested Object profile update diff --git a/oai-harvester/pom.xml b/oai-harvester/pom.xml index 176be5d..a990c5a 100644 --- a/oai-harvester/pom.xml +++ b/oai-harvester/pom.xml @@ -9,7 +9,7 @@ oai-harvester oai-harvester - 1.0.8-SNAPSHOT + 1.0.8 scm:git:${gitBaseUrl}/gFeed