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

Merge branch 'RED-10149-master' into 'master'

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

Closes RED-10149

See merge request redactmanager/persistence-service!778
This commit is contained in:
Dominique Eifländer 2024-10-10 12:18:18 +02:00
commit 06f5f4f241
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);
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()

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

@ -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

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

@ -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