From 73552ce07957cf1d4ac8734ac6e551db8eeb1076 Mon Sep 17 00:00:00 2001 From: LSmyrnaios Date: Mon, 7 Feb 2022 14:40:33 +0200 Subject: [PATCH] - Handle the latest download-errors provided by the "PublicationsRetriever" program. - Update the "test" requestUrl. --- .../urls_worker/plugins/PublicationsRetrieverPlugin.java | 2 +- .../java/eu/openaire/urls_worker/util/AssignmentsHandler.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/eu/openaire/urls_worker/plugins/PublicationsRetrieverPlugin.java b/src/main/java/eu/openaire/urls_worker/plugins/PublicationsRetrieverPlugin.java index c6b416a..3d75680 100644 --- a/src/main/java/eu/openaire/urls_worker/plugins/PublicationsRetrieverPlugin.java +++ b/src/main/java/eu/openaire/urls_worker/plugins/PublicationsRetrieverPlugin.java @@ -188,7 +188,7 @@ public class PublicationsRetrieverPlugin { if ( !foundAlreadyDownloadedFullText ) error = new Error(Error.ErrorType.couldRetry, comment + " | That ID-sourceUrl was not found inside the WorkerReport!"); // We can still try to download it from the found docUrl, in the future. } - else if ( ! comment.equals(HttpConnUtils.docFileNotRetrievedMessage) ) { // If it was downloaded without an error. + else if ( ! comment.contains(HttpConnUtils.docFileNotRetrievedMessage) ) { // If it was downloaded without an error. fileLocation = comment; // This is the full-file-path. mimeType = "application/pdf"; } else // Else the file was not retrieved, so all file-related data are kept "null". diff --git a/src/main/java/eu/openaire/urls_worker/util/AssignmentsHandler.java b/src/main/java/eu/openaire/urls_worker/util/AssignmentsHandler.java index 9eb374f..b722f27 100644 --- a/src/main/java/eu/openaire/urls_worker/util/AssignmentsHandler.java +++ b/src/main/java/eu/openaire/urls_worker/util/AssignmentsHandler.java @@ -3,7 +3,6 @@ package eu.openaire.urls_worker.util; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import eu.openaire.urls_worker.UrlsWorkerApplication; -import eu.openaire.urls_worker.components.ScheduledTasks; import eu.openaire.urls_worker.models.Assignment; import eu.openaire.urls_worker.models.UrlReport; import eu.openaire.urls_worker.payloads.requests.AssignmentsRequest; @@ -52,7 +51,7 @@ public class AssignmentsHandler { public static AssignmentsRequest requestAssignments() { - String requestUrl = UrlsWorkerApplication.controllerBaseUrl + "urls" + (askForTest ? "/test" : "") + "?workerId=" + UrlsWorkerApplication.workerId + "&workerAssignmentsLimit=" + UrlsWorkerApplication.maxAssignmentsLimitPerBatch; + String requestUrl = UrlsWorkerApplication.controllerBaseUrl + (askForTest ? "test/" : "") + "urls?workerId=" + UrlsWorkerApplication.workerId + "&workerAssignmentsLimit=" + UrlsWorkerApplication.maxAssignmentsLimitPerBatch; logger.info("Going to request assignments from the controller-server: " + requestUrl); AssignmentsRequest assignmentRequest = null;