Skip to content

Commit

Permalink
enable NCX_001 check also for EPUB3 when an NCX file is present
Browse files Browse the repository at this point in the history
refs #669
  • Loading branch information
tofi86 committed Oct 25, 2017
1 parent 515682d commit 9715c35
Show file tree
Hide file tree
Showing 119 changed files with 235 additions and 238 deletions.
23 changes: 10 additions & 13 deletions src/main/java/com/adobe/epubcheck/ncx/NCXChecker.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import com.adobe.epubcheck.ocf.OCFPackage;
import com.adobe.epubcheck.opf.ContentChecker;
import com.adobe.epubcheck.opf.ValidationContext;
import com.adobe.epubcheck.util.EPUBVersion;
import com.adobe.epubcheck.xml.XMLParser;
import com.adobe.epubcheck.xml.XMLValidators;
import com.google.common.base.Preconditions;
Expand Down Expand Up @@ -71,19 +70,17 @@ else if (!ocf.canDecrypt(path))
ncxParser.addXMLHandler(ncxHandler);
ncxParser.process();

if (context.version == EPUBVersion.VERSION_2)
// report this for EPUB2 and ALSO for EPUB3 (see discussion in #669)
String ncxId = ncxHandler.getUid();
if (ncxId != null && !ncxId.equals(ncxId.trim()))
{
String ncxId = ncxHandler.getUid();
if (ncxId != null && !ncxId.equals(ncxId.trim()))
{
report.message(MessageId.NCX_004, ncxParser.getLocation());
}
// FIXME improve way to get this EPUB 2's single OPF
String uid = ocf.getOpfData().values().iterator().next().getUniqueIdentifier();
if (uid != null && ncxId != null && !uid.equals(ncxId.trim()))
{
report.message(MessageId.NCX_001, ncxParser.getLocation(), ncxHandler.getUid(), uid);
}
report.message(MessageId.NCX_004, ncxParser.getLocation());
}
// FIXME improve way to get this EPUB 2's single OPF
String uid = ocf.getOpfData().values().iterator().next().getUniqueIdentifier();
if (uid != null && ncxId != null && !uid.equals(ncxId.trim()))
{
report.message(MessageId.NCX_001, ncxParser.getLocation(), ncxHandler.getUid(), uid);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
<head>
<meta name="dtb:uid" content=""/>
<meta name="dtb:uid" content="000000000000000000"/>
<meta name="dtb:depth" content="1"/>
<meta name="dtb:totalPageCount" content="0"/>
<meta name="dtb:maxPageNumber" content="0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@
"id" : "ncx",
"fileName" : "OPS/toc.ncx",
"media_type" : "application/x-dtbncx+xml",
"compressedSize" : 305,
"uncompressedSize" : 569,
"compressedSize" : 308,
"uncompressedSize" : 587,
"compressionMethod" : "Deflated",
"checkSum" : "44c9adde7f138641ee9dcd4ccc218a1424d2599b9bff2d602aa39fcef1c3e",
"checkSum" : "fdb39544563277978498b97d5b8b15211953b805ac65c595ae27b326a9be775",
"isSpineItem" : false,
"spineIndex" : null,
"isLinear" : false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
<head>
<meta name="dtb:uid" content=""/>
<meta name="dtb:uid" content="000000000000000000"/>
<meta name="dtb:depth" content="1"/>
<meta name="dtb:totalPageCount" content="0"/>
<meta name="dtb:maxPageNumber" content="0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@
"id" : "ncx",
"fileName" : "OPS/toc.ncx",
"media_type" : "application/x-dtbncx+xml",
"compressedSize" : 305,
"uncompressedSize" : 569,
"compressedSize" : 308,
"uncompressedSize" : 587,
"compressionMethod" : "Deflated",
"checkSum" : "44c9adde7f138641ee9dcd4ccc218a1424d2599b9bff2d602aa39fcef1c3e",
"checkSum" : "fdb39544563277978498b97d5b8b15211953b805ac65c595ae27b326a9be775",
"isSpineItem" : false,
"spineIndex" : null,
"isLinear" : false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
<head>
<meta name="dtb:uid" content=""/>
<meta name="dtb:uid" content="000000000000000000"/>
<meta name="dtb:depth" content="1"/>
<meta name="dtb:totalPageCount" content="0"/>
<meta name="dtb:maxPageNumber" content="0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@
"id" : "ncx",
"fileName" : "OPS/toc.ncx",
"media_type" : "application/x-dtbncx+xml",
"compressedSize" : 305,
"uncompressedSize" : 569,
"compressedSize" : 308,
"uncompressedSize" : 587,
"compressionMethod" : "Deflated",
"checkSum" : "44c9adde7f138641ee9dcd4ccc218a1424d2599b9bff2d602aa39fcef1c3e",
"checkSum" : "fdb39544563277978498b97d5b8b15211953b805ac65c595ae27b326a9be775",
"isSpineItem" : false,
"spineIndex" : null,
"isLinear" : false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
<head>
<meta name="dtb:uid" content=""/>
<meta name="dtb:uid" content="000000000000000000"/>
<meta name="dtb:depth" content="1"/>
<meta name="dtb:totalPageCount" content="0"/>
<meta name="dtb:maxPageNumber" content="0"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
<head>
<meta name="dtb:uid" content=""/>
<meta name="dtb:uid" content="000000000000000000"/>
<meta name="dtb:depth" content="1"/>
<meta name="dtb:totalPageCount" content="0"/>
<meta name="dtb:maxPageNumber" content="0"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
<head>
<meta name="dtb:uid" content=""/>
<meta name="dtb:uid" content="000000000000000000"/>
<meta name="dtb:depth" content="1"/>
<meta name="dtb:totalPageCount" content="0"/>
<meta name="dtb:maxPageNumber" content="0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@
"id" : "ncx",
"fileName" : "OPS/toc.ncx",
"media_type" : "application/x-dtbncx+xml",
"compressedSize" : 292,
"uncompressedSize" : 547,
"compressedSize" : 295,
"uncompressedSize" : 565,
"compressionMethod" : "Deflated",
"checkSum" : "2ea3881a076ad166fc41c3aff7b5681176d347c090493fbad05060483034b9",
"checkSum" : "657cc9e1e0385cafec1c8d8f367e67b6bb9f714bea361d189b5da81875f2173",
"isSpineItem" : false,
"spineIndex" : null,
"isLinear" : false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
<head>
<meta name="dtb:uid" content=""/>
<meta name="dtb:uid" content="000000000000000000"/>
<meta name="dtb:depth" content="1"/>
<meta name="dtb:totalPageCount" content="0"/>
<meta name="dtb:maxPageNumber" content="0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@
"id" : "ncx",
"fileName" : "OPS/toc.ncx",
"media_type" : "application/x-dtbncx+xml",
"compressedSize" : 297,
"uncompressedSize" : 558,
"compressedSize" : 299,
"uncompressedSize" : 576,
"compressionMethod" : "Deflated",
"checkSum" : "4a146596d7b5a59229912fb4a5921360a4108643436dfe1164f87836e89d10de",
"checkSum" : "baaeddab6122a31619e3dc3cb89e41e8bd4e5587f4f38a982ee14d8fe94bcb",
"isSpineItem" : false,
"spineIndex" : null,
"isLinear" : false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
<head>
<meta name="dtb:uid" content=""/>
<meta name="dtb:uid" content="000000000000000000"/>
<meta name="dtb:depth" content="1"/>
<meta name="dtb:totalPageCount" content="0"/>
<meta name="dtb:maxPageNumber" content="0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@
"id" : "ncx",
"fileName" : "OPS/toc.ncx",
"media_type" : "application/x-dtbncx+xml",
"compressedSize" : 296,
"uncompressedSize" : 557,
"compressedSize" : 298,
"uncompressedSize" : 575,
"compressionMethod" : "Deflated",
"checkSum" : "487ec57fbe6ea6f31bf33a1215b02587252de97e15d8591a512fcdc490a26",
"checkSum" : "b45cecef512674daf2d150e6d2e39573c381a3b7baa8ccc64286d31acf4b5f0",
"isSpineItem" : false,
"spineIndex" : null,
"isLinear" : false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
<head>
<meta name="dtb:uid" content=""/>
<meta name="dtb:uid" content="000000000000000000"/>
<meta name="dtb:depth" content="1"/>
<meta name="dtb:totalPageCount" content="0"/>
<meta name="dtb:maxPageNumber" content="0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@
"id" : "ncx",
"fileName" : "OPS/toc.ncx",
"media_type" : "application/x-dtbncx+xml",
"compressedSize" : 305,
"uncompressedSize" : 569,
"compressedSize" : 308,
"uncompressedSize" : 587,
"compressionMethod" : "Deflated",
"checkSum" : "44c9adde7f138641ee9dcd4ccc218a1424d2599b9bff2d602aa39fcef1c3e",
"checkSum" : "fdb39544563277978498b97d5b8b15211953b805ac65c595ae27b326a9be775",
"isSpineItem" : false,
"spineIndex" : null,
"isLinear" : false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
<head>
<meta name="dtb:uid" content=""/>
<meta name="dtb:uid" content="000000000000000000"/>
<meta name="dtb:depth" content="1"/>
<meta name="dtb:totalPageCount" content="0"/>
<meta name="dtb:maxPageNumber" content="0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,10 @@
"id" : "ncx",
"fileName" : "OPS/toc.ncx",
"media_type" : "application/x-dtbncx+xml",
"compressedSize" : 308,
"uncompressedSize" : 572,
"compressedSize" : 310,
"uncompressedSize" : 590,
"compressionMethod" : "Deflated",
"checkSum" : "b767bd4568f668c54d7fe9e207bfc383627c7e0dd6a85c19b9277c7e6ea5db",
"checkSum" : "864b5a3d6f554aabceef2677137034ced2b5dda4a081d6cffce4efe1cf19e45",
"isSpineItem" : false,
"spineIndex" : null,
"isLinear" : false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
<head>
<meta name="dtb:uid" content=""/>
<meta name="dtb:uid" content="000000000000000000"/>
<meta name="dtb:depth" content="1"/>
<meta name="dtb:totalPageCount" content="0"/>
<meta name="dtb:maxPageNumber" content="0"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
<head>
<meta name="dtb:uid" content=""/>
<meta name="dtb:uid" content="000000000000000000"/>
<meta name="dtb:depth" content="1"/>
<meta name="dtb:totalPageCount" content="0"/>
<meta name="dtb:maxPageNumber" content="0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@
"id" : "ncx",
"fileName" : "OPS/toc.ncx",
"media_type" : "application/x-dtbncx+xml",
"compressedSize" : 307,
"uncompressedSize" : 571,
"compressedSize" : 310,
"uncompressedSize" : 589,
"compressionMethod" : "Deflated",
"checkSum" : "374f9fbdb3e6d4c8519624f1e6fd90cd64c626f0d8c7f2f87d47d2eb263f10",
"checkSum" : "82695084be8c98f3dfe03d5aa51e2bcc575e53f4e8f852b8e40ffb23d746e",
"isSpineItem" : false,
"spineIndex" : null,
"isLinear" : false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
<head>
<meta name="dtb:uid" content=""/>
<meta name="dtb:uid" content="000000000000000000"/>
<meta name="dtb:depth" content="1"/>
<meta name="dtb:totalPageCount" content="0"/>
<meta name="dtb:maxPageNumber" content="0"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
<head>
<meta name="dtb:uid" content=""/>
<meta name="dtb:uid" content="000000000000000000"/>
<meta name="dtb:depth" content="1"/>
<meta name="dtb:totalPageCount" content="0"/>
<meta name="dtb:maxPageNumber" content="0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@
"id" : "ncx",
"fileName" : "OPS/toc.ncx",
"media_type" : "application/x-dtbncx+xml",
"compressedSize" : 296,
"uncompressedSize" : 557,
"compressedSize" : 298,
"uncompressedSize" : 575,
"compressionMethod" : "Deflated",
"checkSum" : "487ec57fbe6ea6f31bf33a1215b02587252de97e15d8591a512fcdc490a26",
"checkSum" : "b45cecef512674daf2d150e6d2e39573c381a3b7baa8ccc64286d31acf4b5f0",
"isSpineItem" : false,
"spineIndex" : null,
"isLinear" : false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
<head>
<meta name="dtb:uid" content=""/>
<meta name="dtb:uid" content="000000000000000000"/>
<meta name="dtb:depth" content="1"/>
<meta name="dtb:totalPageCount" content="0"/>
<meta name="dtb:maxPageNumber" content="0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@
"id" : "ncx",
"fileName" : "OPS/toc.ncx",
"media_type" : "application/x-dtbncx+xml",
"compressedSize" : 305,
"uncompressedSize" : 569,
"compressedSize" : 308,
"uncompressedSize" : 587,
"compressionMethod" : "Deflated",
"checkSum" : "44c9adde7f138641ee9dcd4ccc218a1424d2599b9bff2d602aa39fcef1c3e",
"checkSum" : "fdb39544563277978498b97d5b8b15211953b805ac65c595ae27b326a9be775",
"isSpineItem" : false,
"spineIndex" : null,
"isLinear" : false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
<head>
<meta name="dtb:uid" content=""/>
<meta name="dtb:uid" content="000000000000000000"/>
<meta name="dtb:depth" content="1"/>
<meta name="dtb:totalPageCount" content="0"/>
<meta name="dtb:maxPageNumber" content="0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@
"id" : "ncx",
"fileName" : "OPS/toc.ncx",
"media_type" : "application/x-dtbncx+xml",
"compressedSize" : 304,
"uncompressedSize" : 573,
"compressedSize" : 307,
"uncompressedSize" : 591,
"compressionMethod" : "Deflated",
"checkSum" : "8c8bef3d9ce34e9ab9b3c4050879d86b161b8a1f8ebb4aec9fad1160eee47",
"checkSum" : "8c3dd9f0531f111f413b37a7cd01c6d75562fde744d8713ed972109ace8d33",
"isSpineItem" : false,
"spineIndex" : null,
"isLinear" : false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
<head>
<meta name="dtb:uid" content=""/>
<meta name="dtb:uid" content="000000000000000000"/>
<meta name="dtb:depth" content="1"/>
<meta name="dtb:totalPageCount" content="0"/>
<meta name="dtb:maxPageNumber" content="0"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
<head>
<meta name="dtb:uid" content=""/>
<meta name="dtb:uid" content="000000000000000000"/>
<meta name="dtb:depth" content="1"/>
<meta name="dtb:totalPageCount" content="0"/>
<meta name="dtb:maxPageNumber" content="0"/>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
<head>
<meta name="dtb:uid" content=""/>
<meta name="dtb:uid" content="000000000000000000"/>
<meta name="dtb:depth" content="1"/>
<meta name="dtb:totalPageCount" content="0"/>
<meta name="dtb:maxPageNumber" content="0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@
"id" : "ncx",
"fileName" : "OPS/toc.ncx",
"media_type" : "application/x-dtbncx+xml",
"compressedSize" : 293,
"uncompressedSize" : 556,
"compressedSize" : 295,
"uncompressedSize" : 574,
"compressionMethod" : "Deflated",
"checkSum" : "7e983f3695b1eea13cb6d3e7aacb5d84de767f2ccda456f5154d35c5f9b012",
"checkSum" : "708b669acb4e2fb5cae45961dde9f2abb3e2d9b793d4fb4603c38a51fe29b52",
"isSpineItem" : false,
"spineIndex" : null,
"isLinear" : false,
Expand Down
Loading

0 comments on commit 9715c35

Please sign in to comment.