Add ppi (pixels per inch) to BookReader metadata API

[bookreader.git] / BookReaderIA / datanode / BookReaderMeta.inc.php

diff --git a/BookReaderIA/datanode/BookReaderMeta.inc.php b/BookReaderIA/datanode/BookReaderMeta.inc.php
index 601e6b1..89c4a69 100644 (file)
--- a/BookReaderIA/datanode/BookReaderMeta.inc.php
+++ b/BookReaderIA/datanode/BookReaderMeta.inc.php
@@ -36,6 +36,7 @@ class BookReaderMeta {
         'contributor' => 'contributor',
         'collection' => 'collection',
         'page-progression' => 'pageProgression',
+        'ppi' => 'ppi',
     );
     
     var $metaDefaults = array(
@@ -397,7 +398,7 @@ class BookReaderMeta {
     
     function imageFilePath($leafNum, $subPrefix, $format) {
         $pathParts = pathinfo($subPrefix);
-        $almostIdentifier = $pathParts['filename'];
+        $almostIdentifier = $pathParts['basename'];
         return sprintf("%s_%s/%s_%04d.%s", $almostIdentifier, $format, $almostIdentifier, intval($leafNum), $format);
     }
     
@@ -418,7 +419,7 @@ class BookReaderMeta {
         
         // Check if we're on a dev vhost and point to JSIA in the user's public_html on the datanode
         // $$$ TODO consolidate this logic
-        $devHosts = array('testflip', 'rkumar', 'mang', 'mccabe');
+        $devHosts = array('testflip', 'rkumar', 'mang');
         foreach ($devHosts as $host) {
             if (strpos($_SERVER["REQUEST_URI"], '/~' . $host) === 0) { // Serving out of home dir
                 $server .= ':80/' . $host;