From 4ce97e04235984e1baed12fa85c653a904dfda73 Mon Sep 17 00:00:00 2001 From: Michael Ang Date: Mon, 5 Dec 2011 20:01:30 +0000 Subject: [PATCH] "preview" uses marked cover for books >= 1923. "cover0" returns first marked cover or 404 --- BookReaderIA/datanode/BookReaderImages.inc.php | 10 ++++------ BookReaderIA/datanode/BookReaderPreview.php | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/BookReaderIA/datanode/BookReaderImages.inc.php b/BookReaderIA/datanode/BookReaderImages.inc.php index 39b6673..ad56f20 100644 --- a/BookReaderIA/datanode/BookReaderImages.inc.php +++ b/BookReaderIA/datanode/BookReaderImages.inc.php @@ -120,26 +120,24 @@ class BookReaderImages $imageIndex = $metadata['titleIndex']; break; - /* Old 'cover' behaviour where it would show cover 0 if it exists or return 404. - Could be re-added as cover0, cover1, etc - case 'cover': + /* Old 'cover' behaviour where it would show cover 0 if it exists or return 404. */ + case 'cover0': if (! array_key_exists('coverIndices', $metadata)) { $this->BRfatal("No cover asserted in book"); } $imageIndex = $metadata['coverIndices'][0]; // $$$ TODO add support for other covers break; - */ case 'preview': case 'cover': // Show our best guess if cover is requested // Preference is: - // Cover page if book was published >= 1950 + // Cover page if book was published >= 1923 // Title page // Cover page // Page 0 if ( array_key_exists('date', $metadata) && array_key_exists('coverIndices', $metadata) ) { - if ($brm->parseYear($metadata['date']) >= 1950) { + if ($brm->parseYear($metadata['date']) >= 1923) { $imageIndex = $metadata['coverIndices'][0]; break; } diff --git a/BookReaderIA/datanode/BookReaderPreview.php b/BookReaderIA/datanode/BookReaderPreview.php index dacf075..1b91f46 100644 --- a/BookReaderIA/datanode/BookReaderPreview.php +++ b/BookReaderIA/datanode/BookReaderPreview.php @@ -33,7 +33,7 @@ function BRfatal($message) { die(-1); } -$allowedPages = array('title','cover','preview'); +$allowedPages = array('title','cover','cover0','preview'); $allowedPattern = '#^(' . join('|', $allowedPages) . ')#'; $page = $_REQUEST['page']; -- 2.20.1