From 665a717ca0c862582e9960a5856d7f2062a571ed Mon Sep 17 00:00:00 2001 From: Enrico Ottonello Date: Fri, 23 Oct 2020 12:18:58 +0200 Subject: [PATCH] added check on identifier, before indexing --- .../java/eu/dnetlib/ariadneplus/graphdb/GraphDBClient.java | 3 +++ .../dnetlib/ariadneplus/reader/RunSPARQLQueryService.java | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/java/eu/dnetlib/ariadneplus/graphdb/GraphDBClient.java b/dnet-ariadneplus-graphdb-publisher/src/main/java/eu/dnetlib/ariadneplus/graphdb/GraphDBClient.java index 9a8b78c..0edc308 100644 --- a/dnet-ariadneplus-graphdb-publisher/src/main/java/eu/dnetlib/ariadneplus/graphdb/GraphDBClient.java +++ b/dnet-ariadneplus-graphdb-publisher/src/main/java/eu/dnetlib/ariadneplus/graphdb/GraphDBClient.java @@ -398,6 +398,9 @@ public class GraphDBClient { public String indexOnESByIdentifier(String datasource, String collectionId, String resourceType, String identifier) throws AriadnePlusPublisherException { String report = ""; try { + if (StringUtils.isBlank(identifier)) { + return "empty identifier"; + } List identifiers = Arrays.asList(identifier); log.info("Start indexing from "+ datasource + " " + collectionId); runSPQRLQuery.setupConnection( getWriterUser(), getWriterPwd(), this.graphDBServerUrl, getRepository()); diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/java/eu/dnetlib/ariadneplus/reader/RunSPARQLQueryService.java b/dnet-ariadneplus-graphdb-publisher/src/main/java/eu/dnetlib/ariadneplus/reader/RunSPARQLQueryService.java index 25767d5..e36b0db 100644 --- a/dnet-ariadneplus-graphdb-publisher/src/main/java/eu/dnetlib/ariadneplus/reader/RunSPARQLQueryService.java +++ b/dnet-ariadneplus-graphdb-publisher/src/main/java/eu/dnetlib/ariadneplus/reader/RunSPARQLQueryService.java @@ -163,7 +163,11 @@ public class RunSPARQLQueryService { return bulkUpload.index(resourceManager, isCollection); } catch (HTTPQueryEvaluationException qe) { log.error(qe); - return -5; + if (qe.getMessage()!=null && + qe.getMessage().contains("Insufficient free Heap Memory")) { + return -5; + } + return -6; } catch(Exception e){ log.error(e); return -1;