Dzahn has submitted this change and it was merged.
Change subject: add W3C wikis table
......................................................................
add W3C wikis table
Bug 41023
Change-Id: I43a6c9c18b147fd4c91a71d179256f0d7bcc30a3
---
M etc/wikistats/config.php
M usr/lib/wikistats/update.php
M usr/lib/wikistats/update_functions.php
M usr/share/php/wikistats/coalesced_query.php
M usr/share/php/wikistats/largest_query.php
M var/www/wikistats/detail.php
M var/www/wikistats/display.php
M var/www/wikistats/displayw.php
M var/www/wikistats/largest_html.php
9 files changed, 33 insertions(+), 2 deletions(-)
Approvals:
Dzahn: Looks good to me, approved
diff --git a/etc/wikistats/config.php b/etc/wikistats/config.php
index be068f9..cc268dc 100644
--- a/etc/wikistats/config.php
+++ b/etc/wikistats/config.php
@@ -60,10 +60,10 @@
$socket_timeout="10";
# list all tables (which should be displayed on index page and included in
grand totals)
-$listtables=array('wikipedias','wikiquotes','wikibooks','wiktionaries','wikinews','wikisources','wikia','editthis','wikitravel','mediawikis','uncyclomedia','anarchopedias','opensuse','richdex','gratiswiki','qweki','wikisite','gentoo','hyperwave','scoutwiki','wmspecials','qweki','wikiversity','wikifur','metapedias','neoseeker','shoutwiki','referata','pardus','rodovid','wikkii','lxde','wikivoyage');
+$listtables=array('wikipedias','wikiquotes','wikibooks','wiktionaries','wikinews','wikisources','wikia','editthis','wikitravel','mediawikis','uncyclomedia','anarchopedias','opensuse','richdex','gratiswiki','qweki','wikisite','gentoo','hyperwave','scoutwiki','wmspecials','qweki','wikiversity','wikifur','metapedias','neoseeker','shoutwiki','referata','pardus','rodovid','wikkii','lxde','wikivoyage','w3cwikis');
# list tables which are valid for our api.php - CHECKME
-$valid_api_tables=array('wikipedias','mediawikis','wiktionaries','wikia','wikisources','wmspecials','uncyclomedia','wikibooks','wikiquotes','editthis','wikinews','wikisite','wikitravel','scoutwiki','anarchopedias','opensuse','gratiswiki','gentoo','wikimedias','metapedias','wikifur','neoseeker','wikiversity','wikivoyage');
+$valid_api_tables=array('wikipedias','mediawikis','wiktionaries','wikia','wikisources','wmspecials','uncyclomedia','wikibooks','wikiquotes','editthis','wikinews','wikisite','wikitravel','scoutwiki','anarchopedias','opensuse','gratiswiki','gentoo','wikimedias','metapedias','wikifur','neoseeker','wikiversity','wikivoyage','w3cwikis');
# list tables which should have language columns in the html tables
$tables_with_language_columns=array('wikipedias','wiktionaries','wikisources','uncyclomedia','wikibooks','wikiquotes','wikinews','wikitravel','anarchopedias','wikimedias','wikifur','wikiversity','pardus','rodovid','lxde','wikivoyage','metapedias');
diff --git a/usr/lib/wikistats/update.php b/usr/lib/wikistats/update.php
index bce1a07..002be96 100644
--- a/usr/lib/wikistats/update.php
+++ b/usr/lib/wikistats/update.php
@@ -166,6 +166,10 @@
$table="lxde";
$domain="wiki.lxde.org";
break;
+ case "w3":
+ $table="w3cwikis";
+ $domain="www.w3.org";
+ break;
default:
$table="unknown";
print "unkown table. exiting\n";
diff --git a/usr/lib/wikistats/update_functions.php
b/usr/lib/wikistats/update_functions.php
index 9a47921..95ccc6b 100755
--- a/usr/lib/wikistats/update_functions.php
+++ b/usr/lib/wikistats/update_functions.php
@@ -140,6 +140,10 @@
$table="lxde";
$domain="wiki.lxde.org";
break;
+ case "w3":
+ $table="w3cwikis";
+ $domain="www.w3.org";
+ break;
default:
$table="unknown";
print "unkown table. exiting\n";
diff --git a/usr/share/php/wikistats/coalesced_query.php
b/usr/share/php/wikistats/coalesced_query.php
index 479810f..45c7a60 100644
--- a/usr/share/php/wikistats/coalesced_query.php
+++ b/usr/share/php/wikistats/coalesced_query.php
@@ -55,6 +55,8 @@
(select 'wk' as project,'wikkii' as name,sum(good) as ggood, sum(total) as
gtotal, sum(edits) as gedits, sum(admins) as gadmins, sum(users) as
gusers,sum(images) as gimages, count(id) as numwikis from wikkii)
union all
(select 'sw' as project,'shoutwiki' as name,sum(good) as ggood, sum(total) as
gtotal, sum(edits) as gedits, sum(admins) as gadmins, sum(users) as
gusers,sum(images) as gimages, count(id) as numwikis from shoutwiki)
+union all
+(select 'w3c' as project,'w3cwikis' as name,sum(good) as ggood, sum(total) as
gtotal, sum(edits) as gedits, sum(admins) as gadmins, sum(users) as
gusers,sum(images) as gimages, count(id) as numwikis from w3cwikis)
order by ${sort};";
?>
diff --git a/usr/share/php/wikistats/largest_query.php
b/usr/share/php/wikistats/largest_query.php
index 81a7e9b..bfc5053 100755
--- a/usr/share/php/wikistats/largest_query.php
+++ b/usr/share/php/wikistats/largest_query.php
@@ -50,6 +50,8 @@
UNION SELECT id,lang,prefix AS statsurl,version,${number_fields},"Wikisite" AS
type FROM wikisite WHERE good >= ${threshold}
+UNION SELECT ${fields_nolangs},"W3C" AS type FROM w3cwikis WHERE good >=
${threshold}
+
ORDER BY ${msort} LIMIT ${limit};
FNORD;
diff --git a/var/www/wikistats/detail.php b/var/www/wikistats/detail.php
index 29c59e9..915c83f 100644
--- a/var/www/wikistats/detail.php
+++ b/var/www/wikistats/detail.php
@@ -174,6 +174,11 @@
$domain="wiki.lxde.org";
$db_table="lxde";
break;
+ case "w3":
+ $project_name="W3C wikis";
+ $domain="www.w3.org";
+ $db_table="w3cwikis";
+ break;
default:
$project_name="invalid";
diff --git a/var/www/wikistats/display.php b/var/www/wikistats/display.php
index fd3548c..4aa77f8 100644
--- a/var/www/wikistats/display.php
+++ b/var/www/wikistats/display.php
@@ -174,6 +174,11 @@
$domain="wiki.lxde.org";
$db_table="lxde";
break;
+ case "w3":
+ $project_name="W3C wikis";
+ $domain="www.w3.org";
+ $db_table="w3cwikis";
+ break;
default:
$project_name="invalid";
@@ -190,6 +195,7 @@
<li><a href="${phpself}?t=ne">ne</a> (neoseeker)</li><li><a
href="${phpself}?t=wv">wv</a> (wikiversity)</li><li><a
href="${phpself}?t=sc">sc</a> (scoutwiki)</li>
<li><a href="${phpself}?t=wf">wf</a> (wikifur)</li><li><a
href="${phpself}?t=an">an</a> (anarchopedias)</li><li><a
href="${phpself}?t=gt">gt</a> (gentoo)</li>
<li><a href="${phpself}?t=os">os</a> (opensuse)</li><li><a
href="${phpself}?t=re">re</a> (referata)</li><li><a
href="${phpself}?t=pa">pa</a> (pardus)</li>
+<li><a href="${phpself}?t=w3">w3</a> (w3c)</li>
</ul></html>
INVALID;
exit;
diff --git a/var/www/wikistats/displayw.php b/var/www/wikistats/displayw.php
index 1d45c9d..3439010 100644
--- a/var/www/wikistats/displayw.php
+++ b/var/www/wikistats/displayw.php
@@ -169,6 +169,11 @@
$domain="wiki.lxde.org";
$db_table="lxde";
break;
+ case "w3":
+ $project_name="W3C wikis";
+ $domain="www.w3.org";
+ $db_table="w3cwikis";
+ break;
default:
$project_name="invalid";
@@ -185,6 +190,7 @@
<li><a href="${phpself}?t=ne">ne</a> (neoseeker)</li><li><a
href="${phpself}?t=wv">wv</a> (wikiversity)</li><li><a
href="${phpself}?t=sc">sc</a> (scoutwiki)</li>
<li><a href="${phpself}?t=wf">wf</a> (wikifur)</li><li><a
href="${phpself}?t=an">an</a> (anarchopedias)</li><li><a
href="${phpself}?t=gt">gt</a> (gentoo)</li>
<li><a href="${phpself}?t=os">os</a> (opensuse)</li><li><a
href="${phpself}?t=re">re</a> (referata)</li><li><a
href="${phpself}?t=pa">pa</a> (pardus)</li>
+<li><a href="${phpself}?t=w3">w3</a> (w3c)</li>
</ul></html>
INVALID;
exit;
diff --git a/var/www/wikistats/largest_html.php
b/var/www/wikistats/largest_html.php
index f9f7a74..4c1281b 100644
--- a/var/www/wikistats/largest_html.php
+++ b/var/www/wikistats/largest_html.php
@@ -79,6 +79,8 @@
UNION ALL
SELECT count(id) AS count,'Wik.is' AS type FROM wikdotis
UNION ALL
+SELECT count(id) AS count,'W3C' AS type FROM w3cwikis
+UNION ALL
SELECT count(id) AS count,'Elwiki' AS type FROM elwiki where inactive is null";
$result = mysql_query("$countquery") or die(mysql_error());
--
To view, visit https://gerrit.wikimedia.org/r/155680
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I43a6c9c18b147fd4c91a71d179256f0d7bcc30a3
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
