Merge Internet Archive petabox-related changes

Merge branch 'traceychanges' into 0.9.20

Conflicts:
	BookReaderIA/inc/BookReader.inc
	BookReaderIA/www/BookReaderJSLocate.php

diff --cc BookReaderIA/datanode/BookReaderJSIA.php
Simple merge

diff --cc BookReaderIA/inc/BookReader.inc
index 45ffa3c,b98671f..fb0baad
--- 1/BookReaderIA/inc/BookReader.inc
--- 2/BookReaderIA/inc/BookReader.inc
+++ b/BookReaderIA/inc/BookReader.inc
@@@ -173,12 -173,19 +173,19 @@@ class BookReade
        // $$$ the remapping isn't totally automatic yet and requires user to
        //     ln -s ~/petabox/www/datanode/BookReader ~/public_html/BookReader
        //     so we enable it only for known hosts
-       $devhosts = array('mang', 'testflip');
+       $devhosts = array('mang', 'testflip', 'rkumar');
        if (in_array($match[1], $devhosts)) {
 -        return $server . ":81/~" . $match[1]; //xxxx
 +        $serverBaseURL = $serverBaseURL . "/~" . $match[1];
        }
      }
-     
+     return $server;
+   }
+   
+   
+   public static function jsMetadataURL($server, $identifier, $mainDir, $subPrefix = '')
+   {
+     $serverBaseURL = BookReader::adjustToHome($server);
+ 
      $params = array( 'id' => $identifier, 'itemPath' => $mainDir, 'server' => $server );
      if ($subPrefix) {
          $params['subPrefix'] = $subPrefix;

diff --cc BookReaderIA/www/BookReaderJSLocate.php
index 6180216,70ede69..412c681
--- 1/BookReaderIA/www/BookReaderJSLocate.php
--- 2/BookReaderIA/www/BookReaderJSLocate.php
+++ b/BookReaderIA/www/BookReaderJSLocate.php
@@@ -32,24 -31,9 +32,12 @@@ $locator      = new Locator()
  
  $results = $locator->locateUDP($id, 1, false);
  
- $server = $results[0][0];
- $vhost = $server;
- 
- // Check if we're on a dev vhost and point to JSIA in the user's public_html on the datanode
- if (preg_match("/^www-(\w+)/", $_SERVER["SERVER_NAME"], $match)) {
-     // $$$ the remapping isn't totally automatic yet and requires user to
-     //     ln -s ~/petabox/www/datanode/BookReader ~/public_html/BookReader
-     //     so we enable it only for known hosts
-     $devhosts = array('mang', 'testflip', 'rkumar');
-     if (in_array($match[1], $devhosts)) {
-         $vhost = $server . ":81/~" . $match[1];
-     }
- }
+ $serverBaseURL = BookReader::adjustToHome($results[0][0]);
  
 -$url = "http://{$serverBaseURL}/BookReader/BookReaderJSIA.php?id={$id}&itemPath={$results[0][1]}&server={$serverBaseURL}";
 +$url = "http://{$vhost}/BookReader/BookReaderJSIA.php?id=" . urlencode($id) . "&itemPath={$results[0][1]}&server={$server}";
 +if ($book) {
 +    $url .= "&subPrefix=" . urlencode($book);
 +}
  
  
  if (("" != $results[0][0]) && ("" != $results[0][1])) {