[mb-commits] branch, mbs-5288, created. MBS-5288, normalize pages xml response in Data::WikiDocIndex:: get_wiki_versions.

MusicBrainz Git Server <[email protected]> Tue, 25 Dec 2012 14:58:01 +0000
Newsgroups gmane.comp.audio.musicbrainz.cvs
Message-ID <E1TnVxA-0004Wx-M9@wiley>
The branch, mbs-5288 has been created
        at  9acb63a0b30cd25877d7de2cc9e72e8cb4f547d5 (commit)

- Log -----------------------------------------------------------------
commit 9acb63a0b30cd25877d7de2cc9e72e8cb4f547d5
Author: warp <[email protected]>
Date:   Tue Dec 25 14:11:36 2012 +0100

    MBS-5288, normalize pages xml response in Data::WikiDocIndex::get_wiki_versions.

diff --git a/lib/DBDefs/Default.pm b/lib/DBDefs/Default.pm
index 87c9e48..de8f64a 100644
--- a/lib/DBDefs/Default.pm
+++ b/lib/DBDefs/Default.pm
@@ -120,7 +120,7 @@ sub WIKITRANS_SERVER     { "wiki.musicbrainz.org" }
 # The path to MediaWiki's api.php file. This is required to automatically
 # determine which documentation pages need to be updated in the
 # transclusion table.
-sub WIKITRANS_SERVER_API { "wiki.musicbrainz.org/-/api.php" }
+sub WIKITRANS_SERVER_API { "wiki.musicbrainz.org/api.php" }
 
 sub WIKITRANS_INDEX_FILE { my $self = shift; $self->MB_SERVER_ROOT . "/root/static/wikidocs/index.txt" }
 sub WIKITRANS_INDEX_URL  { "http://musicbrainz.org/static/wikidocs/index.txt" }
diff --git a/lib/MusicBrainz/Server/Data/WikiDocIndex.pm b/lib/MusicBrainz/Server/Data/WikiDocIndex.pm
index 0f902ac..9bc0bee 100644
--- a/lib/MusicBrainz/Server/Data/WikiDocIndex.pm
+++ b/lib/MusicBrainz/Server/Data/WikiDocIndex.pm
@@ -165,9 +165,18 @@ sub get_wiki_versions
             KeyAttr => { page => 'title', r => 'from', n => 'to'},
             GroupTags => { pages => 'page', redirects => 'r', normalized => 'n' }
         );
+
         my $pages = $xml->{query}->{pages};
         my $normalized = $xml->{query}->{normalized};
 
+        if (defined $pages->{title})
+        {
+            my $newpages = { };
+            $newpages->{ $pages->{title} } = $pages;
+
+            $pages = $newpages;
+        }
+
         foreach my $title (keys %$pages) {
             my $info->{wiki_version} = $pages->{$title}->{lastrevid};
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
mb_server