upgrade to file 5.43

harvard-lts · Nov 30, 2022 · 2d540e5 · 2d540e5
1 parent f195b82
commit 2d540e5
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Tool upgrades
   - DROID 6.5.2
   - ExifTool 12.42
+  - File 5.43
   - Jhove 1.26.1
   - MediaInfo 22.09
   - Tika 2.3.0

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -16,8 +16,8 @@
 
 FROM docker.io/eclipse-temurin:17-jre-jammy
 
-ARG FILE_VERSION=5.41
-ARG FILE_SHA256=13e532c7b364f7d57e23dfeea3147103150cb90593a57af86c10e4f6e411603f
+ARG FILE_VERSION=5.43
+ARG FILE_SHA256=8c8015e91ae0e8d0321d94c78239892ef9dbc70c4ade0008c0e95894abfb1991
 
 RUN apt-get update && \
     apt-get install -yqq \

diff --git a/docker/Dockerfile-release b/docker/Dockerfile-release
@@ -21,8 +21,8 @@
 
 FROM docker.io/eclipse-temurin:17-jre-jammy
 
-ARG FILE_VERSION=5.41
-ARG FILE_SHA256=13e532c7b364f7d57e23dfeea3147103150cb90593a57af86c10e4f6e411603f
+ARG FILE_VERSION=5.43
+ARG FILE_SHA256=8c8015e91ae0e8d0321d94c78239892ef9dbc70c4ade0008c0e95894abfb1991
 
 RUN apt-get update && \
     apt-get install -yqq \

diff --git a/docker/Dockerfile-test b/docker/Dockerfile-test
@@ -12,8 +12,8 @@
 
 FROM docker.io/maven:3-eclipse-temurin-17
 
-ARG FILE_VERSION=5.41
-ARG FILE_SHA256=13e532c7b364f7d57e23dfeea3147103150cb90593a57af86c10e4f6e411603f
+ARG FILE_VERSION=5.43
+ARG FILE_SHA256=8c8015e91ae0e8d0321d94c78239892ef9dbc70c4ade0008c0e95894abfb1991
 
 # Set timezone to eastern because some of the tests need this
 RUN echo 'America/New_York' > /etc/timezone

diff --git a/testfiles/output/WordPerfect5_0.wp_XmlUnitExpectedOutput.xml b/testfiles/output/WordPerfect5_0.wp_XmlUnitExpectedOutput.xml
@@ -3,6 +3,7 @@
   <identification>
     <identity format="WordPerfect Document" mimetype="application/vnd.wordperfect" toolname="FITS" toolversion="1.2.x">
       <tool toolname="Droid" toolversion="6.3" />
+      <tool toolname="file utility" toolversion="5.43" />
       <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" />
       <version toolname="Droid" toolversion="6.3">5.0</version>
       <externalIdentifier toolname="Droid" toolversion="6.3" type="puid">x-fmt/393</externalIdentifier>

diff --git a/testfiles/output/WordPerfect5_2.wp_XmlUnitExpectedOutput.xml b/testfiles/output/WordPerfect5_2.wp_XmlUnitExpectedOutput.xml
@@ -3,6 +3,7 @@
   <identification>
     <identity format="WordPerfect Document" mimetype="application/vnd.wordperfect" toolname="FITS" toolversion="1.2.x">
       <tool toolname="Droid" toolversion="6.3" />
+      <tool toolname="file utility" toolversion="5.43" />
       <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" />
       <version toolname="Droid" toolversion="6.3">5.1</version>
       <externalIdentifier toolname="Droid" toolversion="6.3" type="puid">x-fmt/394</externalIdentifier>

diff --git a/testfiles/output/signature_corrupted.jp2_XmlUnitExpectedOutput.xml b/testfiles/output/signature_corrupted.jp2_XmlUnitExpectedOutput.xml
@@ -2,7 +2,6 @@
 <fits xmlns="http://hul.harvard.edu/ois/xml/ns/fits/fits_output" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hul.harvard.edu/ois/xml/ns/fits/fits_output http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd" version="1.6.0-SNAPSHOT" timestamp="11/12/22, 9:17 AM">
   <identification>
     <identity format="JPEG 2000 JP2" mimetype="image/jp2" toolname="FITS" toolversion="1.6.0-SNAPSHOT">
-      <tool toolname="file utility" toolversion="5.41" />
       <tool toolname="Tika" toolversion="2.3.0" />
       <tool toolname="jpylyzer" toolversion="2.1.0" />
     </identity>

diff --git a/testfiles/output/simple_webvtt.vtt_XmlUnitExpectedOutput.xml b/testfiles/output/simple_webvtt.vtt_XmlUnitExpectedOutput.xml
@@ -4,6 +4,7 @@
     <identity format="WebVTT" mimetype="text/vtt" toolname="FITS" toolversion="1.6.0-SNAPSHOT">
       <tool toolname="VTT Tool" toolversion="0.1" />
       <tool toolname="Droid" toolversion="6.5.2" />
+      <tool toolname="file utility" toolversion="5.43" />
       <externalIdentifier toolname="Droid" toolversion="6.5.2" type="puid">fmt/1454</externalIdentifier>
     </identity>
   </identification>
@@ -21,7 +22,7 @@
   <metadata>
     <text>
       <linebreak toolname="Jhove" toolversion="1.26.0" status="SINGLE_RESULT">LF</linebreak>
-      <charset toolname="Jhove" toolversion="1.26.0">US-ASCII</charset>
+      <charset toolname="Jhove" toolversion="1.26.0" status="SINGLE_RESULT">US-ASCII</charset>
       <standard>
         <textMD:textMD xmlns:textMD="info:lc/xmlns/textMD-v3">
           <textMD:character_info>

diff --git a/xml/fileutility/fileutility_to_fits.xslt b/xml/fileutility/fileutility_to_fits.xslt
@@ -558,14 +558,25 @@
 		  			<!-- WORD PERFECT -->
                     <xsl:when test="$format='(Corel/WP)'">
                         <xsl:attribute name="format">
-                            <xsl:value-of select="string('WordPerfect Document')"/>
+                            <xsl:value-of select="'WordPerfect Document'"/>
                         </xsl:attribute>
-                    </xsl:when>     
+                    </xsl:when>
+					<xsl:when test="starts-with($format, 'WordPerfect')">
+						<xsl:attribute name="format">
+							<xsl:value-of select="'WordPerfect Document'" />
+						</xsl:attribute>
+					</xsl:when>
+					<!-- VTT -->
+					<xsl:when test="starts-with($format, 'WebVTT')">
+						<xsl:attribute name="format">
+							<xsl:value-of select="'WebVTT'" />
+						</xsl:attribute>
+					</xsl:when>
 					<xsl:otherwise>
 						<xsl:attribute name="format">
 							<xsl:value-of select="$format"/>
 						</xsl:attribute>
-					</xsl:otherwise>							
+					</xsl:otherwise>
 				</xsl:choose>
 
 			</identity>