diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/ExtractionService.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/ExtractionService.java index deb6945af2..96112370e3 100644 --- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/ExtractionService.java +++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/ExtractionService.java @@ -178,7 +178,6 @@ static class ExtractPDFResponse { List equations = new ArrayList<>(); List tables = new ArrayList<>(); ArrayNode variableAttributes; - JsonNode gollmCard; boolean partialFailure = true; } @@ -318,13 +317,6 @@ public DocumentAsset applyExtractPDFResponse( document.getMetadata().put("attributes", extractionResponse.variableAttributes); } - if (extractionResponse.gollmCard != null) { - if (document.getMetadata() == null) { - document.setMetadata(new HashMap<>()); - } - document.getMetadata().put("gollmCard", extractionResponse.gollmCard); - } - if (extractionResponse.equations != null) { if (document.getMetadata() == null) { document.setMetadata(new HashMap<>()); @@ -339,8 +331,6 @@ public DocumentAsset applyExtractPDFResponse( document.getMetadata().put("tables", objectMapper.valueToTree(extractionResponse.tables)); } - log.info("Added extraction to document: {}", documentId); - return documentService.updateAsset(document, projectId, hasWritePermission).orElseThrow(); } @@ -909,7 +899,18 @@ public Future extractTablesFromPDF( final TableExtraction extraction = new TableExtraction(); for (final String key : keys) { - extraction.tables.add(output.getResponse().get(key)); + final JsonNode page = output.getResponse().get(key); + if (page.isArray()) { + final ArrayNode pageOfTables = objectMapper.createArrayNode(); + for (final JsonNode table : page) { + JsonNode t = table; + if (table.isTextual()) { + t = objectMapper.readTree(table.asText()); + } + pageOfTables.add(t); + } + extraction.tables.add(pageOfTables); + } } return extraction;