X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=BookReaderIA%2Fdatanode%2FBookReaderImages.inc.php;fp=BookReaderIA%2Fdatanode%2FBookReaderImages.inc.php;h=2fb7abfd8871e5eef2d9172515679ec17212fe6e;hb=03eab96f68ce2d6a866489daef6f8c22cc7dcf4e;hp=6342604ebefba0792c284d5690c5231d9815feba;hpb=5b1ca1a957386759108d034256ab4e13efc00516;p=bookreader.git

diff --git a/BookReaderIA/datanode/BookReaderImages.inc.php b/BookReaderIA/datanode/BookReaderImages.inc.php
index 6342604..2fb7abf 100644
--- a/BookReaderIA/datanode/BookReaderImages.inc.php
+++ b/BookReaderIA/datanode/BookReaderImages.inc.php
@@ -447,7 +447,7 @@ class BookReaderImages
                           
         
         $errorMessage = '';
-        
+                
         if (! $this->passthruIfSuccessful($headers, $cmd, $errorMessage)) { // $$$ move to BookReaderRequest
             // $$$ automated reporting
             trigger_error('BookReader Processing Error: ' . $cmd . ' -- ' . $errorMessage, E_USER_WARNING);
@@ -689,7 +689,7 @@ class BookReaderImages
                     $rotateString = ' -rotate ' . $rotate; // was previously checked to be a known value
                 }
                 
-                $decompressCmd = ' | convert -' . $regionString . $scaleString . $rotateString . ' pnm:-';
+                $decompressCmd = ' | convert -quiet -' . $regionString . $scaleString . $rotateString . ' pnm:-';
                 break;
                 
             default:
@@ -710,7 +710,7 @@ class BookReaderImages
     //   &$errorMessage - error string if there was an error
     //
     // $$$ Tested with our command-line image processing.  May be deadlocks for
-    //     other cases.
+    //     other cases, e.g. if there are warnings on stderr
     function passthruIfSuccessful($headers, $cmd, &$errorMessage)
     {
         $retVal = false;
@@ -1056,6 +1056,19 @@ class BookReaderImages
         return $observedValue;
     }
     
+    // Get the directory for temporary files. Use the fast in-RAM tmp if available.
+    /*
+    function getTempDir() {
+        var $fast = '/var/tmp/fast';
+        if (is_dir($fast)) {
+            // We assume it's writeable
+            return $fast;
+        }
+        
+        return '/tmp';
+    }
+    */
+    
     // Clean up temporary files and resources
     function cleanup() {
         foreach($this->tempFiles as $tempFile) {