From a3721a602d76f4b9d883259b5e78059d1fea987b Mon Sep 17 00:00:00 2001 From: Javi Corvi Date: Thu, 3 Mar 2022 15:24:13 +0100 Subject: [PATCH] solver error during validation --- .../ades/rest/api/services/FileServiceImp.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/es/bsc/inb/ades/rest/api/services/FileServiceImp.java b/src/main/java/es/bsc/inb/ades/rest/api/services/FileServiceImp.java index 5af3233..d35c7d8 100644 --- a/src/main/java/es/bsc/inb/ades/rest/api/services/FileServiceImp.java +++ b/src/main/java/es/bsc/inb/ades/rest/api/services/FileServiceImp.java @@ -184,13 +184,17 @@ public class FileServiceImp implements FileService { errors.add("The following document is incomplete : " + string + ", please review that both files : "+ string +"_annotations.json and " + string + "_documents.json where included."); } - errors.addAll(validateDocumentsInDatabase(Arrays.asList(files))); - - if(!allow_duplicates) { - //solo se esta validando los _documents.json habria que tambien tener en cuenta los annotations. - errors.addAll(validateDocumentsNamesInDatabase(Arrays.asList(files))); + if(errors.size()==0) { + errors.addAll(validateDocumentsInDatabase(Arrays.asList(files))); + if(!allow_duplicates) { + //solo se esta validando los _documents.json habria que tambien tener en cuenta los annotations. + errors.addAll(validateDocumentsNamesInDatabase(Arrays.asList(files))); + } } + + + return errors; } @@ -212,8 +216,7 @@ public class FileServiceImp implements FileService { errors.add("The document " + name + " has a documentId ("+doc.getLong("id")+") that was already processed and is present in the database. A document with the same documentId cannot be processed again."); } } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + errors.add("The document file " + multipartFile + " is not a valid json files for the PretoxTM system."); } } -- GitLab