Add support for reduce. Update unit tests for subdir books.
authorMichael Ang <mang@archive.org>
Fri, 23 Jul 2010 22:42:56 +0000 (22:42 +0000)
committerMichael Ang <mang@archive.org>
Fri, 23 Jul 2010 22:42:56 +0000 (22:42 +0000)
BookReaderIA/datanode/BookReaderImages.inc.php
BookReaderIA/test/index.html
BookReaderIA/test/unit/Common.js

index d0e2c79..b39c452 100644 (file)
@@ -165,6 +165,11 @@ class BookReaderImages
             'file' => $brm->imageFilePath($leaf, $metadata['subPrefix'], $metadata['imageFormat']),
             'ext' => 'jpg',
         );
+        
+        if ($pageInfo['reduce']) {
+            $requestEnv['reduce'] = $pageInfo['reduce'];
+        }
+        // $$$ handle scale, other sizes, rotation, etc
 
         // Return image data - will check privs        
         $this->serveRequest($requestEnv);
index b17eff8..41edbc1 100644 (file)
@@ -10,6 +10,8 @@
   <script type="text/javascript" src="unit/Images.js"></script>
   <script type="text/javascript" src="unit/Search.js"></script>
   <script type="text/javascript" src="unit/Preview.js"></script>
+  <script type="text/javascript" src="unit/Permalinks.js"></script>
+  
 
 </head>
 <body>
index b416494..8a860d7 100644 (file)
@@ -24,14 +24,19 @@ function jsLocateURL(identifier, book) {
     return bookURL;
 }
 
+// Page should be in ['cover','title','preview']
 function previewURL(identifier, subPrefix, page) {
+    var bookPrefix = subPrefix || identifier;
+    var previewPage = bookPrefix + '_' + page;
+    return imagePermalink(identifier, subPrefix, previewPage);
+}
+
+// Page should be e.g. page5.jpg, n4.jpg, cover_t.jpg, n4_r3.jpg
+function imagePermalink(identifier, subPrefix, page) {
     var imageURL = common.testHost + '/download/' + identifier;
-    var bookPrefix = identifier;
     if (subPrefix) {
         imageURL += '/' + subPrefix;
-        var subPrefixParts = subPrefix.split('/')
-        bookPrefix = subPrefixParts[subPrefixParts.length - 1];
     }
-    imageURL += '/page/' + bookPrefix + '_' + page + '.jpg';
+    imageURL += '/page/' + page;
     return imageURL;
-}
\ No newline at end of file
+}