From 82661dcaf2912b68f9f102e1d8e67dec2a0524c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?= Date: Thu, 10 Oct 2024 11:20:33 +0200 Subject: [PATCH] RED-10149: Do not re- ocr file after pages rotations; RED-10083: Minor fix in openapi spec --- .../api/impl/controller/FileManagementController.java | 11 +++++++---- .../src/main/resources/api/documine.yaml | 6 +++--- .../src/main/resources/api/redactmanager.yaml | 6 +++--- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/FileManagementController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/FileManagementController.java index 7fba63821..2dfc208cf 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/FileManagementController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/FileManagementController.java @@ -266,11 +266,14 @@ public class FileManagementController implements FileManagementResource { FileModel fileModel = fileStatusManagementService.getFileStatus(fileId); if (!fileModel.isExcludedFromAutomaticAnalysis()) { - if (fileModel.getOcrStartTime() != null || fileModel.getOcrEndTime() != null) { - reanalysisService.ocrFile(dossierId, fileId, true); - } else { + + // Re- ocr is files with pdftron ocr service is breaking files and not needed with azure. + // TODO find a better solution for this. +// if (fileModel.getOcrStartTime() != null || fileModel.getOcrEndTime() != null) { +// reanalysisService.ocrFile(dossierId, fileId, true); +// } else { fileStatusService.setStatusFullReprocess(dossierId, fileId, true, true); - } +// } } auditPersistenceService.audit(AuditRequest.builder() diff --git a/persistence-service-v1/persistence-service-external-api-v2/src/main/resources/api/documine.yaml b/persistence-service-v1/persistence-service-external-api-v2/src/main/resources/api/documine.yaml index c1b93f59e..a389ae69d 100644 --- a/persistence-service-v1/persistence-service-external-api-v2/src/main/resources/api/documine.yaml +++ b/persistence-service-v1/persistence-service-external-api-v2/src/main/resources/api/documine.yaml @@ -3629,7 +3629,7 @@ components: modifiedBy: c2e33246-e50a-4c43-831c-6789a5637db6 validFrom: 2020-01-01T00:00:00.000+00:00 validTo: 2030-12-31T23:59:59.999+00:00 - dossierTemplateStatus: ACTIVE + status: ACTIVE removeWatermark: false keepImageMetadata: true ocrByDefault: true @@ -3750,7 +3750,7 @@ components: modifiedBy: c2e33246-e50a-4c43-831c-6789a5637db6 validFrom: 2020-01-01T00:00:00.000+00:00 validTo: 2030-12-31T23:59:59.999+00:00 - dossierTemplateStatus: ACTIVE + status: ACTIVE removeWatermark: false keepImageMetadata: true ocrByDefault: true @@ -3768,7 +3768,7 @@ components: modifiedBy: 46a7f9d3-6ba0-41d7-b312-b8e708aa6f4d validFrom: 2023-01-01T00:00:00.000+00:00 validTo: 2033-12-31T23:59:59.999+00:00 - dossierTemplateStatus: ACTIVE + status: ACTIVE removeWatermark: true keepImageMetadata: true ocrByDefault: true diff --git a/persistence-service-v1/persistence-service-external-api-v2/src/main/resources/api/redactmanager.yaml b/persistence-service-v1/persistence-service-external-api-v2/src/main/resources/api/redactmanager.yaml index a8ac8f81d..9b58d7b6f 100644 --- a/persistence-service-v1/persistence-service-external-api-v2/src/main/resources/api/redactmanager.yaml +++ b/persistence-service-v1/persistence-service-external-api-v2/src/main/resources/api/redactmanager.yaml @@ -2076,7 +2076,7 @@ components: modifiedBy: c2e33246-e50a-4c43-831c-6789a5637db6 validFrom: 2020-01-01T00:00:00.000+00:00 validTo: 2030-12-31T23:59:59.999+00:00 - dossierTemplateStatus: ACTIVE + status: ACTIVE removeWatermark: false keepImageMetadata: false ocrByDefault: false @@ -2212,7 +2212,7 @@ components: modifiedBy: c2e33246-e50a-4c43-831c-6789a5637db6 validFrom: 2020-01-01T00:00:00.000+00:00 validTo: 2030-12-31T23:59:59.999+00:00 - dossierTemplateStatus: ACTIVE + status: ACTIVE removeWatermark: false keepImageMetadata: false ocrByDefault: false @@ -2231,7 +2231,7 @@ components: modifiedBy: 46a7f9d3-6ba0-41d7-b312-b8e708aa6f4d validFrom: 2023-01-01T00:00:00.000+00:00 validTo: 2033-12-31T23:59:59.999+00:00 - dossierTemplateStatus: ACTIVE + status: ACTIVE removeWatermark: true keepImageMetadata: false ocrByDefault: true