From e2a5c002d0469edea67f6e1920cf32512c458a07 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 29 Jan 2008 01:21:34 +0000 Subject: [PATCH] Apply live hacks from Wikimedia codebase: * generate interwiki map SQL files per db in a directory instead of all in a blob * add Wikiversity --- maintenance/rebuildInterwiki.inc | 9 +++++---- maintenance/rebuildInterwiki.php | 16 ++++++---------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/maintenance/rebuildInterwiki.inc b/maintenance/rebuildInterwiki.inc index d85612bd15..a14f889799 100644 --- a/maintenance/rebuildInterwiki.inc +++ b/maintenance/rebuildInterwiki.inc @@ -28,7 +28,7 @@ class Site { } } -function getRebuildInterwikiSQL() { +function makeInterwikiSQL( $destDir ) { global $langlist, $languageAliases, $prefixRewrites; # Multi-language sites @@ -41,6 +41,7 @@ function getRebuildInterwikiSQL() { 'wikinews' => new Site( 'wikinews', 'n', 'wikinews.org' ), 'wikisource' => new Site( 'wikisource', 's', 'wikisource.org' ), 'wikimedia' => new Site( 'wikimedia', 'chapter', 'wikimedia.org' ), + 'wikiversity' => new Site( 'wikiversity', 'v', 'wikiversity.org' ), ); # List of language prefixes likely to be found in multi-language sites @@ -123,10 +124,10 @@ function getRebuildInterwikiSQL() { } } - $sql = "-- Generated by rebuildInterwiki.php"; foreach ( $dblist as $db ) { + $sql = "-- Generated by rebuildInterwiki.php"; if ( isset( $specials[$db] ) ) { # Special wiki # Has interwiki links and interlanguage links to wikipedia @@ -211,10 +212,10 @@ function getRebuildInterwikiSQL() { foreach ( $extraLinks as $link ){ $sql .= makeLink( $link, $first, $db ); } - $sql .= ";\n\n"; + $sql .= ";\n"; } + file_put_contents( "$destDir/$db.sql", $sql ); } - return $sql; } # ------------------------------------------------------------------------------------------ diff --git a/maintenance/rebuildInterwiki.php b/maintenance/rebuildInterwiki.php index bc0a0008d7..08968421db 100644 --- a/maintenance/rebuildInterwiki.php +++ b/maintenance/rebuildInterwiki.php @@ -9,22 +9,18 @@ /** */ $oldCwd = getcwd(); -$optionsWithArgs = array( "o" ); +$optionsWithArgs = array( "d" ); include_once( "commandLine.inc" ); include_once( "rebuildInterwiki.inc" ); chdir( $oldCwd ); -$sql = getRebuildInterwikiSQL(); - # Output -if ( isset( $options['o'] ) ) { - # To file specified with -o - $file = fopen( $options['o'], "w" ); - fwrite( $file, $sql ); - fclose( $file ); +if ( isset( $options['d'] ) ) { + $destDir = $options['d']; } else { - # To stdout - print $sql; + $destDir = '/home/wikipedia/conf/interwiki/sql'; } +echo "Making new interwiki SQL files in $destDir\n"; +makeInterwikiSQL( $destDir ); -- 2.20.1