Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

Merge branch 'RED-10149-4.2' into 'release/2.465.x'

Browse Source 
RED-10149: Do not re- ocr file after pages rotations; RED-10083: Minor fix in openapi spec

See merge request redactmanager/persistence-service!777
This commit is contained in:
Dominique Eifländer 2024-10-10 11:34:22 +02:00
commit c8e8ebea8b
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/FileManagementController.java vendored
View File

@ -266,11 +266,14 @@ public class FileManagementController implements FileManagementResource {
FileModel fileModel = fileStatusManagementService.getFileStatus(fileId); FileModel fileModel = fileStatusManagementService.getFileStatus(fileId);
if (!fileModel.isExcludedFromAutomaticAnalysis()) { if (!fileModel.isExcludedFromAutomaticAnalysis()) {
if (fileModel.getOcrStartTime() != null || fileModel.getOcrEndTime() != null) {
reanalysisService.ocrFile(dossierId, fileId, true); // Re- ocr is files with pdftron ocr service is breaking files and not needed with azure.
} else { // 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); fileStatusService.setStatusFullReprocess(dossierId, fileId, true, true);
} // }
} }
auditPersistenceService.audit(AuditRequest.builder() auditPersistenceService.audit(AuditRequest.builder()

6
persistence-service-v1/persistence-service-external-api-v2/src/main/resources/api/documine.yaml
View File

@ -3548,7 +3548,7 @@ components:
modifiedBy: c2e33246-e50a-4c43-831c-6789a5637db6 modifiedBy: c2e33246-e50a-4c43-831c-6789a5637db6
validFrom: 2020-01-01T00:00:00.000+00:00 validFrom: 2020-01-01T00:00:00.000+00:00
validTo: 2030-12-31T23:59:59.999+00:00 validTo: 2030-12-31T23:59:59.999+00:00
dossierTemplateStatus: ACTIVE status: ACTIVE
removeWatermark: false removeWatermark: false
keepImageMetadata: true keepImageMetadata: true
ocrByDefault: true ocrByDefault: true
@ -3669,7 +3669,7 @@ components:
modifiedBy: c2e33246-e50a-4c43-831c-6789a5637db6 modifiedBy: c2e33246-e50a-4c43-831c-6789a5637db6
validFrom: 2020-01-01T00:00:00.000+00:00 validFrom: 2020-01-01T00:00:00.000+00:00
validTo: 2030-12-31T23:59:59.999+00:00 validTo: 2030-12-31T23:59:59.999+00:00
dossierTemplateStatus: ACTIVE status: ACTIVE
removeWatermark: false removeWatermark: false
keepImageMetadata: true keepImageMetadata: true
ocrByDefault: true ocrByDefault: true
@ -3687,7 +3687,7 @@ components:
modifiedBy: 46a7f9d3-6ba0-41d7-b312-b8e708aa6f4d modifiedBy: 46a7f9d3-6ba0-41d7-b312-b8e708aa6f4d
validFrom: 2023-01-01T00:00:00.000+00:00 validFrom: 2023-01-01T00:00:00.000+00:00
validTo: 2033-12-31T23:59:59.999+00:00 validTo: 2033-12-31T23:59:59.999+00:00
dossierTemplateStatus: ACTIVE status: ACTIVE
removeWatermark: true removeWatermark: true
keepImageMetadata: true keepImageMetadata: true
ocrByDefault: true ocrByDefault: true

6
persistence-service-v1/persistence-service-external-api-v2/src/main/resources/api/redactmanager.yaml
View File

@ -2110,7 +2110,7 @@ components:
modifiedBy: c2e33246-e50a-4c43-831c-6789a5637db6 modifiedBy: c2e33246-e50a-4c43-831c-6789a5637db6
validFrom: 2020-01-01T00:00:00.000+00:00 validFrom: 2020-01-01T00:00:00.000+00:00
validTo: 2030-12-31T23:59:59.999+00:00 validTo: 2030-12-31T23:59:59.999+00:00
dossierTemplateStatus: ACTIVE status: ACTIVE
removeWatermark: false removeWatermark: false
keepImageMetadata: false keepImageMetadata: false
ocrByDefault: false ocrByDefault: false
@ -2246,7 +2246,7 @@ components:
modifiedBy: c2e33246-e50a-4c43-831c-6789a5637db6 modifiedBy: c2e33246-e50a-4c43-831c-6789a5637db6
validFrom: 2020-01-01T00:00:00.000+00:00 validFrom: 2020-01-01T00:00:00.000+00:00
validTo: 2030-12-31T23:59:59.999+00:00 validTo: 2030-12-31T23:59:59.999+00:00
dossierTemplateStatus: ACTIVE status: ACTIVE
removeWatermark: false removeWatermark: false
keepImageMetadata: false keepImageMetadata: false
ocrByDefault: false ocrByDefault: false
@ -2265,7 +2265,7 @@ components:
modifiedBy: 46a7f9d3-6ba0-41d7-b312-b8e708aa6f4d modifiedBy: 46a7f9d3-6ba0-41d7-b312-b8e708aa6f4d
validFrom: 2023-01-01T00:00:00.000+00:00 validFrom: 2023-01-01T00:00:00.000+00:00
validTo: 2033-12-31T23:59:59.999+00:00 validTo: 2033-12-31T23:59:59.999+00:00
dossierTemplateStatus: ACTIVE status: ACTIVE
removeWatermark: true removeWatermark: true
keepImageMetadata: false keepImageMetadata: false
ocrByDefault: true ocrByDefault: true