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

Pull request #525: RED-5022: Changed figure detection Filename to FIGURE, because it is hard coded in image perdiction service

Browse Source 
Merge in RED/persistence-service from RED-5022 to master

* commit '139d70c03da71b7d81f99d99a81d8693037c8aee':
  RED-5022: Changed figure detection Filename to FIGURE, because it is hard coded in image perdiction service
This commit is contained in:
Dominique Eiflaender 2022-08-19 13:41:26 +02:00
commit 8222647648
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileType.java
View File

@ -14,7 +14,7 @@ public enum FileType {
IMAGE_INFO(".json"),
IMPORTED_REDACTIONS(".json"),
TEXT_HIGHLIGHTS(".json"),
FIGURES(".json"),
FIGURE(".json"),
TABLES(".json");
@Getter

2
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/internal/AdminInterfaceController.java
View File

@ -39,7 +39,7 @@ public class AdminInterfaceController {
fileManagementStorageService.deleteObject(dossierId, fileId, FileType.REDACTION_LOG);
fileManagementStorageService.deleteObject(dossierId, fileId, FileType.TEXT);
fileManagementStorageService.deleteObject(dossierId, fileId, FileType.NER_ENTITIES);
fileManagementStorageService.deleteObject(dossierId, fileId, FileType.FIGURES);
fileManagementStorageService.deleteObject(dossierId, fileId, FileType.FIGURE);
fileManagementStorageService.deleteObject(dossierId, fileId, FileType.TABLES);
fileStatusService.setStatusFullReprocess(dossierId, fileId, true, true);

2
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/model/CvAnalysisServiceRequest.java
View File

@ -14,7 +14,7 @@ public class CvAnalysisServiceRequest {
public static final String OPERATION_TABLE_PARSING = "table";
public static final String OPERATION_FIGURE_DETECTION = "figure";
public static final String FIGURE_DETECTION_FILE_EXTENSION = "FIGURES.json.gz";
public static final String FIGURE_DETECTION_FILE_EXTENSION = "FIGURE.json.gz";
public static final String TABLE_PARSING_FILE_EXTENSION = "TABLES.json.gz";
public static final String TARGET_FILE_EXTENSION = "ORIGIN.pdf.gz";

4
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java
View File

@ -470,7 +470,7 @@ public class FileStatusService {
fileManagementStorageService.deleteObject(dossierId, fileId, FileType.IMAGE_INFO);
fileManagementStorageService.deleteObject(dossierId, fileId, FileType.TEXT);
fileManagementStorageService.deleteObject(dossierId, fileId, FileType.NER_ENTITIES);
fileManagementStorageService.deleteObject(dossierId, fileId, FileType.FIGURES);
fileManagementStorageService.deleteObject(dossierId, fileId, FileType.FIGURE);
fileManagementStorageService.deleteObject(dossierId, fileId, FileType.TABLES);
if (keepManualRedactions) {
@ -576,7 +576,7 @@ public class FileStatusService {
boolean reanalyse = fileModel.isReanalysisRequired() || manualRedactionReanalyse;
if (!reanalyse && !fileManagementStorageService.objectExists(dossierId, fileId, FileType.FIGURES) && settings.isCvServiceEnabled()) {
if (!reanalyse && !fileManagementStorageService.objectExists(dossierId, fileId, FileType.FIGURE) && settings.isCvServiceEnabled()) {
addToFigureDetectionRequestQueue(dossierId, fileId);
return;
}