Merge "Add separate database table for LaTeXML (step 3)"
This commit is contained in:
commit
423d80ef35
|
@ -192,7 +192,7 @@ class MathLaTeXML extends MathRenderer {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Picks a LaTeXML daemon.
|
* Picks a LaTeXML daemon.
|
||||||
* If more than one demon are availible one is chosen from the
|
* If more than one daemon are available one is chosen from the
|
||||||
* $wgMathLaTeXMLUrl array.
|
* $wgMathLaTeXMLUrl array.
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
|
@ -347,4 +347,8 @@ class MathLaTeXML extends MathRenderer {
|
||||||
return Xml::tags( 'span', $attribs, $mml );
|
return Xml::tags( 'span', $attribs, $mml );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected function getMathTableName() {
|
||||||
|
return 'mathlatexml';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -496,5 +496,12 @@ abstract class MathRenderer {
|
||||||
public function getUserInputTex() {
|
public function getUserInputTex() {
|
||||||
return $this->userInputTex;
|
return $this->userInputTex;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
protected abstract function getMathTableName();
|
||||||
|
|
||||||
|
public function getModeStr() {
|
||||||
|
$names = MathHooks::getMathNames();
|
||||||
|
return $names[ $this->getMode() ];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -46,4 +46,7 @@ class MathSource extends MathRenderer {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected function getMathTableName() {
|
||||||
|
throw new MWException ( 'in math source mode no database caching should happen');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -360,4 +360,8 @@ class MathTexvc extends MathRenderer {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected function getMathTableName() {
|
||||||
|
return 'math';
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,7 @@ class MathRendererTest extends MediaWikiTestCase {
|
||||||
*/
|
*/
|
||||||
public function testWriteCacheSkip() {
|
public function testWriteCacheSkip() {
|
||||||
$renderer = $this->getMockBuilder( 'MathRenderer' )
|
$renderer = $this->getMockBuilder( 'MathRenderer' )
|
||||||
->setMethods( array( 'writeToDatabase' , 'render' ) )
|
->setMethods( array( 'writeToDatabase' , 'render', 'getMathTableName' ) )
|
||||||
->disableOriginalConstructor()
|
->disableOriginalConstructor()
|
||||||
->getMock();
|
->getMock();
|
||||||
$renderer->expects( $this->never() )
|
$renderer->expects( $this->never() )
|
||||||
|
@ -40,7 +40,7 @@ class MathRendererTest extends MediaWikiTestCase {
|
||||||
*/
|
*/
|
||||||
public function testWriteCache() {
|
public function testWriteCache() {
|
||||||
$renderer = $this->getMockBuilder( 'MathRenderer' )
|
$renderer = $this->getMockBuilder( 'MathRenderer' )
|
||||||
->setMethods( array( 'writeToDatabase' , 'render' ) )
|
->setMethods( array( 'writeToDatabase' , 'render', 'getMathTableName' ) )
|
||||||
->disableOriginalConstructor()
|
->disableOriginalConstructor()
|
||||||
->getMock();
|
->getMock();
|
||||||
$renderer->expects( $this->never() )
|
$renderer->expects( $this->never() )
|
||||||
|
@ -54,7 +54,7 @@ class MathRendererTest extends MediaWikiTestCase {
|
||||||
*/
|
*/
|
||||||
public function testChangeHash() {
|
public function testChangeHash() {
|
||||||
$renderer = $this->getMockBuilder( 'MathRenderer' )
|
$renderer = $this->getMockBuilder( 'MathRenderer' )
|
||||||
->setMethods( array( 'render' ) )
|
->setMethods( array( 'render', 'getMathTableName' ) )
|
||||||
->disableOriginalConstructor()
|
->disableOriginalConstructor()
|
||||||
->getMock();
|
->getMock();
|
||||||
$this->assertEquals(
|
$this->assertEquals(
|
||||||
|
@ -71,7 +71,7 @@ class MathRendererTest extends MediaWikiTestCase {
|
||||||
|
|
||||||
public function testSetPurge() {
|
public function testSetPurge() {
|
||||||
$renderer = $this->getMockBuilder( 'MathRenderer' )
|
$renderer = $this->getMockBuilder( 'MathRenderer' )
|
||||||
->setMethods( array( 'render' ) )
|
->setMethods( array( 'render', 'getMathTableName' ) )
|
||||||
->disableOriginalConstructor()
|
->disableOriginalConstructor()
|
||||||
->getMock();
|
->getMock();
|
||||||
$renderer->setPurge();
|
$renderer->setPurge();
|
||||||
|
|
Loading…
Reference in New Issue