[mb-commits] r9744 - in mb_server/branches/terminology: admin cgi-bin cgi-bin/MusicBrainz/Server cgi-bin/MusicBrainz/Server/Handlers/WS/1 cgi-bin/MusicBrainz/Server/Moderation htdocs/show/puid htdocs/show/track
root at musicbrainz.org
root at musicbrainz.org
Sun Mar 9 20:49:10 UTC 2008
Author: luks
Date: 2008-03-09 20:49:10 +0000 (Sun, 09 Mar 2008)
New Revision: 9744
Removed:
mb_server/branches/terminology/cgi-bin/PUID.pm
Modified:
mb_server/branches/terminology/admin/startup.pl.default
mb_server/branches/terminology/cgi-bin/Insert.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_PUIDS.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_PUID.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Track.pm
mb_server/branches/terminology/htdocs/show/puid/index.html
mb_server/branches/terminology/htdocs/show/track/index.html
Log:
Move PUID to MusicBrainz::Server
Modified: mb_server/branches/terminology/admin/startup.pl.default
===================================================================
--- mb_server/branches/terminology/admin/startup.pl.default 2008-03-09 18:45:15 UTC (rev 9743)
+++ mb_server/branches/terminology/admin/startup.pl.default 2008-03-09 20:49:10 UTC (rev 9744)
@@ -102,7 +102,7 @@
require TaggerSupport;
require MusicBrainz::Server::Track;
require TRM;
-require PUID;
+require MusicBrainz::Server::PUID;
require UserPreference;
require UserStuff;
require UserSubscription;
Modified: mb_server/branches/terminology/cgi-bin/Insert.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Insert.pm 2008-03-09 18:45:15 UTC (rev 9743)
+++ mb_server/branches/terminology/cgi-bin/Insert.pm 2008-03-09 20:49:10 UTC (rev 9744)
@@ -216,8 +216,8 @@
my $tr = MusicBrainz::Server::Track->new($this->{DBH});
require TRM;
my $trm = TRM->new($this->{DBH});
- require PUID;
- my $puid = PUID->new($this->{DBH});
+ require MusicBrainz::Server::PUID;
+ my $puid = MusicBrainz::Server::PUID->new($this->{DBH});
require MusicBrainz::Server::ReleaseEvent;
my $rel = MusicBrainz::Server::ReleaseEvent->new($this->{DBH});
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm 2008-03-09 18:45:15 UTC (rev 9743)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm 2008-03-09 20:49:10 UTC (rev 9744)
@@ -603,11 +603,11 @@
sub xml_puid
{
- require PUID;
+ require MusicBrainz::Server::PUID;
my ($tr) = @_;
my $id;
- my $puid = PUID->new($tr->{DBH});
+ my $puid = MusicBrainz::Server::PUID->new($tr->{DBH});
my @PUID = $puid->GetPUIDFromTrackId($tr->GetId);
return undef if (scalar(@PUID) == 0);
print '<puid-list>';
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_PUIDS.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_PUIDS.pm 2008-03-09 18:45:15 UTC (rev 9743)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_PUIDS.pm 2008-03-09 20:49:10 UTC (rev 9744)
@@ -86,13 +86,13 @@
{
my $self = shift;
- require PUID;
- my $PUID = PUID->new($self->{DBH});
+ require MusicBrainz::Server::PUID;
+ my $puid = MusicBrainz::Server::PUID->new($self->{DBH});
my $clientVersion = $self->{'new_unpacked'}{'ClientVersion'};
for (@{ $self->{'new_list'} })
{
- $PUID->Insert(
+ $puid->Insert(
$_->{'puid'},
$_->{'trackid'},
$clientVersion,
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_PUID.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_PUID.pm 2008-03-09 18:45:15 UTC (rev 9743)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_PUID.pm 2008-03-09 20:49:10 UTC (rev 9744)
@@ -48,8 +48,8 @@
$self->SetPrev($puid);
# Save the PUID's clientversion in case we need to re-add it
- require PUID;
- my $puidobj = PUID->new($self->{DBH});
+ require MusicBrainz::Server::PUID;
+ my $puidobj = MusicBrainz::Server::PUID->new($self->{DBH});
my $clientversion = $puidobj->FindPUIDClientVersion($puid);
my %new = (
@@ -61,8 +61,8 @@
# This is one of those mods where we give the user instant gratification,
# then undo the mod later if it's rejected.
- require PUID;
- my $t = PUID->new($self->{DBH});
+ require MusicBrainz::Server::PUID;
+ my $t = MusicBrainz::Server::PUID->new($self->{DBH});
$t->RemovePUIDByPUIDJoin($self->GetRowId);
}
@@ -132,8 +132,8 @@
return;
}
- require PUID;
- my $t = PUID->new($self->{DBH});
+ require MusicBrainz::Server::PUID;
+ my $t = MusicBrainz::Server::PUID->new($self->{DBH});
my $id = $t->Insert($self->GetPrev, $trackid, $new->{'ClientVersion'});
# The above Insert can fail, usually if the row in the "puid" table
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm 2008-03-09 18:45:15 UTC (rev 9743)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm 2008-03-09 20:49:10 UTC (rev 9744)
@@ -1028,8 +1028,8 @@
my $trm = TRM->new($this->{DBH});
$trm->MergeTracks($old, $new);
- require PUID;
- my $puid = PUID->new($this->{DBH});
+ require MusicBrainz::Server::PUID;
+ my $puid = MusicBrainz::Server::PUID->new($this->{DBH});
$puid->MergeTracks($old, $new);
# Move relationships
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Track.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Track.pm 2008-03-09 18:45:15 UTC (rev 9743)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Track.pm 2008-03-09 20:49:10 UTC (rev 9744)
@@ -510,8 +510,8 @@
my $trm = TRM->new($this->{DBH});
$trm->RemoveByTrackId($this->GetId());
- require PUID;
- my $puid = PUID->new($this->{DBH});
+ require MusicBrainz::Server::PUID;
+ my $puid = MusicBrainz::Server::PUID->new($this->{DBH});
$puid->RemoveByTrackId($this->GetId());
# Remove relationships
Deleted: mb_server/branches/terminology/cgi-bin/PUID.pm
Modified: mb_server/branches/terminology/htdocs/show/puid/index.html
===================================================================
--- mb_server/branches/terminology/htdocs/show/puid/index.html 2008-03-09 18:45:15 UTC (rev 9743)
+++ mb_server/branches/terminology/htdocs/show/puid/index.html 2008-03-09 20:49:10 UTC (rev 9744)
@@ -43,7 +43,7 @@
my $mb = $m->comp("/comp/dblogin");
my $artist = MusicBrainz::Server::Artist->new($mb->{DBH});
my $release = MusicBrainz::Server::Release->new($mb->{DBH});
- my $pweed = PUID->new($mb->{DBH});
+ my $pweed = MusicBrainz::Server::PUID->new($mb->{DBH});
my $ids;
unless (MusicBrainz::Server::Validation::IsGUID($puid))
Modified: mb_server/branches/terminology/htdocs/show/track/index.html
===================================================================
--- mb_server/branches/terminology/htdocs/show/track/index.html 2008-03-09 18:45:15 UTC (rev 9743)
+++ mb_server/branches/terminology/htdocs/show/track/index.html 2008-03-09 20:49:10 UTC (rev 9744)
@@ -93,7 +93,7 @@
}
my @TRM = TRM->new($mb->{DBH})->GetTRMFromTrackId($track->GetId);
- my @PUID = PUID->new($mb->{DBH})->GetPUIDFromTrackId($track->GetId);
+ my @PUID = MusicBrainz::Server::PUID->new($mb->{DBH})->GetPUIDFromTrackId($track->GetId);
# load artist from trackartist
More information about the MusicBrainz-commits
mailing list