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 d9d0514..ec9838f 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 @@ -100,7 +100,13 @@ public class RunSPARQLQueryService { if (isCollection) { parser.setCollection(true); } - parser.parse(recordWriter.toString()); + String bufferedRecord = recordWriter.toString(); + log.debug("before json parser :: "+bufferedRecord); + int size = parser.parse(bufferedRecord); + log.debug("json elements: "+size); + if (size==-1) { + return -4; + } resourceManager.manage(parser); return bulkUpload.index(resourceManager, isCollection); } catch(Exception e){ @@ -199,7 +205,7 @@ public class RunSPARQLQueryService { String jsonRecord = null; List results = new ArrayList<>(); try { - log.debug("Started at: "+Calendar.getInstance().getTime().toString()); +// log.debug("Started at: "+Calendar.getInstance().getTime().toString()); TupleQuery selectQuery = connection.prepareTupleQuery(QueryLanguage.SPARQL, query); TupleQueryResult selectQueryResult = selectQuery.evaluate(); int counter = 0; @@ -210,7 +216,7 @@ public class RunSPARQLQueryService { counter++; } log.debug("Total records retrieved: "+counter); - log.debug("Finished at: "+Calendar.getInstance().getTime().toString()); +// log.debug("Finished at: "+Calendar.getInstance().getTime().toString()); } catch(Exception e){ e.printStackTrace(); } finally{ diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/java/eu/dnetlib/ariadneplus/reader/json/ParseRDFJSON.java b/dnet-ariadneplus-graphdb-publisher/src/main/java/eu/dnetlib/ariadneplus/reader/json/ParseRDFJSON.java index 6ccd2d9..7d34938 100644 --- a/dnet-ariadneplus-graphdb-publisher/src/main/java/eu/dnetlib/ariadneplus/reader/json/ParseRDFJSON.java +++ b/dnet-ariadneplus-graphdb-publisher/src/main/java/eu/dnetlib/ariadneplus/reader/json/ParseRDFJSON.java @@ -51,13 +51,17 @@ public class ParseRDFJSON { } - public void parse(String json) throws ParseException { + public int parse(String json) throws ParseException { setJson(json); fillMap(); DocumentContext jsonContext = JsonPath.parse(json); JSONArray entries = jsonContext.read(getCatalogEntryJsonPath()); int size = entries.size(); + if (size==0) { + return -1; + } it = entries.iterator(); + return size; } public boolean hasNextElement(){ diff --git a/dnet-ariadneplus-graphdb-publisher/test/java/eu/dnetlib/ariadneplus/GraphDbReaderAndESIndexTest.java b/dnet-ariadneplus-graphdb-publisher/test/java/eu/dnetlib/ariadneplus/GraphDbReaderAndESIndexTest.java index 918e17a..d7c4136 100644 --- a/dnet-ariadneplus-graphdb-publisher/test/java/eu/dnetlib/ariadneplus/GraphDbReaderAndESIndexTest.java +++ b/dnet-ariadneplus-graphdb-publisher/test/java/eu/dnetlib/ariadneplus/GraphDbReaderAndESIndexTest.java @@ -57,7 +57,7 @@ public class GraphDbReaderAndESIndexTest { final ClassPathResource queryTemplateResource; boolean testRecord = true; if (testRecord) { - recordId = "https://ariadne-infrastructure.eu/aocat/Resource/10DB6647-5D40-397A-8434-8CED55B2FC29"; + recordId = "https://ariadne-infrastructure.eu/aocat/Resource/FE3155A7-AF9F-3C5F-A92E-93041EF495E0"; queryTemplateResource = new ClassPathResource("eu/dnetlib/ariadneplus/sparql/read_record_data_template.sparql"); } else {