[mb-commits] r9745 - in mb_server/branches/terminology: admin cgi-bin cgi-bin/MusicBrainz/Server cgi-bin/MusicBrainz/Server/Moderation htdocs/show/track htdocs/show/trm
root at musicbrainz.org
root at musicbrainz.org
Sun Mar 9 20:57:07 UTC 2008
Author: luks
Date: 2008-03-09 20:57:07 +0000 (Sun, 09 Mar 2008)
New Revision: 9745
Added:
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/TRM.pm
Removed:
mb_server/branches/terminology/cgi-bin/TRM.pm
Modified:
mb_server/branches/terminology/admin/startup.pl.default
mb_server/branches/terminology/cgi-bin/Insert.pm
mb_server/branches/terminology/cgi-bin/MM.pm
mb_server/branches/terminology/cgi-bin/MM_2_0.pm
mb_server/branches/terminology/cgi-bin/MM_2_1.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/DeferredUpdate.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_TRMS.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_TRMID.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/cgi-bin/QuerySupport.pm
mb_server/branches/terminology/htdocs/show/track/index.html
mb_server/branches/terminology/htdocs/show/trm/index.html
Log:
Move TRM to MusicBrainz::Server
Modified: mb_server/branches/terminology/admin/startup.pl.default
===================================================================
--- mb_server/branches/terminology/admin/startup.pl.default 2008-03-09 20:49:10 UTC (rev 9744)
+++ mb_server/branches/terminology/admin/startup.pl.default 2008-03-09 20:57:07 UTC (rev 9745)
@@ -101,7 +101,7 @@
require TableBase;
require TaggerSupport;
require MusicBrainz::Server::Track;
-require TRM;
+require MusicBrainz::Server::TRM;
require MusicBrainz::Server::PUID;
require UserPreference;
require UserStuff;
Modified: mb_server/branches/terminology/cgi-bin/Insert.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Insert.pm 2008-03-09 20:49:10 UTC (rev 9744)
+++ mb_server/branches/terminology/cgi-bin/Insert.pm 2008-03-09 20:57:07 UTC (rev 9745)
@@ -214,8 +214,8 @@
my $al = MusicBrainz::Server::Release->new($this->{DBH});
require MusicBrainz::Server::Track;
my $tr = MusicBrainz::Server::Track->new($this->{DBH});
- require TRM;
- my $trm = TRM->new($this->{DBH});
+ require MusicBrainz::Server::TRM;
+ my $trm = MusicBrainz::Server::TRM->new($this->{DBH});
require MusicBrainz::Server::PUID;
my $puid = MusicBrainz::Server::PUID->new($this->{DBH});
require MusicBrainz::Server::ReleaseEvent;
Modified: mb_server/branches/terminology/cgi-bin/MM.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MM.pm 2008-03-09 20:49:10 UTC (rev 9744)
+++ mb_server/branches/terminology/cgi-bin/MM.pm 2008-03-09 20:57:07 UTC (rev 9745)
@@ -438,8 +438,8 @@
if ($type eq "trmid")
{
- require TRM;
- $obj = TRM->new($this->{DBH});
+ require MusicBrainz::Server::TRM;
+ $obj = MusicBrainz::Server::TRM->new($this->{DBH});
$obj->SetTRM($id);
# Most of the code around here assumes that "GetId" or "GetMBId"
# return something sensible, so here we pretend that the TRM is
Modified: mb_server/branches/terminology/cgi-bin/MM_2_0.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MM_2_0.pm 2008-03-09 20:49:10 UTC (rev 9744)
+++ mb_server/branches/terminology/cgi-bin/MM_2_0.pm 2008-03-09 20:57:07 UTC (rev 9745)
@@ -168,8 +168,8 @@
}
$track = $ref->{obj};
- require TRM;
- $gu = TRM->new($this->{DBH});
+ require MusicBrainz::Server::TRM;
+ $gu = MusicBrainz::Server::TRM->new($this->{DBH});
@TRM = $gu->GetTRMFromTrackId($track->GetId());
$artist = $this->GetFromCache('artist', $track->GetArtist());
Modified: mb_server/branches/terminology/cgi-bin/MM_2_1.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MM_2_1.pm 2008-03-09 20:49:10 UTC (rev 9744)
+++ mb_server/branches/terminology/cgi-bin/MM_2_1.pm 2008-03-09 20:57:07 UTC (rev 9745)
@@ -297,8 +297,8 @@
$out .= $this->OutputRelationships($ref->{_relationships})
if (exists $ref->{_relationships});
- require TRM;
- $gu = TRM->new($this->{DBH});
+ require MusicBrainz::Server::TRM;
+ $gu = MusicBrainz::Server::TRM->new($this->{DBH});
if ($track->GetId())
{
@TRM = $gu->GetTRMFromTrackId($track->GetId());
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/DeferredUpdate.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/DeferredUpdate.pm 2008-03-09 20:49:10 UTC (rev 9744)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/DeferredUpdate.pm 2008-03-09 20:57:07 UTC (rev 9745)
@@ -217,8 +217,8 @@
$n = keys %trm;
$i = 0;
$t0 = [ gettimeofday ];
- require TRM;
- my $trmobj = TRM->new($dbh);
+ require MusicBrainz::Server::TRM;
+ my $trmobj = MusicBrainz::Server::TRM->new($dbh);
while (my ($trm, $usecount) = each %trm)
{
@@ -248,7 +248,7 @@
$n = keys %trmusage;
$i = 0;
$t0 = [ gettimeofday ];
- $trmobj = TRM->new($dbh);
+ $trmobj = MusicBrainz::Server::TRM->new($dbh);
while (my ($args, $usecount) = each %trmusage)
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_TRMS.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_TRMS.pm 2008-03-09 20:49:10 UTC (rev 9744)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_TRMS.pm 2008-03-09 20:57:07 UTC (rev 9745)
@@ -86,13 +86,13 @@
{
my $self = shift;
- require TRM;
- my $TRM = TRM->new($self->{DBH});
+ require MusicBrainz::Server::TRM;
+ my $TRM = MusicBrainz::Server::TRM->new($self->{DBH});
my $clientVersion = $self->{'new_unpacked'}{'ClientVersion'};
for (@{ $self->{'new_list'} })
{
- $TRM->Insert(
+ $MusicBrainz::Server::TRM->Insert(
$_->{'trmid'},
$_->{'trackid'},
$clientVersion,
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_TRMID.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_TRMID.pm 2008-03-09 20:49:10 UTC (rev 9744)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_TRMID.pm 2008-03-09 20:57:07 UTC (rev 9745)
@@ -48,8 +48,8 @@
$self->SetPrev($trm);
# Save the TRM's clientversion in case we need to re-add it
- require TRM;
- my $trmobj = TRM->new($self->{DBH});
+ require MusicBrainz::Server::TRM;
+ my $trmobj = MusicBrainz::Server::TRM->new($self->{DBH});
my $clientversion = $trmobj->FindTRMClientVersion($trm);
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 TRM;
- my $t = TRM->new($self->{DBH});
+ require MusicBrainz::Server::TRM;
+ my $t = MusicBrainz::Server::TRM->new($self->{DBH});
$t->RemoveTRMByTRMJoin($self->GetRowId);
}
@@ -132,8 +132,8 @@
return;
}
- require TRM;
- my $t = TRM->new($self->{DBH});
+ require MusicBrainz::Server::TRM;
+ my $t = MusicBrainz::Server::TRM->new($self->{DBH});
my $id = $t->Insert($self->GetPrev, $trackid, $new->{'ClientVersion'});
# The above Insert can fail, usually if the row in the "trm" 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 20:49:10 UTC (rev 9744)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm 2008-03-09 20:57:07 UTC (rev 9745)
@@ -1024,8 +1024,8 @@
my $old = $tr->GetId;
my $new = $merged{$tr->GetSequence()}->GetId;
- require TRM;
- my $trm = TRM->new($this->{DBH});
+ require MusicBrainz::Server::TRM;
+ my $trm = MusicBrainz::Server::TRM->new($this->{DBH});
$trm->MergeTracks($old, $new);
require MusicBrainz::Server::PUID;
Copied: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/TRM.pm (from rev 9732, mb_server/branches/terminology/cgi-bin/TRM.pm)
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Track.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Track.pm 2008-03-09 20:49:10 UTC (rev 9744)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Track.pm 2008-03-09 20:57:07 UTC (rev 9745)
@@ -269,8 +269,8 @@
return ();
}
- require TRM;
- my $trm = TRM->new($this->{DBH});
+ require MusicBrainz::Server::TRM;
+ my $trm = MusicBrainz::Server::TRM->new($this->{DBH});
@TRM = $trm->GetTRMFromTrackId($id);
if (scalar(@TRM) == 0)
{
@@ -506,8 +506,8 @@
return undef
}
- require TRM;
- my $trm = TRM->new($this->{DBH});
+ require MusicBrainz::Server::TRM;
+ my $trm = MusicBrainz::Server::TRM->new($this->{DBH});
$trm->RemoveByTrackId($this->GetId());
require MusicBrainz::Server::PUID;
Modified: mb_server/branches/terminology/cgi-bin/QuerySupport.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/QuerySupport.pm 2008-03-09 20:49:10 UTC (rev 9744)
+++ mb_server/branches/terminology/cgi-bin/QuerySupport.pm 2008-03-09 20:57:07 UTC (rev 9745)
@@ -306,8 +306,8 @@
#PrintData("Lookup:", $id);
- require TRM;
- $gu = TRM->new($dbh);
+ require MusicBrainz::Server::TRM;
+ $gu = MusicBrainz::Server::TRM->new($dbh);
require MusicBrainz::Server::Track;
$tr = MusicBrainz::Server::Track->new($dbh);
@@ -384,8 +384,8 @@
{
require MusicBrainz::Server::Artist;
$ar = MusicBrainz::Server::Artist->new($dbh);
- require TRM;
- $gu = TRM->new($dbh);
+ require MusicBrainz::Server::TRM;
+ $gu = MusicBrainz::Server::TRM->new($dbh);
require MusicBrainz::Server::Track;
$tr = MusicBrainz::Server::Track->new($dbh);
@@ -619,8 +619,8 @@
{
# print STDERR "Unknown MB Track Id: $trackid\n";
} else {
- require TRM;
- my $trmobj = TRM->new($sql->{DBH});
+ require MusicBrainz::Server::TRM;
+ my $trmobj = MusicBrainz::Server::TRM->new($sql->{DBH});
$trmobj->IncrementUsageCount($trmid, $trackobj->GetId);
}
}
@@ -758,8 +758,8 @@
# If this TRM generated any hits, update the lookup count
if ($sql->Rows >= 1)
{
- require TRM;
- TRM->IncrementLookupCount($id);
+ require MusicBrainz::Server::TRM;
+ MusicBrainz::Server::TRM->IncrementLookupCount($id);
}
while(@row = $sql->NextRow())
{
@@ -852,8 +852,8 @@
lprint "trmlookup", "TRM $trmid matches many tracks - results truncated";
}
- require TRM;
- TRM->IncrementLookupCount($trmid);
+ require MusicBrainz::Server::TRM;
+ MusicBrainz::Server::TRM->IncrementLookupCount($trmid);
my %artists;
for my $artistid (map { $_->[3], $_->[8] } @$rows)
@@ -1011,8 +1011,8 @@
if ($sql->Rows == 1)
{
@data = $sql->NextRow();
- require TRM;
- TRM->IncrementLookupCount($id);
+ require MusicBrainz::Server::TRM;
+ MusicBrainz::Server::TRM->IncrementLookupCount($id);
}
else
{
Deleted: mb_server/branches/terminology/cgi-bin/TRM.pm
Modified: mb_server/branches/terminology/htdocs/show/track/index.html
===================================================================
--- mb_server/branches/terminology/htdocs/show/track/index.html 2008-03-09 20:49:10 UTC (rev 9744)
+++ mb_server/branches/terminology/htdocs/show/track/index.html 2008-03-09 20:57:07 UTC (rev 9745)
@@ -92,7 +92,7 @@
);
}
- my @TRM = TRM->new($mb->{DBH})->GetTRMFromTrackId($track->GetId);
+ my @TRM = MusicBrainz::Server::TRM->new($mb->{DBH})->GetTRMFromTrackId($track->GetId);
my @PUID = MusicBrainz::Server::PUID->new($mb->{DBH})->GetPUIDFromTrackId($track->GetId);
Modified: mb_server/branches/terminology/htdocs/show/trm/index.html
===================================================================
--- mb_server/branches/terminology/htdocs/show/trm/index.html 2008-03-09 20:49:10 UTC (rev 9744)
+++ mb_server/branches/terminology/htdocs/show/trm/index.html 2008-03-09 20:57:07 UTC (rev 9745)
@@ -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 $gu = TRM->new($mb->{DBH});
+ my $gu = MusicBrainz::Server::TRM->new($mb->{DBH});
my $ids;
unless (MusicBrainz::Server::Validation::IsGUID($trm))
More information about the MusicBrainz-commits
mailing list