diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/resources/date_formats.txt b/redaction-service-v1/redaction-service-server-v1/src/main/resources/date_formats.txt index c8725365..b631e7c7 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/resources/date_formats.txt +++ b/redaction-service-v1/redaction-service-server-v1/src/main/resources/date_formats.txt @@ -1,3 +1,4 @@ +dd/MM/yyyy dd-MMM-yyyy dd MMM yyyy dd MMM yy @@ -35,4 +36,7 @@ dd.MMMM.yy dd.MMM-yyyy dd.MMMM-yyyy d['th']['st']['nd']['rd'] MMMM yy -d['th']['st']['nd']['rd'] MMMM yyyy \ No newline at end of file +d['th']['st']['nd']['rd'] MMMM yyyy +dd-MMMM-yyyy +dd. MM.yyyy +dd. MM. yyyy \ No newline at end of file diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumineFloraTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumineFloraTest.java index c32e7c8f..2da5feb4 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumineFloraTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumineFloraTest.java @@ -41,6 +41,7 @@ import com.iqser.red.service.redaction.v1.server.annotate.AnnotateRequest; import com.iqser.red.service.redaction.v1.server.annotate.AnnotateResponse; import com.iqser.red.service.redaction.v1.server.redaction.utils.OsUtils; import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService; +import com.iqser.red.service.redaction.v1.server.utils.DateConverter; import com.iqser.red.storage.commons.StorageAutoConfiguration; import com.iqser.red.storage.commons.service.StorageService; import com.iqser.red.storage.commons.utils.FileSystemBackedStorageService; @@ -61,30 +62,10 @@ public class DocumineFloraTest extends AbstractRedactionIntegrationTest { // @Disabled public void titleExtraction() throws IOException { - AnalyzeRequest request = uploadFileToStorage("files/syngenta/CustomerFiles/18 Chlorothalonil RAR 08 Volume 3CA B 6a Oct 2017.pdf"); - ClassPathResource importedRedactionClasspathResource = new ClassPathResource( - "files/ImportedRedactions/18 Chlorothalonil RAR 08 Volume 3CA B 6a Oct 2017.IMPORTED_REDACTIONS.json"); - storageService.storeObject(TenantContext.getTenantId(), - RedactionStorageService.StorageIdUtils.getStorageId(TEST_DOSSIER_ID, TEST_FILE_ID, FileType.IMPORTED_REDACTIONS), - importedRedactionClasspathResource.getInputStream()); - -// AnalyzeRequest request = prepareStorage("files/Documine/Flora/ProblemDocs/SOLICITA_VICTRATO-GOLD-II_Item 21_Mutacao_Genica (1).pdf", -// "files/Documine/Flora/ProblemDocs/SOLICITA_VICTRATO-GOLD-II_Item 21_Mutacao_Genica (1).TABLES.json"); - - System.out.println("Start Full integration test"); - analyzeDocumentStructure(LayoutParsingType.DOCUMINE, request); - System.out.println("Finished structure analysis"); - AnalyzeResult result = analyzeService.analyze(request); - System.out.println("Finished analysis"); - var entityLog = redactionStorageService.getEntityLog(TEST_DOSSIER_ID, TEST_FILE_ID); - var componentLog = redactionStorageService.getComponentLog(TEST_DOSSIER_ID, TEST_FILE_ID); - AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder().dossierId(TEST_DOSSIER_ID).fileId(TEST_FILE_ID).build()); - - String outputFileName = OsUtils.getTemporaryDirectory() + "/Documine.pdf"; - - try (FileOutputStream fileOutputStream = new FileOutputStream(outputFileName)) { - fileOutputStream.write(annotateResponse.getDocument()); + var date = DateConverter.parseDate("28/12/2018"); + if (date.isPresent()){ + System.out.println(date.get()); } }