Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/82564
Change subject: fixes for wikitravel links and updates. add a trim() when
unserializing API data to fix parsing for a lot of wikis sending whitespace
......................................................................
fixes for wikitravel links and updates. add a trim() when unserializing
API data to fix parsing for a lot of wikis sending whitespace
Change-Id: I2e01401d5ca5ac56b192a3554f0811d0e1aca762
---
M etc/wikistats/config.php
M usr/lib/wikistats/update.php
M var/www/wikistats/display.php
3 files changed, 18 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/wikistats
refs/changes/64/82564/1
diff --git a/etc/wikistats/config.php b/etc/wikistats/config.php
index f42b7a5..2792ff3 100644
--- a/etc/wikistats/config.php
+++ b/etc/wikistats/config.php
@@ -38,7 +38,7 @@
$dbpass="<not included>";
# current stable/dev mediawiki versions (update regularly)
-$goodversions=array('1.22wmf12','1.21wmf12','1.21wmf11','1.20wmf12','1.20wmf3','1.20wmf2','1.18wmf1','1.19wmf1','1.20wmf1','1.18.0','1.18.2');
+$goodversions=array('1.22wmf12','1.21wmf12','1.21wmf11','1.20wmf12','1.20wmf3','1.20wmf2','1.20.2','1.18wmf1','1.19wmf1','1.20wmf1','1.18.0','1.18.2');
$devversions=array('1.18alpha','1.19alpha','1.20alpha','1.21wmf1');
# maxlag parameter for API calls
@@ -74,6 +74,9 @@
# list tables with URLs like domain.org/wikiname/api.php
$tables_with_suffix_short=array('editthis','lxde');
+# list tables with URLs like domain.org/lang/wiki/api.php
+$tables_with_suffix_wiki=array('wikitravel');
+
# list tables for which we save a full statistics URL in db
$tables_with_statsurl=array('mediawikis','uncyclomedia','metapedias','wmspecials');
diff --git a/usr/lib/wikistats/update.php b/usr/lib/wikistats/update.php
index 8a7204f..3681331 100644
--- a/usr/lib/wikistats/update.php
+++ b/usr/lib/wikistats/update.php
@@ -264,6 +264,9 @@
} elseif (in_array($table, $tables_with_suffix_short)) {
$prefix=$row['prefix'];
$url="http://${domain}/".$row['prefix']."/api.php${api_query_stat}";
+ } elseif (in_array($table, $tables_with_suffix_wiki)) {
+ $prefix=$row['prefix'];
+
$url="http://${domain}/wiki/".$row['prefix']."/api.php${api_query_stat}";
} else {
$prefix=$row['prefix'];
$url="http://${prefix}.${domain}/w/api.php${api_query_stat}";;
@@ -306,7 +309,7 @@
$prefix=$table;
} elseif ($table=="wikitravel") {
$prefix=$row['prefix'];
-
$url="http://${domain}/".$row['prefix']."/Special:Statistics?action=raw";
+ $url="http://${domain}/wiki/".$row['prefix']."/api.php";
} elseif ($table=="rodovid") {
$prefix=$row['prefix'];
$url="http://${prefix}.${domain}/wk/Special:Statistics?action=raw";;
diff --git a/var/www/wikistats/display.php b/var/www/wikistats/display.php
index 9ceda37..b5bb84d 100644
--- a/var/www/wikistats/display.php
+++ b/var/www/wikistats/display.php
@@ -391,7 +391,7 @@
$apilink="http://".$row['prefix'].".${domain}/api.php{$api_query_disp}";
$wikilink="http://".$row['prefix'].".${domain}/wiki";
- $versionlink="${wikilink}Special:Version";
+ $versionlink="${wikilink}/Special:Version";
echo "<td class=\"text\"><a
href=\"http://".$row['prefix'].".${domain}/wiki/\">".$row['prefix']."</a></td>";
@@ -399,10 +399,18 @@
$apilink="http://${domain}/".$row['prefix']."/api.php{$api_query_disp}";
$wikilink="http://${domain}/".$row['prefix'];
- $versionlink="${wikilink}Special:Version";
+ $versionlink="${wikilink}/Special:Version";
echo "<td class=\"text\"><a
href=\"http://${domain}/".$row['prefix']."/\">".$row['prefix']."</a></td>";
+ } elseif (in_array($db_table, $tables_with_suffix_wiki)) {
+
+
$apilink="http://${domain}/wiki/".$row['prefix']."/api.php{$api_query_disp}";
+ $wikilink="http://${domain}/".$row['prefix']."/";
+ $versionlink="${wikilink}Special:Version";
+
+ echo "<td class=\"text\"><a
href=\"${wikilink}\">".$row['prefix']."</a></td>";
+
} elseif ($project == "wx") {
echo "
--
To view, visit https://gerrit.wikimedia.org/r/82564
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e01401d5ca5ac56b192a3554f0811d0e1aca762
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
