Purodha has uploaded a new change for review.
https://gerrit.wikimedia.org/r/247089
Change subject: Add missing message. Initial statistic overview.
......................................................................
Add missing message. Initial statistic overview.
Change-Id: Ic6aae8c933cc01c50f8d06365b38491bd8aa2ed7
---
M i18n/lexicaldata/en.json
M includes/specials/SpecialOWStatistics.php
2 files changed, 49 insertions(+), 7 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiLexicalData
refs/changes/89/247089/1
diff --git a/i18n/lexicaldata/en.json b/i18n/lexicaldata/en.json
index 08f98b6..9630710 100644
--- a/i18n/lexicaldata/en.json
+++ b/i18n/lexicaldata/en.json
@@ -126,6 +126,7 @@
"ow_ExactMeanings": "Exact meanings",
"ow_Expression": "Expression",
"ow_ExpressionMeanings": "Expression meanings",
+ "ow-syntrans": "Syntrans",
"ow_Expressions": "Expressions",
"ow_IdenticalMeaning": "Identical meaning?",
"ow_IncomingRelations": "Incoming relations",
diff --git a/includes/specials/SpecialOWStatistics.php
b/includes/specials/SpecialOWStatistics.php
index bb67049..224fcca 100644
--- a/includes/specials/SpecialOWStatistics.php
+++ b/includes/specials/SpecialOWStatistics.php
@@ -20,7 +20,7 @@
. $this->linkHeader (
wfMessage('ow_DefinedMeaning')->text(), "dm", $showstat ) . " — "
. $this->linkHeader (
wfMessage('ow_Definition')->text(), "def", $showstat ) . " — "
. $this->linkHeader (
wfMessage('ow_Expression')->text(), "exp", $showstat ) . " — "
- . $this->linkHeader ( "Syntrans", "syntrans", $showstat
) . " — "
+ . $this->linkHeader ( wfMessage('ow-syntrans')->text(),
"syntrans", $showstat ) . " — "
. $this->linkHeader (
wfMessage('ow_Annotation')->text(), "annot", $showstat )
. Html::closeElement('div')
. Html::element('br');
@@ -37,6 +37,8 @@
$wgOut->addHTML ( $this->getExpressionPerLanguage () ) ;
} elseif ( $showstat == 'annot' ) {
$wgOut->addHTML ( $this->getAnnotationStats () ) ;
+ } else {
+ $wgOut->addHTML ( $this->getFigures () ) ;
}
}
@@ -64,10 +66,52 @@
return $nbdm;
}
+ function getFigures ( ) {
+ $dc = wdGetDataSetContext();
+ $dbr = wfGetDB( DB_SLAVE );
+ $output = "";
+
+ $nbsyntrans = $dbr->selectField(
+ array( "{$dc}_syntrans" ),
+ 'COUNT(DISTINCT syntrans_sid)',
+ array( 'remove_transaction_id' => null ),
+ __METHOD__
+ );
+ $nbdef = $dbr->selectField(
+ array( "{$dc}_defined_meaning" ),
+ 'COUNT(DISTINCT defined_meaning_id)',
+ array( 'remove_transaction_id' => null ),
+ __METHOD__
+ );
+ $nbexp = $dbr->selectField(
+ "{$dc}_expression",
+ 'COUNT(DISTINCT expression_id)',
+ array( 'remove_transaction_id' => null ),
+ __METHOD__
+ );
+ $nblang = $dbr->selectField(
+ array( "{$dc}_expression" ),
+ 'COUNT(DISTINCT language_id)',
+ array( 'remove_transaction_id' => null ),
+ __METHOD__
+ );
+ $nbdm = $this->getNumberOfDM() ;
+
+ $output .= Html::openElement( 'table', array('class' =>
'owstatbig') );
+# $output .= $this->addTableRow( array(
wfMessage('ow_Annotation')->text(), $nbanot ) );
+ $output .= $this->addTableRow( array(
wfMessage('ow-syntrans')->text(), $nbsyntrans ) );
+ $output .= $this->addTableRow( array(
wfMessage('ow_Definition')->text(), $nbdef ) );
+ $output .= $this->addTableRow( array(
wfMessage('ow_Expression')->text(), $nbexp ) );
+ $output .= $this->addTableRow( array(
wfMessage('ow_DefinedMeaning')->text(), $nbdm ) );
+ $output .= $this->addTableRow( array(
wfMessage('ow_Language')->text(), $nblang ) );
+ $output .= Html::closeElement( 'table' );
+
+ return $output ;
+ }
+
function getDefinedMeaningPerLanguage () {
$dc = wdGetDataSetContext();
$dbr = wfGetDB( DB_SLAVE );
- global $wgUploadPath ;
$output = "";
$languageNames = getOwLanguageNames();
@@ -118,7 +162,6 @@
function getDefinitionPerLanguage () {
$dc = wdGetDataSetContext();
$dbr = wfGetDB( DB_SLAVE );
- global $wgUploadPath ;
$output = "";
$languageNames = getOwLanguageNames();
@@ -174,7 +217,6 @@
function getExpressionPerLanguage () {
$dc = wdGetDataSetContext();
$dbr = wfGetDB( DB_SLAVE );
- global $wgUploadPath ;
$output = "";
@@ -225,7 +267,6 @@
function getSyntransPerLanguage () {
$dc = wdGetDataSetContext();
$dbr = wfGetDB( DB_SLAVE );
- global $wgUploadPath ;
$output = "";
$queryResult = $dbr->select(
@@ -253,7 +294,7 @@
$tableLang = Html::openElement( 'table', array( 'class' =>
'sortable owstatmaintable' ));
$tableLang .= Html::openElement( 'tr' );
$tableLang .= Html::element( 'th', array(),
wfMessage('ow_Language')->text() );
- $tableLang .= Html::element( 'th', array(), 'Syntrans' );
+ $tableLang .= Html::element( 'th', array(),
wfMessage('ow-syntrans')->text() );
$tableLang .= Html::closeElement( 'tr' );
arsort ( $nbSyntransArray ) ;
@@ -264,7 +305,7 @@
$tableLang .= Html::closeElement( 'table' );
$output .= Html::openElement( 'table', array('class' =>
'owstatbig') );
- $output .= $this->addTableRow( array( 'Syntrans',
$nbSyntransTot ) );
+ $output .= $this->addTableRow( array(
wfMessage('ow-syntrans')->text(), $nbSyntransTot ) );
$output .= $this->addTableRow( array(
wfMessage('ow_DefinedMeaning')->text(), $nbdm ) );
$output .= $this->addTableRow( array(
wfMessage('ow_Language')->text(), $nblang ) );
$output .= Html::closeElement( 'table' );
--
To view, visit https://gerrit.wikimedia.org/r/247089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6aae8c933cc01c50f8d06365b38491bd8aa2ed7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLexicalData
Gerrit-Branch: master
Gerrit-Owner: Purodha <puro...@blissenbach.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
