diff --git a/lib-local/edu/harvard/huit/lts/ots/1.0.51/ots-1.0.51.jar b/lib-local/edu/harvard/huit/lts/ots/1.0.51/ots-1.0.51.jar deleted file mode 100644 index 2cc89511..00000000 Binary files a/lib-local/edu/harvard/huit/lts/ots/1.0.51/ots-1.0.51.jar and /dev/null differ diff --git a/lib-local/edu/harvard/huit/lts/ots/1.0.56/ots-1.0.56.jar b/lib-local/edu/harvard/huit/lts/ots/1.0.56/ots-1.0.56.jar new file mode 100644 index 00000000..88a77551 Binary files /dev/null and b/lib-local/edu/harvard/huit/lts/ots/1.0.56/ots-1.0.56.jar differ diff --git a/lib-local/edu/harvard/huit/lts/ots/1.0.51/ots-1.0.51.pom b/lib-local/edu/harvard/huit/lts/ots/1.0.56/ots-1.0.56.pom similarity index 94% rename from lib-local/edu/harvard/huit/lts/ots/1.0.51/ots-1.0.51.pom rename to lib-local/edu/harvard/huit/lts/ots/1.0.56/ots-1.0.56.pom index 8100026c..86730a0d 100644 --- a/lib-local/edu/harvard/huit/lts/ots/1.0.51/ots-1.0.51.pom +++ b/lib-local/edu/harvard/huit/lts/ots/1.0.56/ots-1.0.56.pom @@ -4,6 +4,6 @@ 4.0.0 edu.harvard.huit.lts ots - 1.0.51 + 1.0.56 POM was created from install:install-file diff --git a/lib-local/edu/harvard/huit/lts/ots/maven-metadata-local.xml b/lib-local/edu/harvard/huit/lts/ots/maven-metadata-local.xml index 9f205e00..be674c73 100644 --- a/lib-local/edu/harvard/huit/lts/ots/maven-metadata-local.xml +++ b/lib-local/edu/harvard/huit/lts/ots/maven-metadata-local.xml @@ -3,10 +3,10 @@ edu.harvard.huit.lts ots - 1.0.51 + 1.0.56 - 1.0.51 + 1.0.56 - 20190611151235 + 20211214193341 diff --git a/pom.xml b/pom.xml index e5c70a2e..1747bb6a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 edu.harvard.huit.lts fits - 1.5.0 + 1.5.1 jar FITS @@ -24,15 +24,15 @@ 1.6 3.0.2 2.0.1 - 4.12 + 4.13.2 2.6 1.2 3.2.2 - 2.4 + 2.11.0 1.2 1.8 6.4 - 1.0.53 + 1.0.56 1.20.1 4.1.0 2.1 @@ -40,7 +40,7 @@ 31.3 2.4 3.6GA - 2.9.1 + 2.12.1 9.8.0-10 3.0 diff --git a/testfiles/output/4072820.tif_XmlUnitExpectedOutput.xml b/testfiles/output/4072820.tif_XmlUnitExpectedOutput.xml index f01e9c77..517789fe 100644 --- a/testfiles/output/4072820.tif_XmlUnitExpectedOutput.xml +++ b/testfiles/output/4072820.tif_XmlUnitExpectedOutput.xml @@ -1,10 +1,10 @@ - + - + - + 2.2 6.0 x-fmt/387 @@ -12,14 +12,14 @@ 13941032 - Adobe Photoshop CS Macintosh - 2005:12:15 12:46:50 - 2005-12-15T07:46:50 - 2005:12:15 10:56:19-05:00 - /Users/dan179/git/git-daveneiman/fits/testfiles/4072820.tif - 4072820.tif - 4a333061a5619b94aa5afc3bb106eb54 - 1516117982000 + Adobe Photoshop CS Macintosh + 2005:12:15 12:46:50 + 2005-12-15T07:46:50 + 2005:12:15 10:56:19-05:00 + /Users/dan179/git/git-daveneiman/fits/testfiles/4072820.tif + 4072820.tif + 4a333061a5619b94aa5afc3bb106eb54 + 1516117982000 true @@ -43,23 +43,23 @@ 8 8 8 3 Adobe Photoshop CS Macintosh - NIKON D100 + NIKON D100 8 0.033 - 0.0333 + 0.0333 0 unknown Pattern Flash did not fire - 28.0 - 2.1.0 - digital still camera - NIKON CORPORATION - Manual - 0220 - 2.8 - One-chip color area sensor - [Green,Red][Blue,Green] + 28.0 + 2.1.0 + digital still camera + NIKON CORPORATION + Manual + 0220 + 2.8 + One-chip color area sensor + [Green,Red][Blue,Green] @@ -183,20 +183,20 @@ - + - - - - + + + + - + - - + + diff --git a/testfiles/output/HasAnnotations.pdf_XmlUnitExpectedOutput.xml b/testfiles/output/HasAnnotations.pdf_XmlUnitExpectedOutput.xml index e38b122c..555c5798 100644 --- a/testfiles/output/HasAnnotations.pdf_XmlUnitExpectedOutput.xml +++ b/testfiles/output/HasAnnotations.pdf_XmlUnitExpectedOutput.xml @@ -1,59 +1,60 @@ - + - - - - - + + + + + - - 1.5 - fmt/19 + + 1.5 + 1.5 (password protected) + fmt/19 - 103323 - Adobe PDF Library 11.0/Acrobat PDFMaker 11 for Word - 2015:08:19 17:12:03-04:00 - 2015-08-19T21:12:03Z - 2015:08:19 17:10:14-04:00 - /Users/dan179/git/git-daveneiman/fits/testfiles/HasAnnotations.pdf - HasAnnotations.pdf - 4475c0c78050f41718837eb3f8069cbd - 1516117983000 + 103323 + Adobe PDF Library 11.0/Acrobat PDFMaker 11 for Word + 2015:08:19 17:12:03-04:00 + 2015-08-19T21:12:03Z + 2015:08:19 17:10:14-04:00 + /Users/dan179/git/git-daveneiman/fits/testfiles/HasAnnotations.pdf + HasAnnotations.pdf + 4475c0c78050f41718837eb3f8069cbd + 1516117983000 - true - true + true + true - Program Announcement - OUSD(AT&L) - EN-US - 6 - yes + Program Announcement + OUSD(AT&L) + EN-US + 6 + yes no - no - yes - + no + yes + ArialMT - + Cambria - + Cambria-Bold - + Tahoma-Bold - + TimesNewRomanPS-BoldMT - + TimesNewRomanPSMT no @@ -73,20 +74,20 @@ - + - - - - - - + + + + + + - - + + diff --git a/testfiles/output/HasChangeHistory.pdf_XmlUnitExpectedOutput.xml b/testfiles/output/HasChangeHistory.pdf_XmlUnitExpectedOutput.xml index 55e95e7d..758a1893 100644 --- a/testfiles/output/HasChangeHistory.pdf_XmlUnitExpectedOutput.xml +++ b/testfiles/output/HasChangeHistory.pdf_XmlUnitExpectedOutput.xml @@ -1,59 +1,60 @@ - + - - - - - + + + + + - - 1.5 - fmt/19 + + 1.5 + 1.5 (password protected) + fmt/19 - 101002 - Adobe PDF Library 11.0/Acrobat PDFMaker 11 for Word - 2015:08:19 17:10:57-04:00 - 2015-08-19T21:10:57Z - 2015:08:19 17:10:14-04:00 - /Users/dan179/git/git-daveneiman/fits/testfiles/HasChangeHistory.pdf - HasChangeHistory.pdf - ad18d1a191b7ab53614f3d003fa60472 - 1516117983000 + 101002 + Adobe PDF Library 11.0/Acrobat PDFMaker 11 for Word + 2015:08:19 17:10:57-04:00 + 2015-08-19T21:10:57Z + 2015:08:19 17:10:14-04:00 + /Users/dan179/git/git-daveneiman/fits/testfiles/HasChangeHistory.pdf + HasChangeHistory.pdf + ad18d1a191b7ab53614f3d003fa60472 + 1516117983000 - true - true + true + true - Program Announcement - OUSD(AT&L) - EN-US - 6 - yes + Program Announcement + OUSD(AT&L) + EN-US + 6 + yes no - no - yes - + no + yes + ArialMT - + Cambria - + Cambria-Bold - + Tahoma-Bold - + TimesNewRomanPS-BoldMT - + TimesNewRomanPSMT no @@ -73,20 +74,20 @@ - + - - - - - - + + + + + + - - + + diff --git a/testfiles/output/ICFA.KC.BIA.1524-small.jpg_XmlUnitExpectedOutput.xml b/testfiles/output/ICFA.KC.BIA.1524-small.jpg_XmlUnitExpectedOutput.xml index 9437d139..2fc7c293 100644 --- a/testfiles/output/ICFA.KC.BIA.1524-small.jpg_XmlUnitExpectedOutput.xml +++ b/testfiles/output/ICFA.KC.BIA.1524-small.jpg_XmlUnitExpectedOutput.xml @@ -1,72 +1,72 @@ - + - + - - - + + + 2.2.1 - 16 - 5.5 + 16 + 5.5 fmt/645 - 38829 - Canon EOS 5D Mark II + 38829 + Canon EOS 5D Mark II Adobe Photoshop CS6 (Windows) - 2017:01:30 11:39:51 - 2017-01-30T06:39:51 - 2010:07:07 14:22:53 + 2017:01:30 11:39:51 + 2017-01-30T06:39:51 + 2010:07:07 14:22:53 2017:01:30 11:39:51 - /Users/dan179/git/git-daveneiman/fits/testfiles/ICFA.KC.BIA.1524-small.jpg - ICFA.KC.BIA.1524-small.jpg - 0108175c9153da1d41278066a2e3c1a2 - 1516117983000 + /Users/dan179/git/git-daveneiman/fits/testfiles/ICFA.KC.BIA.1524-small.jpg + ICFA.KC.BIA.1524-small.jpg + 0108175c9153da1d41278066a2e3c1a2 + 1516117983000 - true - true - Value offset not word-aligned: 239 severity=info offset=126 - Value offset not word-aligned: 247 severity=info offset=138 - Value offset not word-aligned: 255 severity=info offset=174 - Value offset not word-aligned: 285 severity=info offset=186 - TIFF compression scheme 6 is deprecated severity=info + true + true + Value offset not word-aligned: 239 severity=info offset=126 + Value offset not word-aligned: 247 severity=info offset=138 + Value offset not word-aligned: 255 severity=info offset=174 + Value offset not word-aligned: 285 severity=info offset=186 + TIFF compression scheme 6 is deprecated severity=info - big endian - JPEG - 109 - 150 - RGB - Adobe RGB (1998) - 1 1 - normal* - in. - 350 - 350 - 8 8 8 - 3 - Adobe Photoshop CS6 (Windows) - Canon EOS 5D Mark II - 11 - 0.125 - 100 - 0 + big endian + JPEG + 109 + 150 + RGB + Adobe RGB (1998) + 1 1 + normal* + in. + 350 + 350 + 8 8 8 + 3 + Adobe Photoshop CS6 (Windows) + Canon EOS 5D Mark II + 11 + 0.125 + 100 + 0 unknown - Flash did not fire, compulsory flash mode - 50 - 2.1.0 - Canon - 0221 + Flash did not fire, compulsory flash mode + 50 + 2.1.0 + Canon + 0221 1220 - 1/8 - 11.0 + 1/8 + 11.0 6.918863 - 2.5 + 2.5 2.625 @@ -167,20 +167,20 @@ - - + + - - - - - - + + + + + + - - + + diff --git a/testfiles/output/JPEGTest_20170591--JPEGTest_20170591.jpeg_XmlUnitExpectedOutput.xml b/testfiles/output/JPEGTest_20170591--JPEGTest_20170591.jpeg_XmlUnitExpectedOutput.xml index 10523c78..7a2d7b3d 100644 --- a/testfiles/output/JPEGTest_20170591--JPEGTest_20170591.jpeg_XmlUnitExpectedOutput.xml +++ b/testfiles/output/JPEGTest_20170591--JPEGTest_20170591.jpeg_XmlUnitExpectedOutput.xml @@ -1,81 +1,81 @@ - + - + - - - + + + 2.2.1 - 16 + 16 fmt/645 - 4324778 - HERO3+ Black Edition + 4324778 + HERO3+ Black Edition Adobe Photoshop CS6 (Macintosh) - 2015:06:25 11:03:38 - 2015-06-25T07:03:38 - 2014:10:27 12:34:43 + 2015:06:25 11:03:38 + 2015-06-25T07:03:38 + 2014:10:27 12:34:43 2015:06:25 11:03:38 - /Users/dan179/git/git-daveneiman/fits/testfiles/JPEGTest_20170591--JPEGTest_20170591.jpeg - JPEGTest_20170591--JPEGTest_20170591.jpeg - 3c5a86c471809d347e99d19c51bd1b94 - 1516117983000 + /Users/dan179/git/git-daveneiman/fits/testfiles/JPEGTest_20170591--JPEGTest_20170591.jpeg + JPEGTest_20170591--JPEGTest_20170591.jpeg + 3c5a86c471809d347e99d19c51bd1b94 + 1516117983000 - true - true - TIFF compression scheme 6 is deprecated severity=info + true + true + TIFF compression scheme 6 is deprecated severity=info - big endian - JPEG - 3920 - 2160 - RGB - sRGB IEC61966-2.1 - 1 1 - 1 - normal* - in. - 72 - 72 - 8 8 8 - 3 - Adobe Photoshop CS6 (Macintosh) - HERO3+ Black Edition - 2.8 - 0.008 - 0.0083 + big endian + JPEG + 3920 + 2160 + RGB + sRGB IEC61966-2.1 + 1 1 + 1 + normal* + in. + 72 + 72 + 8 8 8 + 3 + Adobe Photoshop CS6 (Macintosh) + HERO3+ Black Edition + 2.8 + 0.008 + 0.0083 0.008340283569641367 - 142 - 0 - unknown - undef + 142 + 0 + unknown + undef NaN - centre weighted average - Center weighted average - No flash function - 2.77 - 2.8 - - undef + centre weighted average + Center weighted average + No flash function + 2.77 + 2.8 + + undef NaN - 2.1.0 - digital still camera - GoPro - Normal program - 0221 - 1/120 - 2.8 + 2.1.0 + digital still camera + GoPro + Normal program + 0221 + 1/120 + 2.8 2.97 - 2.8 + 2.8 2.97 - One-chip color area sensor + One-chip color area sensor @@ -178,20 +178,20 @@ - - + + - - - - - - + + + + + + - - + + diff --git a/testfiles/output/LibreOffice.doc_XmlUnitExpectedOutput.xml b/testfiles/output/LibreOffice.doc_XmlUnitExpectedOutput.xml index 7fb6c8d6..0181bfa7 100644 --- a/testfiles/output/LibreOffice.doc_XmlUnitExpectedOutput.xml +++ b/testfiles/output/LibreOffice.doc_XmlUnitExpectedOutput.xml @@ -1,42 +1,43 @@ - + - + - + + - + 97-2003 fmt/40 - + - 2016:01:15 20:03:34 - 2016-01-15T20:03:34Z - 2015:12:14 16:12:58 - 2015-12-14 11:12:58 - /Users/dan179/git/git-daveneiman/fits/testfiles/LibreOffice.doc - LibreOffice.doc - 10240 - 2520885e1d9e43b13d8dab9009393b56 - 1516117983000 + 2016:01:15 20:03:34 + 2016-01-15T20:03:34Z + 2015:12:14 16:12:58 + 2015-12-14 12:12:58 + /Users/dan179/git/git-daveneiman/fits/testfiles/LibreOffice.doc + LibreOffice.doc + 10240 + 2520885e1d9e43b13d8dab9009393b56 + 1516117983000 - 1 + 1 0 - 13 + 13 0 - 72 + 72 0 - David Neiman - 4 - 4 - U.S. English + David Neiman + 4 + 4 + U.S. English 1 @@ -49,20 +50,20 @@ - + - + - - - - + + + + - - + + diff --git a/testfiles/output/PDF_embedded_resources.pdf_XmlUnitExpectedOutput.xml b/testfiles/output/PDF_embedded_resources.pdf_XmlUnitExpectedOutput.xml index c965652d..8154af1b 100644 --- a/testfiles/output/PDF_embedded_resources.pdf_XmlUnitExpectedOutput.xml +++ b/testfiles/output/PDF_embedded_resources.pdf_XmlUnitExpectedOutput.xml @@ -1,62 +1,63 @@ - + - - - - - + + + + + - - 1.6 - fmt/20 + + 1.6 + 1.6 (password protected) + fmt/20 - 1113979 - Acrobat Distiller 8.1.0 (Windows)/Adobe PageMaker 6.52 - 2015:08:19 16:17:32-04:00 - 2015-08-19T20:17:32Z - 2008:09:24 15:27:24-04:00 - /Users/dan179/git/git-daveneiman/fits/testfiles/PDF_embedded_resources.pdf - PDF_embedded_resources.pdf - dbfbf8c633100f5d4301fed7b65ad698 - 1516117983000 + 1113979 + Acrobat Distiller 8.1.0 (Windows)/Adobe PageMaker 6.52 + 2015:08:19 16:17:32-04:00 + 2015-08-19T20:17:32Z + 2008:09:24 15:27:24-04:00 + /Users/dan179/git/git-daveneiman/fits/testfiles/PDF_embedded_resources.pdf + PDF_embedded_resources.pdf + dbfbf8c633100f5d4301fed7b65ad698 + 1516117983000 - true - true + true + true - digibook - Harvard University Archives - 52 + digibook + Harvard University Archives + 52 no - no - no - 433 - + no + no + 433 + BauerBodoniBT-Bold - + BauerBodoniBT-BoldItalic - + BauerBodoniBT-Italic - + BauerBodoniBT-Roman - + Charlesworth-Bold - + Charlesworth-Normal - booklet10 - booklet10 + booklet10 + booklet10 no @@ -72,20 +73,20 @@ - + - - - - - - + + + + + + - - + + diff --git a/testfiles/output/Word2003PasswordProtected.doc_XmlUnitExpectedOutput.xml b/testfiles/output/Word2003PasswordProtected.doc_XmlUnitExpectedOutput.xml index a974c57a..e9434e55 100644 --- a/testfiles/output/Word2003PasswordProtected.doc_XmlUnitExpectedOutput.xml +++ b/testfiles/output/Word2003PasswordProtected.doc_XmlUnitExpectedOutput.xml @@ -1,37 +1,38 @@ - + - - + + + - + - 35357:01:04 01:57:19 - 2015-08-20T15:45:00Z - 2015:08:20 15:44:00 - 2015-08-20 11:44:00 - Microsoft Office Word - 14.0000 - /Users/dan179/git/git-daveneiman/fits/testfiles/Word2003PasswordProtected.doc - Word2003PasswordProtected.doc - 243712 - e40cc3565482b4cef61a00c198e4e68b - 1453908574000 + 35357:01:04 01:57:19 + 2015-08-20T15:45:00Z + 2015:08:20 15:44:00 + 2015-08-20 12:44:00 + Microsoft Office Word + 14.0000 + /Users/dan179/git/git-daveneiman/fits/testfiles/Word2003PasswordProtected.doc + Word2003PasswordProtected.doc + 243712 + e40cc3565482b4cef61a00c198e4e68b + 1453908574000 - 15 - 3573 - 20370 - k05higgi - 169 - 47 - yes - U.S. English + 15 + 3573 + 20370 + k05higgi + 169 + 47 + yes + U.S. English 15 @@ -44,20 +45,20 @@ - + - + - - - - + + + + - - + + diff --git a/testfiles/output/Word2003_has_table_of_contents.doc_XmlUnitExpectedOutput.xml b/testfiles/output/Word2003_has_table_of_contents.doc_XmlUnitExpectedOutput.xml index bfc5cc75..e8270789 100644 --- a/testfiles/output/Word2003_has_table_of_contents.doc_XmlUnitExpectedOutput.xml +++ b/testfiles/output/Word2003_has_table_of_contents.doc_XmlUnitExpectedOutput.xml @@ -1,38 +1,39 @@ - + - - + + + - + - 2015:08:20 15:59:10 - 2015-08-20T15:59:00Z - 2015:08:20 15:59:00 - 2015-08-20 11:59:00 - Microsoft Office Word - 14.0000 - /Users/dan179/git/git-daveneiman/fits/testfiles/Word2003_has_table_of_contents.doc - Word2003_has_table_of_contents.doc - 99328 - afb707e78e777bebf7563534f2d51762 - 1516117983000 + 2015:08:20 15:59:10 + 2015-08-20T15:59:00Z + 2015:08:20 15:59:00 + 2015-08-20 12:59:00 + Microsoft Office Word + 14.0000 + /Users/dan179/git/git-daveneiman/fits/testfiles/Word2003_has_table_of_contents.doc + Word2003_has_table_of_contents.doc + 99328 + afb707e78e777bebf7563534f2d51762 + 1516117983000 - 5 - 1341 - 7646 - Digital Repository Services (DRS) User Manual for Data Loading - viz765 - 63 - 17 - yes - U.S. English + 5 + 1341 + 7646 + Digital Repository Services (DRS) User Manual for Data Loading + viz765 + 63 + 17 + yes + U.S. English yes @@ -47,20 +48,20 @@ - + - + - - - - + + + + - + diff --git a/testfiles/output/Word2003_many_graphics.doc_XmlUnitExpectedOutput.xml b/testfiles/output/Word2003_many_graphics.doc_XmlUnitExpectedOutput.xml index 61b9c35b..55303f80 100644 --- a/testfiles/output/Word2003_many_graphics.doc_XmlUnitExpectedOutput.xml +++ b/testfiles/output/Word2003_many_graphics.doc_XmlUnitExpectedOutput.xml @@ -1,36 +1,37 @@ - + - - + + + - + - 2016:01:19 20:30:43 - 2016-01-19T20:30:00Z - 2015:08:20 21:23:10 - 2015-08-20 17:22:00 - Microsoft Macintosh Word - 14.0000 - /Users/dan179/git/git-daveneiman/fits/testfiles/Word2003_many_graphics.doc - Word2003_many_graphics.doc - 528896 - f2b172182cb10edc2c1d65dd44a7b9e0 - 1516117983000 + 2016:01:19 20:30:43 + 2016-01-19T20:30:00Z + 2015:08:20 21:23:10 + 2015-08-20 18:22:00 + Microsoft Macintosh Word + 14.0000 + /Users/dan179/git/git-daveneiman/fits/testfiles/Word2003_many_graphics.doc + Word2003_many_graphics.doc + 528896 + f2b172182cb10edc2c1d65dd44a7b9e0 + 1516117983000 - 7 - 2567 - 14633 - Zakuta, Vitaly - 121 - 34 - U.S. English + 7 + 2567 + 14633 + Zakuta, Vitaly + 121 + 34 + U.S. English yes @@ -44,20 +45,20 @@ - + - + - - - - + + + + - - + + diff --git a/testfiles/output/Word2011_Has_Outline.doc_XmlUnitExpectedOutput.xml b/testfiles/output/Word2011_Has_Outline.doc_XmlUnitExpectedOutput.xml index a7a8f8b4..4282f88d 100644 --- a/testfiles/output/Word2011_Has_Outline.doc_XmlUnitExpectedOutput.xml +++ b/testfiles/output/Word2011_Has_Outline.doc_XmlUnitExpectedOutput.xml @@ -1,39 +1,40 @@ - + - - + + + - + - 2015:12:18 15:11:12 - 2015-12-18T15:11:00Z - 2015:12:11 15:05:00 - 2015-12-11 10:05:00 - Microsoft Macintosh Word - 14.0000 - /Users/dan179/git/git-daveneiman/fits/testfiles/Word2011_Has_Outline.doc - Word2011_Has_Outline.doc - 28672 - c5dd4b2ac16c2d192ee36303f7b13ab6 - 1516117983000 + 2015:12:18 15:11:12 + 2015-12-18T15:11:00Z + 2015:12:11 15:05:00 + 2015-12-11 11:05:00 + Microsoft Macintosh Word + 14.0000 + /Users/dan179/git/git-daveneiman/fits/testfiles/Word2011_Has_Outline.doc + Word2011_Has_Outline.doc + 28672 + c5dd4b2ac16c2d192ee36303f7b13ab6 + 1516117983000 - 1 - 30 - 167 - This is the Title - Neiman David - 27 - 21 - This is the Subject - This is a Category - U.S. English + 1 + 30 + 167 + This is the Title + Neiman David + 27 + 21 + This is the Subject + This is a Category + U.S. English 1 @@ -46,20 +47,20 @@ - + - + - - - - + + + + - - + + diff --git a/testfiles/output/WordPasswordProtected.docx_XmlUnitExpectedOutput.xml b/testfiles/output/WordPasswordProtected.docx_XmlUnitExpectedOutput.xml index 69823c66..c58ece53 100644 --- a/testfiles/output/WordPasswordProtected.docx_XmlUnitExpectedOutput.xml +++ b/testfiles/output/WordPasswordProtected.docx_XmlUnitExpectedOutput.xml @@ -1,41 +1,42 @@ - + - - + + - + + + + - - + + - /Users/dan179/git/fits-daveneiman/fits/testfiles/WordPasswordProtected.docx - WordPasswordProtected.docx - 242176 - bfc6125db60e834e6b9e7210970a6233 - 1458055219000 + /Users/dan179/git/git-daveneiman/fits/testfiles/WordPasswordProtected.docx + WordPasswordProtected.docx + 242176 + bfc6125db60e834e6b9e7210970a6233 + 1516117983000 - - - - + + - - - - + + + + - + - - + + diff --git a/testfiles/output/Word_protected_encrypted.doc_XmlUnitExpectedOutput.xml b/testfiles/output/Word_protected_encrypted.doc_XmlUnitExpectedOutput.xml index ce16e64d..82af7383 100644 --- a/testfiles/output/Word_protected_encrypted.doc_XmlUnitExpectedOutput.xml +++ b/testfiles/output/Word_protected_encrypted.doc_XmlUnitExpectedOutput.xml @@ -1,37 +1,38 @@ - + - - + + + - + - 2015:12:17 17:46:00 - 2015-12-17T17:46:00Z - 2015:12:17 17:35:00 - 2015-12-17 12:35:00 - Microsoft Office Word - 14.0000 - /Users/dan179/git/git-daveneiman/fits/testfiles/Word_protected_encrypted.doc - Word_protected_encrypted.doc - 22528 - 1a83eafb0583f1a719bfbe1b87c19df6 - 1516117983000 + 2015:12:17 17:46:00 + 2015-12-17T17:46:00Z + 2015:12:17 17:35:00 + 2015-12-17 13:35:00 + Microsoft Office Word + 14.0000 + /Users/dan179/git/git-daveneiman/fits/testfiles/Word_protected_encrypted.doc + Word_protected_encrypted.doc + 22528 + 1a83eafb0583f1a719bfbe1b87c19df6 + 1516117983000 - 1 - 10 - 60 - David Neiman - 1 - 1 - yes - U.S. English + 1 + 10 + 60 + David Neiman + 1 + 1 + yes + U.S. English 1 @@ -44,20 +45,20 @@ - + - + - - - - + + + + - - + + diff --git a/testfiles/output/gps.jpg_XmlUnitExpectedOutput.xml b/testfiles/output/gps.jpg_XmlUnitExpectedOutput.xml index 8aa3c6e4..bab6613a 100644 --- a/testfiles/output/gps.jpg_XmlUnitExpectedOutput.xml +++ b/testfiles/output/gps.jpg_XmlUnitExpectedOutput.xml @@ -1,86 +1,86 @@ - + - + - - - + + + 2.2.1 - 1.01 - 13 + 1.01 + 13 fmt/645 - 41851 - FinePix F30 + 41851 + FinePix F30 Digital Camera FinePix F30 Ver1.02 - 2006:11:03 02:26:02 - 2006-11-02T21:26:02 - 2006:11:03 07:14:39 + 2006:11:03 02:26:02 + 2006-11-02T21:26:02 + 2006:11:03 07:14:39 2006:11:03 02:26:02 - /Users/dan179/git/git-daveneiman/fits/testfiles/gps.jpg - gps.jpg - 201f1db44775631d307b3ffd62acb3ac - 1516117983000 + /Users/dan179/git/git-daveneiman/fits/testfiles/gps.jpg + gps.jpg + 201f1db44775631d307b3ffd62acb3ac + 1516117983000 - true - true - Unknown TIFF IFD tag: 50341 severity=info offset=278 - TIFF compression scheme 6 is deprecated severity=info + true + true + Unknown TIFF IFD tag: 50341 severity=info offset=278 + TIFF compression scheme 6 is deprecated severity=info - big endian - JPEG - 600 - 800 - YCbCr - 2 2 - 2 - normal* - in. - 72 - 72 - 8 8 8 - 3 - Digital Camera FinePix F30 Ver1.02 - FinePix F30 - FinePix F30 - 2.8 - 0.008 - 0.0083 + big endian + JPEG + 600 + 800 + YCbCr + 2 2 + 2 + normal* + in. + 72 + 72 + 8 8 8 + 3 + Digital Camera FinePix F30 Ver1.02 + FinePix F30 + FinePix F30 + 2.8 + 0.008 + 0.0083 0.008333333333333333 - 400 - 3.02 - 0 - unknown - Pattern - Flash did not fire, compulsory flash mode - 8 - digital still camera - FUJIFILM - Normal program - 0221 + 400 + 3.02 + 0 + unknown + Pattern + Flash did not fire, compulsory flash mode + 8 + digital still camera + FUJIFILM + Normal program + 0221 1220 - 1/124 - 2.8 + 1/124 + 2.8 3.0 - 2.8 + 2.8 3.0 - One-chip color area sensor - 2.2.0.0 - N - 33 deg 24' 51.80" N - E - 130 deg 33' 31.40" E - 22:14:39 - A - WGS-84 - 2006-11-02 + One-chip color area sensor + 2.2.0.0 + N + 33 deg 24' 51.80" N + E + 130 deg 33' 31.40" E + 22:14:39 + A + WGS-84 + 2006-11-02 3737910 @@ -220,20 +220,20 @@ - - + + - - - - - - + + + + + + - - + + diff --git a/testfiles/output/test.jp2_XmlUnitExpectedOutput.xml b/testfiles/output/test.jp2_XmlUnitExpectedOutput.xml index 793b241e..8ea56863 100644 --- a/testfiles/output/test.jp2_XmlUnitExpectedOutput.xml +++ b/testfiles/output/test.jp2_XmlUnitExpectedOutput.xml @@ -1,23 +1,23 @@ - + - + - - - + + + x-fmt/392 253214 - Photostation v1 - 2007:09:21 00:00:00+08:00 - /Users/dan179/git/git-daveneiman/fits/testfiles/test.jp2 - test.jp2 - a9f2c77997e438c97639ad3a843f4fdb - 1446674963000 + Photostation v1 + 2007:09:21 00:00:00+08:00 + /Users/dan179/git/git-daveneiman/fits/testfiles/test.jp2 + test.jp2 + a9f2c77997e438c97639ad3a843f4fdb + 1446674963000 true @@ -27,7 +27,7 @@ big endian JPEG 2000 Lossy - JPEG 2000 + JPEG 2000 1542 2464 sRGB @@ -35,17 +35,17 @@ 1024 8 5 - normal* + normal* cm - 0.1 mm + 0.1 mm 118 - 1.181102 + 1.181102 118 - 1.181102 + 1.181102 8 8 8 3 - Google - Photostation v1 + Google + Photostation v1 @@ -113,20 +113,20 @@ - + - - - - + + + + - + - - + + diff --git a/testfiles/output/topazscanner.tif_XmlUnitExpectedOutput.xml b/testfiles/output/topazscanner.tif_XmlUnitExpectedOutput.xml index 5dc5dc0b..922ca383 100644 --- a/testfiles/output/topazscanner.tif_XmlUnitExpectedOutput.xml +++ b/testfiles/output/topazscanner.tif_XmlUnitExpectedOutput.xml @@ -1,22 +1,22 @@ - + - + - + 6.0 5146108 - Adobe Photoshop CS Macintosh - 2006:11:28 13:30:06 - 2006-11-28T08:30:06 - 2006:11:28 12:22:59-05:00 - /Users/dan179/git/git-daveneiman/fits/testfiles/topazscanner.tif - topazscanner.tif - c2c36f561b1da65ff74ea2b22fe3fba0 - 1446674963000 + Adobe Photoshop CS Macintosh + 2006:11:28 13:30:06 + 2006-11-28T08:30:06 + 2006:11:28 12:22:59-05:00 + /Users/dan179/git/git-daveneiman/fits/testfiles/topazscanner.tif + topazscanner.tif + c2c36f561b1da65ff74ea2b22fe3fba0 + 1446674963000 true @@ -38,9 +38,9 @@ 8 8 8 3 Adobe Photoshop CS Macintosh - 2.1.0 - HDPPKIEL - TOPAZ iX Scanner + 2.1.0 + HDPPKIEL + TOPAZ iX Scanner @@ -140,20 +140,20 @@ - + - - - - + + + + - + - - + +