Add support for reduce. Update unit tests for subdir books.

[bookreader.git] / BookReaderIA / datanode / BookReaderPreview.php

diff --git a/BookReaderIA/datanode/BookReaderPreview.php b/BookReaderIA/datanode/BookReaderPreview.php
index 30b963f..4192fb8 100644 (file)
--- a/BookReaderIA/datanode/BookReaderPreview.php
+++ b/BookReaderIA/datanode/BookReaderPreview.php
@@ -36,11 +36,12 @@ function BRfatal($message) {
 
 $brm = new BookReaderMeta();
 try {
-    $metadata = $brm->buildMetadata($_REQUEST['id'], $_REQUEST['itemPath'], $_REQUEST['bookId'], $_REQUEST['server']);
+    $metadata = $brm->buildMetadata($_REQUEST['id'], $_REQUEST['itemPath'], $_REQUEST['subPrefix'], $_REQUEST['server']);
 } catch (Exception $e) {
     BRfatal($e->getMessage);
 }
 
+// $$$ allow size information
 $knownPages = array('title','cover','preview');
 $page = $_REQUEST['page'];
 if (! in_array($page, $knownPages) ) {
@@ -108,7 +109,7 @@ $leaf = $brm->leafForIndex($imageIndex, $metadata['leafNums']);
 
 $requestEnv = array(
     'zip' => $metadata['zip'],
-    'file' => $brm->imageFilePath($leaf, $metadata['bookId'], $metadata['imageFormat']),
+    'file' => $brm->imageFilePath($leaf, $metadata['subPrefix'], $metadata['imageFormat']),
     'ext' => 'jpg',
 );