MediaWiki 1.17.0

[autoinstallsdev/mediawiki.git] / includes / media / DjVu.php

diff --git a/includes/media/DjVu.php b/includes/media/DjVu.php
index 20e59d18b80287faadcd5e3f3b3668ab534c1149..cc3f1db592278b95484f430d7d69a4c88446ebfc 100644 (file)
--- a/includes/media/DjVu.php
+++ b/includes/media/DjVu.php
@@ -1,7 +1,15 @@
 <?php
-
 /**
- * @addtogroup Media
+ * Handler for DjVu images
+ *
+ * @file
+ * @ingroup Media
+ */
+ 
+/**
+ * Handler for DjVu images
+ *
+ * @ingroup Media
  */
 class DjVuHandler extends ImageHandler {
        function isEnabled() {
@@ -14,8 +22,8 @@ class DjVuHandler extends ImageHandler {
                }
        }
 
-       function mustRender() { return true; }
-       function isMultiPage() { return true; }
+       function mustRender( $file ) { return true; }
+       function isMultiPage( $file ) { return true; }
 
        function getParamMap() {
                return array(
@@ -63,14 +71,14 @@ class DjVuHandler extends ImageHandler {
        function doTransform( $image, $dstPath, $dstUrl, $params, $flags = 0 ) {
                global $wgDjvuRenderer, $wgDjvuPostProcessor;
 
-               // Fetch XML and check it, to give a more informative error message than the one which 
+               // Fetch XML and check it, to give a more informative error message than the one which
                // normaliseParams will inevitably give.
                $xml = $image->getMetadata();
                if ( !$xml ) {
-                       return new MediaTransformError( 'thumbnail_error', @$params['width'], @$params['height'], 
+                       return new MediaTransformError( 'thumbnail_error', @$params['width'], @$params['height'],
                                wfMsg( 'djvu_no_xml' ) );
                }
-               
+
                if ( !$this->normaliseParams( $image, $params ) ) {
                        return new TransformParameterError( $params );
                }
@@ -81,7 +89,7 @@ class DjVuHandler extends ImageHandler {
                if ( $page > $this->pageCount( $image ) ) {
                        return new MediaTransformError( 'thumbnail_error', $width, $height, wfMsg( 'djvu_page_error' ) );
                }
-               
+
                if ( $flags & self::TRANSFORM_LATER ) {
                        return new ThumbnailImage( $image, $dstUrl, $width, $height, $dstPath, $page );
                }
@@ -90,7 +98,7 @@ class DjVuHandler extends ImageHandler {
                        return new MediaTransformError( 'thumbnail_error', $width, $height, wfMsg( 'thumbnail_dest_directory' ) );
                }
 
-               # Use a subshell (brackets) to aggregate stderr from both pipeline commands 
+               # Use a subshell (brackets) to aggregate stderr from both pipeline commands
                # before redirecting it to the overall stdout. This works in both Linux and Windows XP.
                $cmd = '(' . wfEscapeShellArg( $wgDjvuRenderer ) . " -format=ppm -page={$page} -size={$width}x{$height} " .
                        wfEscapeShellArg( $srcPath );
@@ -100,6 +108,7 @@ class DjVuHandler extends ImageHandler {
                $cmd .= ' > ' . wfEscapeShellArg($dstPath) . ') 2>&1';
                wfProfileIn( 'ddjvu' );
                wfDebug( __METHOD__.": $cmd\n" );
+               $retval = '';
                $err = wfShellExec( $cmd, $retval );
                wfProfileOut( 'ddjvu' );
 
@@ -131,7 +140,7 @@ class DjVuHandler extends ImageHandler {
        /**
         * Cache a document tree for the DjVu XML metadata
         */
-       function getMetaTree( $image ) {
+       function getMetaTree( $image , $gettext = false ) {
                if ( isset( $image->dejaMetaTree ) ) {
                        return $image->dejaMetaTree;
                }
@@ -145,22 +154,39 @@ class DjVuHandler extends ImageHandler {
 
                wfSuppressWarnings();
                try {
-                       $image->dejaMetaTree = new SimpleXMLElement( $metadata );
-               } catch( Exception $e ) {
-                       wfDebug( "Bogus multipage XML metadata on '$image->name'\n" );
                        // Set to false rather than null to avoid further attempts
                        $image->dejaMetaTree = false;
+                       $image->djvuTextTree = false;
+                       $tree = new SimpleXMLElement( $metadata );
+                       if( $tree->getName() == 'mw-djvu' ) {
+                               foreach($tree->children() as $b){ 
+                                       if( $b->getName() == 'DjVuTxt' ) {
+                                               $image->djvuTextTree = $b;
+                                       }
+                                       else if ( $b->getName() == 'DjVuXML' ) {
+                                               $image->dejaMetaTree = $b;
+                                       }
+                               }
+                       } else {
+                               $image->dejaMetaTree = $tree;
+                       }
+               } catch( Exception $e ) {
+                       wfDebug( "Bogus multipage XML metadata on '$image->name'\n" );
                }
                wfRestoreWarnings();
                wfProfileOut( __METHOD__ );
-               return $image->dejaMetaTree;
+               if( $gettext ) {
+                       return $image->djvuTextTree;
+               } else {
+                       return $image->dejaMetaTree;
+               }
        }
 
        function getImageSize( $image, $path ) {
                return $this->getDjVuImage( $image, $path )->getImageSize();
        }
 
-       function getThumbType( $ext, $mime ) {
+       function getThumbType( $ext, $mime, $params = null ) {
                global $wgDjvuOutputExtension;
                static $mime;
                if ( !isset( $mime ) ) {
@@ -207,6 +233,21 @@ class DjVuHandler extends ImageHandler {
                        return false;
                }
        }
-}
 
+       function getPageText( $image, $page ){
+               $tree = $this->getMetaTree( $image, true );
+               if ( !$tree ) {
+                       return false;
+               }
 
+               $o = $tree->BODY[0]->PAGE[$page-1];
+               if ( $o ) {
+                       $txt = $o['value'];
+                       return $txt;
+               } else {
+                       return false;
+               }
+
+       }
+
+}