jenkins-bot has submitted this change and it was merged.
Change subject: Improve robustness of FormulaInfo page
......................................................................
Improve robustness of FormulaInfo page
Ignores failures in renderings that are not currently supported by mathoid.
Change-Id: Ie23be31df53e2072226dd54ec092b8dec734cf29
---
M FormulaInfo.php
1 file changed, 24 insertions(+), 13 deletions(-)
Approvals:
Physikerwelt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/FormulaInfo.php b/FormulaInfo.php
index 40f1ab4..e13d391 100644
--- a/FormulaInfo.php
+++ b/FormulaInfo.php
@@ -228,13 +228,20 @@
$out->addHtml( '</div></div>' );
}
if ( self::hasSvgSupport( $mode ) ) {
- if ( $renderer->getSvg( 'cached' ) === '' ) {
- $out->addWikiText( 'SVG image empty. Force
Re-Rendering' );
- $renderer->render( true );
+ try {
+ $svg = $renderer->getSvg( 'cached' );
+ if ( $svg === '' ) {
+ $out->addWikiText( 'SVG image empty.
Force Re-Rendering' );
+ $renderer->render( true );
+ } else {
+ $svg = $renderer->getSvg( 'render' );
+ }
+ $out->addWikiText( 'SVG (' . self::getlengh(
$svg ) . ') :', false );
+ $out->addHtml( $svg ); // FALSE,
'mwe-math-demo' ) );
+ $out->addHtml( "<br />\n" );
+ } catch ( Exception $e ) {
+ $out->addHTML( 'Failed to get svg.' );
}
- $out->addWikiText( 'SVG (' . self::getlengh(
$renderer->getSvg( 'render' ) ) . ') :', false );
- $out->addHtml( $renderer->getSvg() ); // FALSE,
'mwe-math-demo' ) );
- $out->addHtml( "<br />\n" );
}
if ( self::hasPngSupport( $mode ) ) {
if ( method_exists( $renderer, 'getPng' ) ) {
@@ -242,13 +249,17 @@
$out->addHtml( $renderer->getHtmlOutput() );
$out->addHtml( "<br />\n" );
} else {
- $renderer = MathObject::cloneFromRenderer(
$renderer );
- $rbi = $renderer->getRbi();
- $pngUrl = preg_replace( '#/svg/#', '/png/',
$rbi->getFullSvgUrl() );
- $png = file_get_contents( $pngUrl );
- $out->addWikiText( 'PNG (' . self::getlengh(
$png ) . ') :', false );
- $out->addHtml( "<img src='$pngUrl' />" );
- $out->addHtml( "<br />\n" );
+ try {
+ $renderer =
MathObject::cloneFromRenderer( $renderer );
+ $rbi = $renderer->getRbi();
+ $pngUrl = preg_replace( '#/svg/#',
'/png/', $rbi->getFullSvgUrl() );
+ $png = file_get_contents( $pngUrl );
+ $out->addWikiText( 'PNG (' .
self::getlengh( $png ) . ') :', false );
+ $out->addHtml( "<img src='$pngUrl' />"
);
+ $out->addHtml( "<br />\n" );
+ } catch ( Exception $e ) {
+ $out->addHTML( 'Failed to get png.' );
+ }
}
}
$renderer->writeCache();
--
To view, visit https://gerrit.wikimedia.org/r/314919
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie23be31df53e2072226dd54ec092b8dec734cf29
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt <[email protected]>
Gerrit-Reviewer: Dyiop <[email protected]>
Gerrit-Reviewer: Hcohl <[email protected]>
Gerrit-Reviewer: Physikerwelt <[email protected]>
Gerrit-Reviewer: Whyameri <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
