[mb-commits] r9766 - in mb_server/branches/ReleaseTrack: cgi-bin/MusicBrainz/Server cgi-bin/MusicBrainz/Server/Handlers/WS/1 cgi-bin/MusicBrainz/Server/Moderation htdocs/comp htdocs/show/release htdocs/show/track
root at musicbrainz.org
root at musicbrainz.org
Tue Mar 11 14:28:10 UTC 2008
Author: luks
Date: 2008-03-11 14:28:10 +0000 (Tue, 11 Mar 2008)
New Revision: 9766
Added:
mb_server/branches/ReleaseTrack/htdocs/comp/releaseinfo
Removed:
mb_server/branches/ReleaseTrack/htdocs/comp/albuminfo
Modified:
mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm
mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_TRACK_ARTIST.pm
mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Release.pm
mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Track.pm
mb_server/branches/ReleaseTrack/htdocs/show/release/details.html
mb_server/branches/ReleaseTrack/htdocs/show/track/index.html
mb_server/branches/ReleaseTrack/htdocs/show/track/relationships.html
Log:
Replace Track::GetAlbumInfo with Track::FindReleases (which calls ReleaseTrack::FindByTrackId)
Modified: mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm
===================================================================
--- mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm 2008-03-11 13:26:42 UTC (rev 9765)
+++ mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm 2008-03-11 14:28:10 UTC (rev 9766)
@@ -577,18 +577,13 @@
xml_artist($ar, 0) if (defined $ar);
if ($ar && $inc & INC_RELEASES)
{
- my @albums = $tr->GetAlbumInfo();
- if (scalar(@albums))
+ my $releases = $tr->FindReleases;
+ if (scalar(@$releases))
{
- my $al = MusicBrainz::Server::Release->new($ar->{DBH});
print '<release-list>';
- foreach my $i (@albums)
+ foreach my $rtrack (@$releases)
{
- $al->SetMBId($i->[3]);
- if ($al->LoadFromId())
- {
- xml_release($ar, $al, 0, $i->[2])
- }
+ xml_release($ar, $rtrack->GetRelease, 0, $rtrack->GetSequence);
}
print '</release-list>';
}
Modified: mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_TRACK_ARTIST.pm
===================================================================
--- mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_TRACK_ARTIST.pm 2008-03-11 13:26:42 UTC (rev 9765)
+++ mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_TRACK_ARTIST.pm 2008-03-11 14:28:10 UTC (rev 9766)
@@ -72,14 +72,14 @@
# Check the old artist
$ar->SetId($self->{artist});
- if ($ar->LoadFromId())
+ if (0 && $ar->LoadFromId())
{
$level = $ar->GetQuality() > $level ? $ar->GetQuality() : $level;
return $level if ($level == &ModDefs::QUALITY_HIGH);
}
# Check the new artist
$ar->SetId($self->{'new.id'});
- if ($ar->LoadFromId())
+ if (0 && $ar->LoadFromId())
{
$level = $ar->GetQuality() > $level ? $ar->GetQuality() : $level;
return $level if ($level == &ModDefs::QUALITY_HIGH);
@@ -88,12 +88,13 @@
# Check any releases that this track is attached to
my $tr = MusicBrainz::Server::Track->new($self->{DBH});
$tr->SetId($self->{rowid});
- my @albums = $tr->GetAlbumInfo();
- if (@albums)
+ my $releases = $tr->FindReleases;
+ if (scalar(@$releases))
{
- for (@albums)
+ foreach my $rtrack (@$releases)
{
- $level = $_->[5] > $level ? $_->[5] : $level;
+ my $release = $rtrack->GetRelease;
+ $level = $release->GetQuality > $level ? $release->GetQuality : $level;
}
}
Modified: mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Release.pm
===================================================================
--- mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Release.pm 2008-03-11 13:26:42 UTC (rev 9765)
+++ mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Release.pm 2008-03-11 14:28:10 UTC (rev 9766)
@@ -1572,8 +1572,10 @@
# Returns reference to a list of ReleaseTrack objects
sub FindTracks
{
+ my $self = shift;
+
require MusicBrainz::Server::ReleaseTrack;
- return MusicBrainz::Server::ReleaseTrack->FindByReleaseId($self->GetId);
+ return MusicBrainz::Server::ReleaseTrack->FindByReleaseId($self->{DBH}, $self->GetId);
}
1;
# eof Release.pm
Modified: mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Track.pm
===================================================================
--- mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Track.pm 2008-03-11 13:26:42 UTC (rev 9765)
+++ mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Track.pm 2008-03-11 14:28:10 UTC (rev 9766)
@@ -537,27 +537,6 @@
return 1;
}
-sub GetAlbumInfo
-{
- my ($this) = @_;
- my ($sql, @row, @info);
-
- $sql = Sql->new($this->{DBH});
- if ($sql->Select(qq|select album, name, sequence, GID, attributes, quality
- from AlbumJoin, Album
- where AlbumJoin.album = Album.id and
- track = | . $this->GetId()))
- {
- for(;@row = $sql->NextRow();)
- {
- push @info, [@row];
- }
- }
- $sql->Finish;
-
- return @info;
-}
-
sub XML_URL
{
my $this = shift;
@@ -622,8 +601,10 @@
# Returns reference to a list of ReleaseTrack objects
sub FindReleases
{
+ my $self = shift;
+
require MusicBrainz::Server::ReleaseTrack;
- return MusicBrainz::Server::ReleaseTrack->FindByTrackId($self->GetId);
+ return MusicBrainz::Server::ReleaseTrack->FindByTrackId($self->{DBH}, $self->GetId);
}
1;
Deleted: mb_server/branches/ReleaseTrack/htdocs/comp/albuminfo
Copied: mb_server/branches/ReleaseTrack/htdocs/comp/releaseinfo (from rev 9764, mb_server/branches/ReleaseTrack/htdocs/comp/albuminfo)
Modified: mb_server/branches/ReleaseTrack/htdocs/show/release/details.html
===================================================================
--- mb_server/branches/ReleaseTrack/htdocs/show/release/details.html 2008-03-11 13:26:42 UTC (rev 9765)
+++ mb_server/branches/ReleaseTrack/htdocs/show/release/details.html 2008-03-11 14:28:10 UTC (rev 9766)
@@ -60,7 +60,7 @@
<& /comp/artistinfo, artist => $artist, short => 1 &>
- <& /comp/albuminfo, album => $release &>
+ <& /comp/releaseinfo, release => $release &>
<%perl>
Modified: mb_server/branches/ReleaseTrack/htdocs/show/track/index.html
===================================================================
--- mb_server/branches/ReleaseTrack/htdocs/show/track/index.html 2008-03-11 13:26:42 UTC (rev 9765)
+++ mb_server/branches/ReleaseTrack/htdocs/show/track/index.html 2008-03-11 14:28:10 UTC (rev 9766)
@@ -133,37 +133,12 @@
<& /comp/trackinfo, track => $track, TRM => \@TRM, PUID => \@PUID &>
-<%perl>
+% my $releases = $track->FindReleases;
+% for my $rtrack (@$releases) {
+ <& /comp/releaseinfo, short => 1, release => $rtrack->GetRelease,
+ track => $track, trackseq => $rtrack->GetSequence &>
+% }
- my @info = $track->GetAlbumInfo;
- if (@info)
- {
- for (@info)
- {
- my $album = MusicBrainz::Server::Release->new($mb->{DBH});
- $album->SetId($_->[0]);
- $album->SetName($_->[1]);
- $album->SetMBId($_->[3]);
-
- # FIXME need API in Release.pm
- $album->{attrs} = [ $_->[4] =~ /(\d+)/g ];
-
- $m->comp(
- "/comp/albuminfo",
- short => 1,
- album => $album,
- track => $track,
- trackseq => $_->[2],
- );
- }
- }
- else
- {
- $m->out("Could not load releases.");
- }
-
-</%perl>
-
<& /comp/artistinfo, artist => $artist, short => 1, &>
<& /comp/footer &>
Modified: mb_server/branches/ReleaseTrack/htdocs/show/track/relationships.html
===================================================================
--- mb_server/branches/ReleaseTrack/htdocs/show/track/relationships.html 2008-03-11 13:26:42 UTC (rev 9765)
+++ mb_server/branches/ReleaseTrack/htdocs/show/track/relationships.html 2008-03-11 14:28:10 UTC (rev 9766)
@@ -66,28 +66,21 @@
$m->comp("/comp/trackinfo", track => $track);
- my @info = $track->GetAlbumInfo;
- if (@info)
- {
- for (@info)
- {
- my $release = MusicBrainz::Server::Release->new($mb->{DBH});
- $release->SetId($_->[0]);
- $release->SetName($_->[1]);
- $release->SetMBId($_->[3]);
-
- # FIXME need API in Release.pm
- $release->{attrs} = [ $_->[4] =~ /(\d+)/g ];
- $m->comp("/comp/albuminfo",
- album => $release,
- track => $track,
- trackseq => $_->[2],
- );
- }
+ my $releases = $track->FindReleases;
+ for my $rtrack (@$releases) {
+ $m->comp("/comp/releaseinfo",
+ release => $rtrack->GetRelease,
+ track => $track,
+ trackseq => $rtrack->GetSequence,
+ short => 1,
+ );
}
my $artist = $m->comp("/comp/loadartist", $mb, $track->GetArtist());
- $m->comp("/comp/artistinfo", artist => $artist);
+ $m->comp("/comp/artistinfo",
+ artist => $artist,
+ short => 1,
+ );
$m->comp("/comp/footer");
More information about the MusicBrainz-commits
mailing list