From 4ab8a1120f99015bfffc3e75781bcfb9d226b8c0 Mon Sep 17 00:00:00 2001 From: David Edwards Date: Thu, 29 Apr 2021 16:39:03 +0100 Subject: [PATCH] ATS 905 enable IPTCMetadataExtractor in Tika and AIO engine config (#394) --- .travis.yml | 4 +-- .../test/resources/quick.tiff_metadata.json | 15 +++++--- .../main/resources/tika_engine_config.json | 34 +++++++++---------- 3 files changed, 29 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1fd639a7..711b8cf6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,11 +64,11 @@ jobs: before_script: travis_wait bash _ci/cache_artifacts.sh install: _ci/build.sh tika script: bash _ci/test.sh tika - - name: "All in One Transfomer" + - name: "All in One Transformer" if: branch NOT IN (company_release) before_script: travis_wait bash _ci/cache_artifacts.sh install: _ci/build.sh full-build - script: bash _ci/test.sh aio-test + script: travis_wait 30 bash _ci/test.sh aio-test # - name: "WhiteSource" # if: branch NOT IN (company_release) # script: bash _ci/whitesource.sh diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.tiff_metadata.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.tiff_metadata.json index e0584f08..c83ead76 100644 --- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.tiff_metadata.json +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.tiff_metadata.json @@ -1,11 +1,16 @@ { "{http://www.alfresco.org/model/exif/1.0}pixelYDimension" : "584", "{http://www.alfresco.org/model/content/1.0}description" : "Gym class featuring a brown fox and lazy dog", - "{http://www.alfresco.org/model/exif/1.0}orientation" : "1", - "{http://www.alfresco.org/model/exif/1.0}yResolution" : "50.0", - "{http://www.alfresco.org/model/exif/1.0}resolutionUnit" : "Inch", + "{http://purl.org/dc/elements/1.1/}title" : "The quick brown fox jumps over the lazy dog", "{http://www.alfresco.org/model/exif/1.0}pixelXDimension" : "413", "{http://www.alfresco.org/model/content/1.0}author" : "Nevin Nollop", - "{http://www.alfresco.org/model/exif/1.0}xResolution" : "50.0", - "{http://www.alfresco.org/model/content/1.0}title" : "The quick brown fox jumps over the lazy dog" + "{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}CiEmailWork" : "nevin.nollop@alfresco.com", + "{http://www.alfresco.org/model/content/1.0}title" : "The quick brown fox jumps over the lazy dog", + "{http://purl.org/dc/elements/1.1/}description" : "Gym class featuring a brown fox and lazy dog", + "{http://purl.org/dc/elements/1.1/}creator" : "Nevin Nollop", + "{http://www.alfresco.org/model/exif/1.0}orientation" : "1", + "{http://purl.org/dc/elements/1.1/}subject" : "Pangram, fox, dog", + "{http://www.alfresco.org/model/exif/1.0}resolutionUnit" : "Inch", + "{http://www.alfresco.org/model/exif/1.0}yResolution" : "50.0", + "{http://www.alfresco.org/model/exif/1.0}xResolution" : "50.0" } \ No newline at end of file diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/tika_engine_config.json b/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/tika_engine_config.json index 8df01075..62d4e5e1 100644 --- a/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/tika_engine_config.json +++ b/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/tika_engine_config.json @@ -529,23 +529,23 @@ { "transformerName": "IPTCMetadataExtractor", "supportedSourceAndTargetList": [ - {"sourceMediaType": "image/gif", "priority": 60, "targetMediaType": "alfresco-metadata-extract"}, - {"sourceMediaType": "image/jp2", "priority": 60, "targetMediaType": "alfresco-metadata-extract"}, - {"sourceMediaType": "image/jpeg", "priority": 60, "targetMediaType": "alfresco-metadata-extract"}, - {"sourceMediaType": "image/png", "priority": 60, "targetMediaType": "alfresco-metadata-extract"}, - {"sourceMediaType": "image/tiff", "priority": 60, "targetMediaType": "alfresco-metadata-extract"}, - {"sourceMediaType": "image/webp", "priority": 60, "targetMediaType": "alfresco-metadata-extract"}, - {"sourceMediaType": "image/x-raw-adobe", "priority": 60, "targetMediaType": "alfresco-metadata-extract"}, - {"sourceMediaType": "image/x-raw-canon", "priority": 60, "targetMediaType": "alfresco-metadata-extract"}, - {"sourceMediaType": "image/x-raw-fuji", "priority": 60, "targetMediaType": "alfresco-metadata-extract"}, - {"sourceMediaType": "image/x-raw-hasselblad", "priority": 60, "targetMediaType": "alfresco-metadata-extract"}, - {"sourceMediaType": "image/x-raw-kodak", "priority": 60, "targetMediaType": "alfresco-metadata-extract"}, - {"sourceMediaType": "image/x-raw-minolta", "priority": 60, "targetMediaType": "alfresco-metadata-extract"}, - {"sourceMediaType": "image/x-raw-nikon", "priority": 60, "targetMediaType": "alfresco-metadata-extract"}, - {"sourceMediaType": "image/x-raw-olympus", "priority": 60, "targetMediaType": "alfresco-metadata-extract"}, - {"sourceMediaType": "image/x-raw-panasonic", "priority": 60, "targetMediaType": "alfresco-metadata-extract"}, - {"sourceMediaType": "image/x-raw-pentax", "priority": 60, "targetMediaType": "alfresco-metadata-extract"}, - {"sourceMediaType": "image/x-raw-sony", "priority": 60, "targetMediaType": "alfresco-metadata-extract"} + {"sourceMediaType": "image/gif", "priority": 45, "targetMediaType": "alfresco-metadata-extract"}, + {"sourceMediaType": "image/jp2", "priority": 45, "targetMediaType": "alfresco-metadata-extract"}, + {"sourceMediaType": "image/jpeg", "priority": 45, "targetMediaType": "alfresco-metadata-extract"}, + {"sourceMediaType": "image/png", "priority": 45, "targetMediaType": "alfresco-metadata-extract"}, + {"sourceMediaType": "image/tiff", "priority": 45, "targetMediaType": "alfresco-metadata-extract"}, + {"sourceMediaType": "image/webp", "priority": 45, "targetMediaType": "alfresco-metadata-extract"}, + {"sourceMediaType": "image/x-raw-adobe", "priority": 45, "targetMediaType": "alfresco-metadata-extract"}, + {"sourceMediaType": "image/x-raw-canon", "priority": 45, "targetMediaType": "alfresco-metadata-extract"}, + {"sourceMediaType": "image/x-raw-fuji", "priority": 45, "targetMediaType": "alfresco-metadata-extract"}, + {"sourceMediaType": "image/x-raw-hasselblad", "priority": 45, "targetMediaType": "alfresco-metadata-extract"}, + {"sourceMediaType": "image/x-raw-kodak", "priority": 45, "targetMediaType": "alfresco-metadata-extract"}, + {"sourceMediaType": "image/x-raw-minolta", "priority": 45, "targetMediaType": "alfresco-metadata-extract"}, + {"sourceMediaType": "image/x-raw-nikon", "priority": 45, "targetMediaType": "alfresco-metadata-extract"}, + {"sourceMediaType": "image/x-raw-olympus", "priority": 45, "targetMediaType": "alfresco-metadata-extract"}, + {"sourceMediaType": "image/x-raw-panasonic", "priority": 45, "targetMediaType": "alfresco-metadata-extract"}, + {"sourceMediaType": "image/x-raw-pentax", "priority": 45, "targetMediaType": "alfresco-metadata-extract"}, + {"sourceMediaType": "image/x-raw-sony", "priority": 45, "targetMediaType": "alfresco-metadata-extract"} ], "transformOptions": [ "metadataOptions"