[mb-commits] r9735 - in mb_server/branches/terminology: admin admin/cleanup admin/reports admin/sql/updates cgi-bin cgi-bin/MusicBrainz/Server cgi-bin/MusicBrainz/Server/Handlers/WS/1 cgi-bin/MusicBrainz/Server/Moderation htdocs/comp htdocs/comp/moderation htdocs/comp/release htdocs/comp/release_editor htdocs/edit/track htdocs/freedb htdocs/search htdocs/show/release htdocs/show/track
root at musicbrainz.org
root at musicbrainz.org
Sun Mar 9 13:31:15 UTC 2008
Author: luks
Date: 2008-03-09 13:31:15 +0000 (Sun, 09 Mar 2008)
New Revision: 9735
Added:
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Track.pm
Removed:
mb_server/branches/terminology/cgi-bin/Track.pm
Modified:
mb_server/branches/terminology/admin/RDFDump.pl
mb_server/branches/terminology/admin/cleanup/FixFeaturingArtists
mb_server/branches/terminology/admin/cleanup/FixLength.pl
mb_server/branches/terminology/admin/cleanup/SmartQuotes
mb_server/branches/terminology/admin/cleanup/UnusedTracks
mb_server/branches/terminology/admin/reports/PUIDsWithManyTracks.inc
mb_server/branches/terminology/admin/reports/TRMsWithManyTracks.inc
mb_server/branches/terminology/admin/sql/updates/20040326-1.pl
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_1.pm
mb_server/branches/terminology/cgi-bin/Moderation.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Attribute.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Tag.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Track.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Link.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/LinkEntity.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_KV.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_TRACK_ARTIST.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNAME.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_URL.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_PUID.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_TRACK.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_TRMID.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_SET_RELEASE_DURATIONS.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm
mb_server/branches/terminology/cgi-bin/QuerySupport.pm
mb_server/branches/terminology/htdocs/comp/cdtocinfo
mb_server/branches/terminology/htdocs/comp/loadtrack
mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_TRACK_KV
mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_TRACKTIME
mb_server/branches/terminology/htdocs/comp/moderation/MOD_REMOVE_TRACK
mb_server/branches/terminology/htdocs/comp/release/release_end
mb_server/branches/terminology/htdocs/comp/release/release_track
mb_server/branches/terminology/htdocs/comp/release_editor/check-attributes
mb_server/branches/terminology/htdocs/comp/release_editor/check-fields
mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-add
mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit
mb_server/branches/terminology/htdocs/comp/release_editor/init-addrelease
mb_server/branches/terminology/htdocs/comp/release_editor/init-editall
mb_server/branches/terminology/htdocs/comp/release_editor/review
mb_server/branches/terminology/htdocs/comp/trackinfo
mb_server/branches/terminology/htdocs/edit/track/add.html
mb_server/branches/terminology/htdocs/edit/track/addnonalbum.html
mb_server/branches/terminology/htdocs/edit/track/edit.html
mb_server/branches/terminology/htdocs/freedb/review.html
mb_server/branches/terminology/htdocs/search/oldsearch.html
mb_server/branches/terminology/htdocs/show/release/details.html
mb_server/branches/terminology/htdocs/show/track/index.html
Log:
Move Track to MusicBrainz::Server
Modified: mb_server/branches/terminology/admin/RDFDump.pl
===================================================================
--- mb_server/branches/terminology/admin/RDFDump.pl 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/admin/RDFDump.pl 2008-03-09 13:31:15 UTC (rev 9735)
@@ -33,7 +33,7 @@
use MM_2_1;
use MusicBrainz::Server::Artist;
use MusicBrainz::Server::Release;
-use Track;
+use MusicBrainz::Server::Track;
my $verbose = -t;
Modified: mb_server/branches/terminology/admin/cleanup/FixFeaturingArtists
===================================================================
--- mb_server/branches/terminology/admin/cleanup/FixFeaturingArtists 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/admin/cleanup/FixFeaturingArtists 2008-03-09 13:31:15 UTC (rev 9735)
@@ -39,7 +39,7 @@
use ModDefs;
use UserStuff;
use Moderation;
-use Track;
+use MusicBrainz::Server::Track;
my $mb = MusicBrainz->new;
$mb->Login;
@@ -204,7 +204,7 @@
# Create a Track object. Just as much as necessary to enter the mod.
#
- my $track = Track->new($sql->{DBH});
+ my $track = MusicBrainz::Server::Track->new($sql->{DBH});
$track->SetId($trackid);
$track->SetArtist($artistid);
$track->SetName($oldname);
Modified: mb_server/branches/terminology/admin/cleanup/FixLength.pl
===================================================================
--- mb_server/branches/terminology/admin/cleanup/FixLength.pl 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/admin/cleanup/FixLength.pl 2008-03-09 13:31:15 UTC (rev 9735)
@@ -97,9 +97,9 @@
{
print " " . $t->GetTOC . "\n";
- require Track;
+ require MusicBrainz::Server::Track;
my @l = TrackLengthsFromTOC($t);
- @l = map { Track::FormatTrackLength($_) } @l;
+ @l = map { MusicBrainz::Server::Track::FormatTrackLength($_) } @l;
print " (@l)\n";
}
}
@@ -119,7 +119,7 @@
printf " #%02d : %10d %-8s %12d\n",
$_->{sequence},
$_->{length},
- (($_->{length} > 0) ? Track::FormatTrackLength($_->{length}) : ""),
+ (($_->{length} > 0) ? MusicBrainz::Server::Track::FormatTrackLength($_->{length}) : ""),
$_->{id},
for @$tracks;
}
Modified: mb_server/branches/terminology/admin/cleanup/SmartQuotes
===================================================================
--- mb_server/branches/terminology/admin/cleanup/SmartQuotes 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/admin/cleanup/SmartQuotes 2008-03-09 13:31:15 UTC (rev 9735)
@@ -211,8 +211,8 @@
}
elsif ($table eq "track")
{
- require Track;
- my $tr = Track->new($sqlWrite->{DBH});
+ require MusicBrainz::Server::Track;
+ my $tr = MusicBrainz::Server::Track->new($sqlWrite->{DBH});
$tr->SetId($id);
$tr->SetArtist($artistid);
$tr->SetName(encode "utf-8", $oname);
Modified: mb_server/branches/terminology/admin/cleanup/UnusedTracks
===================================================================
--- mb_server/branches/terminology/admin/cleanup/UnusedTracks 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/admin/cleanup/UnusedTracks 2008-03-09 13:31:15 UTC (rev 9735)
@@ -116,8 +116,8 @@
eval
{
- use Track;
- my $tr = Track->new($sqlWrite->{DBH});
+ use MusicBrainz::Server::Track;
+ my $tr = MusicBrainz::Server::Track->new($sqlWrite->{DBH});
$tr->SetId($id);
$tr->Remove;
$sqlWrite->Commit;
Modified: mb_server/branches/terminology/admin/reports/PUIDsWithManyTracks.inc
===================================================================
--- mb_server/branches/terminology/admin/reports/PUIDsWithManyTracks.inc 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/admin/reports/PUIDsWithManyTracks.inc 2008-03-09 13:31:15 UTC (rev 9735)
@@ -142,7 +142,7 @@
strong => 0
&></td>
<td>
- <% Track::FormatTrackLength($track->{'length'}) %></td>
+ <% MusicBrainz::Server::Track::FormatTrackLength($track->{'length'}) %></td>
</tr>
<%perl>
Modified: mb_server/branches/terminology/admin/reports/TRMsWithManyTracks.inc
===================================================================
--- mb_server/branches/terminology/admin/reports/TRMsWithManyTracks.inc 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/admin/reports/TRMsWithManyTracks.inc 2008-03-09 13:31:15 UTC (rev 9735)
@@ -142,7 +142,7 @@
strong => 0
&></td>
<td>
- <% Track::FormatTrackLength($track->{'length'}) %></td>
+ <% MusicBrainz::Server::Track::FormatTrackLength($track->{'length'}) %></td>
</tr>
<%perl>
Modified: mb_server/branches/terminology/admin/sql/updates/20040326-1.pl
===================================================================
--- mb_server/branches/terminology/admin/sql/updates/20040326-1.pl 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/admin/sql/updates/20040326-1.pl 2008-03-09 13:31:15 UTC (rev 9735)
@@ -182,8 +182,8 @@
eval {
$sql->Begin;
- require Track;
- my $tr = Track->new($mb->{DBH});
+ require MusicBrainz::Server::Track;
+ my $tr = MusicBrainz::Server::Track->new($mb->{DBH});
$tr->SetId($id);
$tr->LoadFromId or die "No track #$id";
Modified: mb_server/branches/terminology/admin/startup.pl.default
===================================================================
--- mb_server/branches/terminology/admin/startup.pl.default 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/admin/startup.pl.default 2008-03-09 13:31:15 UTC (rev 9735)
@@ -100,7 +100,7 @@
require Style;
require TableBase;
require TaggerSupport;
-require Track;
+require MusicBrainz::Server::Track;
require TRM;
require PUID;
require UserPreference;
Modified: mb_server/branches/terminology/cgi-bin/Insert.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Insert.pm 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/cgi-bin/Insert.pm 2008-03-09 13:31:15 UTC (rev 9735)
@@ -212,8 +212,8 @@
my $mar = MusicBrainz::Server::Artist->new($this->{DBH});
require MusicBrainz::Server::Release;
my $al = MusicBrainz::Server::Release->new($this->{DBH});
- require Track;
- my $tr = Track->new($this->{DBH});
+ require MusicBrainz::Server::Track;
+ my $tr = MusicBrainz::Server::Track->new($this->{DBH});
require TRM;
my $trm = TRM->new($this->{DBH});
require PUID;
Modified: mb_server/branches/terminology/cgi-bin/MM.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MM.pm 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/cgi-bin/MM.pm 2008-03-09 13:31:15 UTC (rev 9735)
@@ -138,8 +138,8 @@
$this->{cache} = [];
for my $id (@{$gids})
{
- require Track;
- my $tr = Track->new($this->{DBH});
+ require MusicBrainz::Server::Track;
+ my $tr = MusicBrainz::Server::Track->new($this->{DBH});
$tr->SetMBId($id);
$tr->LoadFromId();
@@ -203,7 +203,7 @@
$ar->LoadFromId;
$this->AddToCache(0, 'artist', $ar);
- require Track;
+ require MusicBrainz::Server::Track;
my @tracks = $al->LoadTracks;
my $is_va = $al->GetArtist == VARTIST_ID || $al->HasMultipleTrackArtists;
@@ -461,8 +461,8 @@
}
elsif ($type eq 'track')
{
- require Track;
- $obj = Track->new($this->{DBH});
+ require MusicBrainz::Server::Track;
+ $obj = MusicBrainz::Server::Track->new($this->{DBH});
}
elsif ($type eq 'trmid')
{
Modified: mb_server/branches/terminology/cgi-bin/MM_2_1.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MM_2_1.pm 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/cgi-bin/MM_2_1.pm 2008-03-09 13:31:15 UTC (rev 9735)
@@ -808,7 +808,7 @@
$out .= $this->OutputAlbumRDF({ obj=> $temp });
} elsif ($type eq 'track')
{
- $temp = Track->new($this->{DBH});
+ $temp = MusicBrainz::Server::Track->new($this->{DBH});
$temp->SetId($id);
die if (!$temp->LoadFromId());
$out .= $this->OutputTrackRDF({ obj=> $temp });
Modified: mb_server/branches/terminology/cgi-bin/Moderation.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Moderation.pm 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/cgi-bin/Moderation.pm 2008-03-09 13:31:15 UTC (rev 9735)
@@ -1723,8 +1723,8 @@
# implementations of the edit types
if ($this->{"checkexists-track"} && defined $this->{"trackid"})
{
- require Track;
- my $track = Track->new($this->{DBH});
+ require MusicBrainz::Server::Track;
+ my $track = MusicBrainz::Server::Track->new($this->{DBH});
$track->SetId($this->{"trackid"});
if ($this->{"exists-track"} = $track->LoadFromId)
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Attribute.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Attribute.pm 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Attribute.pm 2008-03-09 13:31:15 UTC (rev 9735)
@@ -32,7 +32,7 @@
use base qw( TableBase );
require MusicBrainz::Server::Artist;
require MusicBrainz::Server::Release;
-require Track;
+require MusicBrainz::Server::Track;
################################################################################
# Bare Constructor
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 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm 2008-03-09 13:31:15 UTC (rev 9735)
@@ -519,7 +519,7 @@
sub xml_track_list
{
- require Track;
+ require MusicBrainz::Server::Track;
my ($ar, $al, $inc) = @_;
my $tr_inc_mask = INC_TAGS;
@@ -560,7 +560,7 @@
sub xml_track
{
- require Track;
+ require MusicBrainz::Server::Track;
my ($ar, $tr, $inc) = @_;
@@ -752,7 +752,7 @@
}
else
{
- $temp = Track->new($dbh);
+ $temp = MusicBrainz::Server::Track->new($dbh);
MusicBrainz::Server::Validation::IsGUID($id) ? $temp->SetMBId($id) : $temp->SetId($id);
die "Could not load track $id\n" if (!$temp->LoadFromId());
$cache->{$k} = $temp;
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Tag.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Tag.pm 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Tag.pm 2008-03-09 13:31:15 UTC (rev 9735)
@@ -185,7 +185,7 @@
require MusicBrainz::Server::Artist;
require MusicBrainz::Server::Release;
require MusicBrainz::Server::Label;
- require Track;
+ require MusicBrainz::Server::Track;
my $obj;
if ($entity eq 'artist')
@@ -198,7 +198,7 @@
}
elsif ($entity eq 'track')
{
- $obj = Track->new($sql->{DBH});
+ $obj = MusicBrainz::Server::Track->new($sql->{DBH});
}
elsif ($entity eq 'label')
{
@@ -233,7 +233,7 @@
require MusicBrainz::Server::Artist;
require MusicBrainz::Server::Release;
require MusicBrainz::Server::Label;
- require Track;
+ require MusicBrainz::Server::Track;
my $obj;
if ($entity_type eq 'artist')
@@ -246,7 +246,7 @@
}
elsif ($entity_type eq 'track')
{
- $obj = Track->new($maindb->{DBH});
+ $obj = MusicBrainz::Server::Track->new($maindb->{DBH});
}
elsif ($entity_type eq 'label')
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Track.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Track.pm 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Track.pm 2008-03-09 13:31:15 UTC (rev 9735)
@@ -161,9 +161,9 @@
require MusicBrainz;
my $mb = MusicBrainz->new;
$mb->Login;
- require Track;
+ require MusicBrainz::Server::Track;
- $tr = Track->new($mb->{DBH});
+ $tr = MusicBrainz::Server::Track->new($mb->{DBH});
$tr->SetMBId($mbid);
return undef unless $tr->LoadFromId(1);
@@ -294,10 +294,10 @@
my $sql = Sql->new($mb->{DBH});
# Check each track and then then adjust the list to have the row id of the track
- require Track;
+ require MusicBrainz::Server::Track;
foreach my $pair (@$links)
{
- my $tr = Track->new($sql->{DBH});
+ my $tr = MusicBrainz::Server::Track->new($sql->{DBH});
$tr->SetMBId($pair->{trackmbid});
unless ($tr->LoadFromId)
{
@@ -350,7 +350,7 @@
# Thus this is optimized to move as fast as possible. Thus everything has been flattened out.
sub xml_puid
{
- require Track;
+ require MusicBrainz::Server::Track;
my ($puid) = @_;
require MusicBrainz;
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Link.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Link.pm 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Link.pm 2008-03-09 13:31:15 UTC (rev 9735)
@@ -34,7 +34,7 @@
require MusicBrainz::Server::URL;
require MusicBrainz::Server::Artist;
require MusicBrainz::Server::Release;
-require Track;
+require MusicBrainz::Server::Track;
################################################################################
# Bare Constructor
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/LinkEntity.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/LinkEntity.pm 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/LinkEntity.pm 2008-03-09 13:31:15 UTC (rev 9735)
@@ -198,8 +198,8 @@
sub newFromId
{
my ($class, $dbh, $id) = @_;
- require Track;
- my $object = Track->new($dbh);
+ require MusicBrainz::Server::Track;
+ my $object = MusicBrainz::Server::Track->new($dbh);
$object->SetId($id);
$object->LoadFromId or return undef;
$object;
@@ -208,8 +208,8 @@
sub newFromMBId
{
my ($class, $dbh, $id) = @_;
- require Track;
- my $object = Track->new($dbh);
+ require MusicBrainz::Server::Track;
+ my $object = MusicBrainz::Server::Track->new($dbh);
$object->SetMBId($id);
$object->LoadFromId or return undef;
$object;
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_KV.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_KV.pm 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_TRACK_KV.pm 2008-03-09 13:31:15 UTC (rev 9735)
@@ -196,8 +196,8 @@
my $releaseid = $new->{"AlbumId"}
or croak "Missing AlbumId";
- require Track;
- my $track = Track->new($self->{DBH});
+ require MusicBrainz::Server::Track;
+ my $track = MusicBrainz::Server::Track->new($self->{DBH});
$track->SetId($trackid);
$track->SetAlbum($releaseid);
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_TRACK_ARTIST.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_TRACK_ARTIST.pm 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_TRACK_ARTIST.pm 2008-03-09 13:31:15 UTC (rev 9735)
@@ -86,7 +86,7 @@
}
# Check any releases that this track is attached to
- my $tr = Track->new($self->{DBH});
+ my $tr = MusicBrainz::Server::Track->new($self->{DBH});
$tr->SetId($self->{rowid});
my @albums = $tr->GetAlbumInfo();
if (@albums)
@@ -119,9 +119,9 @@
# load track name, and try to guess the artist id for old
# edits which only had the name in 'newvalue'
- require Track;
+ require MusicBrainz::Server::Track;
my $newartist;
- my $track = Track->new($this->{DBH});
+ my $track = MusicBrainz::Server::Track->new($this->{DBH});
$track->SetId($this->{"trackid"});
if ($track->LoadFromId)
{
@@ -186,8 +186,8 @@
my $rowid = $self->GetRowId;
# Load the track by ID
- require Track;
- my $track = Track->new($self->{DBH});
+ require MusicBrainz::Server::Track;
+ my $track = MusicBrainz::Server::Track->new($self->{DBH});
$track->SetId($rowid);
unless ($track->LoadFromId)
{
@@ -242,8 +242,8 @@
$artistid = $ar->Insert(no_alias => 1);
}
- require Track;
- my $track = Track->new($this->{DBH});
+ require MusicBrainz::Server::Track;
+ my $track = MusicBrainz::Server::Track->new($this->{DBH});
$track->SetId($this->GetRowId);
$track->SetArtist($artistid);
$track->UpdateArtist
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNAME.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNAME.pm 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNAME.pm 2008-03-09 13:31:15 UTC (rev 9735)
@@ -77,7 +77,7 @@
my $self = shift;
# Attempt to find the right release this track is attached to.
- my $tr = Track->new($self->{DBH});
+ my $tr = MusicBrainz::Server::Track->new($self->{DBH});
$tr->SetId($self->{trackid});
if ($tr->LoadFromId())
{
@@ -105,8 +105,8 @@
my $self = shift;
# Load the track by ID
- require Track;
- my $track = Track->new($self->{DBH});
+ require MusicBrainz::Server::Track;
+ my $track = MusicBrainz::Server::Track->new($self->{DBH});
$track->SetId($self->GetRowId);
unless ($track->LoadFromId)
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm 2008-03-09 13:31:15 UTC (rev 9735)
@@ -53,8 +53,8 @@
my $self = shift;
# load track and release object
- require Track;
- my $track = Track->new($self->{DBH});
+ require MusicBrainz::Server::Track;
+ my $track = MusicBrainz::Server::Track->new($self->{DBH});
if ($self->{'trackexists'} = $track->LoadFromAlbumJoin($self->GetRowId))
{
@@ -102,8 +102,8 @@
{
my $this = shift;
- require Track;
- my $track = Track->new($this->{DBH});
+ require MusicBrainz::Server::Track;
+ my $track = MusicBrainz::Server::Track->new($this->{DBH});
unless ($track->LoadFromAlbumJoin($this->GetRowId))
{
$this->InsertNote(MODBOT_MODERATOR, "This track has been deleted");
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.pm 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.pm 2008-03-09 13:31:15 UTC (rev 9735)
@@ -69,7 +69,7 @@
my $self = shift;
# Attempt to find the right release this track is attached to.
- my $tr = Track->new($self->{DBH});
+ my $tr = MusicBrainz::Server::Track->new($self->{DBH});
$tr->SetId($self->{trackid});
if ($tr->LoadFromId())
{
@@ -108,8 +108,8 @@
{
my $self = shift;
- require Track;
- my $track = Track->new($self->{DBH});
+ require MusicBrainz::Server::Track;
+ my $track = MusicBrainz::Server::Track->new($self->{DBH});
$track->SetId($self->GetRowId);
unless ($track->LoadFromId)
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_URL.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_URL.pm 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_URL.pm 2008-03-09 13:31:15 UTC (rev 9735)
@@ -78,7 +78,7 @@
);
if (@links)
{
- my $track = Track->new($self->{DBH});
+ my $track = MusicBrainz::Server::Track->new($self->{DBH});
$track->SetId($links[0]->{link0_id});
$artist = $track->GetArtist
if ($track->LoadFromId(0));
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 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_PUID.pm 2008-03-09 13:31:15 UTC (rev 9735)
@@ -82,7 +82,7 @@
my $self = shift;
# Attempt to find the right release this track is attached to.
- my $tr = Track->new($self->{DBH});
+ my $tr = MusicBrainz::Server::Track->new($self->{DBH});
$tr->SetId($self->{"trackid"});
if ($tr->LoadFromId())
{
@@ -120,8 +120,8 @@
my $trackid = $new->{'TrackId'}
or return;
- require Track;
- my $track = Track->new($self->{DBH});
+ require MusicBrainz::Server::Track;
+ my $track = MusicBrainz::Server::Track->new($self->{DBH});
$track->SetId($trackid);
unless ($track->LoadFromId)
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_TRACK.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_TRACK.pm 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_TRACK.pm 2008-03-09 13:31:15 UTC (rev 9735)
@@ -84,8 +84,8 @@
{
my $this = shift;
- require Track;
- my $track = Track->new($this->{DBH});
+ require MusicBrainz::Server::Track;
+ my $track = MusicBrainz::Server::Track->new($this->{DBH});
$track->SetId($this->GetRowId);
$track->SetAlbum($this->{'prev.albumid'});
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 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_TRMID.pm 2008-03-09 13:31:15 UTC (rev 9735)
@@ -82,7 +82,7 @@
my $self = shift;
# Attempt to find the right release this track is attached to.
- my $tr = Track->new($self->{DBH});
+ my $tr = MusicBrainz::Server::Track->new($self->{DBH});
$tr->SetId($self->{"trackid"});
if ($tr->LoadFromId())
{
@@ -120,8 +120,8 @@
my $trackid = $new->{'TrackId'}
or return;
- require Track;
- my $track = Track->new($self->{DBH});
+ require MusicBrainz::Server::Track;
+ my $track = MusicBrainz::Server::Track->new($self->{DBH});
$track->SetId($trackid);
unless ($track->LoadFromId)
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_SET_RELEASE_DURATIONS.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_SET_RELEASE_DURATIONS.pm 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_SET_RELEASE_DURATIONS.pm 2008-03-09 13:31:15 UTC (rev 9735)
@@ -31,7 +31,7 @@
use base 'Moderation';
use MusicBrainz::Server::CDTOC;
use Sql;
-use Track;
+use MusicBrainz::Server::Track;
sub Name { "Set Release Durations" }
(__PACKAGE__)->RegisterHandler;
@@ -61,14 +61,14 @@
my $prevdurs;
foreach (@$tracks)
{
- $prevdurs .= Track::FormatTrackLength($_->{length}) . " ";
+ $prevdurs .= MusicBrainz::Server::Track::FormatTrackLength($_->{length}) . " ";
}
my @dur = TrackLengthsFromTOC($cdtoc);
my $newdurs;
foreach (@dur)
{
- $newdurs .= Track::FormatTrackLength($_) . " ";
+ $newdurs .= MusicBrainz::Server::Track::FormatTrackLength($_) . " ";
}
my %new = (
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm 2008-03-09 13:31:15 UTC (rev 9735)
@@ -482,8 +482,8 @@
if ($sql->Select(qq|select AlbumJoin.track from AlbumJoin
where AlbumJoin.album = $album|))
{
- require Track;
- my $tr = Track->new($this->{DBH});
+ require MusicBrainz::Server::Track;
+ my $tr = MusicBrainz::Server::Track->new($this->{DBH});
while(@row = $sql->NextRow)
{
print STDERR "DELETE: Removed albumjoin " . $row[0] . "\n";
@@ -800,8 +800,8 @@
{
for(;@row = $sql->NextRow();)
{
- require Track;
- $track = Track->new($this->{DBH});
+ require MusicBrainz::Server::Track;
+ $track = MusicBrainz::Server::Track->new($this->{DBH});
$track->SetId($row[0]);
$track->SetName($row[1]);
$track->SetArtist($row[2]);
Copied: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Track.pm (from rev 9732, mb_server/branches/terminology/cgi-bin/Track.pm)
Modified: mb_server/branches/terminology/cgi-bin/QuerySupport.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/QuerySupport.pm 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/cgi-bin/QuerySupport.pm 2008-03-09 13:31:15 UTC (rev 9735)
@@ -308,8 +308,8 @@
require TRM;
$gu = TRM->new($dbh);
- require Track;
- $tr = Track->new($dbh);
+ require MusicBrainz::Server::Track;
+ $tr = MusicBrainz::Server::Track->new($dbh);
# has this data been accepted into the database?
@ids = @{ $gu->GetTrackIdsFromTRM($id) };
@@ -386,8 +386,8 @@
$ar = MusicBrainz::Server::Artist->new($dbh);
require TRM;
$gu = TRM->new($dbh);
- require Track;
- $tr = Track->new($dbh);
+ require MusicBrainz::Server::Track;
+ $tr = MusicBrainz::Server::Track->new($dbh);
# has this data been accepted into the database?
@ids = @{ $gu->GetTrackIdsFromTRM($data[4]) };
@@ -520,8 +520,8 @@
}
#lookup the IDs associated with the $trackGID
- require Track;
- my $trackobj = Track->new($sql->{DBH});
+ require MusicBrainz::Server::Track;
+ my $trackobj = MusicBrainz::Server::Track->new($sql->{DBH});
$trackobj->SetMBId($trackid);
unless ($trackobj->LoadFromId)
{
@@ -612,8 +612,8 @@
}
#lookup the IDs associated with the $trackGID
- require Track;
- my $trackobj = Track->new($sql->{DBH});
+ require MusicBrainz::Server::Track;
+ my $trackobj = MusicBrainz::Server::Track->new($sql->{DBH});
$trackobj->SetMBId($trackid);
unless ($trackobj->LoadFromId)
{
@@ -1261,7 +1261,7 @@
return $rdf->ErrorRDF("No artist GUID given");
}
- my $tr = Track->new($dbh);
+ my $tr = MusicBrainz::Server::Track->new($dbh);
$tr->SetMBId($id);
if (!$tr->LoadFromId())
{
Deleted: mb_server/branches/terminology/cgi-bin/Track.pm
Modified: mb_server/branches/terminology/htdocs/comp/cdtocinfo
===================================================================
--- mb_server/branches/terminology/htdocs/comp/cdtocinfo 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/htdocs/comp/cdtocinfo 2008-03-09 13:31:15 UTC (rev 9735)
@@ -79,7 +79,7 @@
<td class="label">
Total length:</td>
<td>
- <% Track::FormatTrackLength($cdtoc->GetLeadoutOffset / 75 * 1000) %></td>
+ <% MusicBrainz::Server::Track::FormatTrackLength($cdtoc->GetLeadoutOffset / 75 * 1000) %></td>
</tr>
<tr class="top">
<td class="label">
@@ -105,7 +105,7 @@
my $off = $cdtoc->GetTrackOffsets;
my $len = $cdtoc->GetTrackLengths;
- my $fmt = sub { Track::FormatTrackLength($_[0]/75*1000) };
+ my $fmt = sub { MusicBrainz::Server::Track::FormatTrackLength($_[0]/75*1000) };
for my $n ($cdtoc->GetFirstTrack .. $cdtoc->GetLastTrack)
{
my $st = $off->[$n-1];
Modified: mb_server/branches/terminology/htdocs/comp/loadtrack
===================================================================
--- mb_server/branches/terminology/htdocs/comp/loadtrack 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/htdocs/comp/loadtrack 2008-03-09 13:31:15 UTC (rev 9735)
@@ -57,7 +57,7 @@
$trackid = $id if (MusicBrainz::Server::Validation::IsNonNegInteger($id) && $id);
# if the $id parameter is a GUID
- my $track = Track->new($mb->{DBH});
+ my $track = MusicBrainz::Server::Track->new($mb->{DBH});
if ($mbid ne "")
{
$track->SetMBId($mbid);
Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_TRACK_KV
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_TRACK_KV 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_TRACK_KV 2008-03-09 13:31:15 UTC (rev 9735)
@@ -55,7 +55,7 @@
<tr>
<td class="lbl">Length:</td>
- <td><% Track::FormatTrackLength($new->{'TrackLength'}) %></td>
+ <td><% MusicBrainz::Server::Track::FormatTrackLength($new->{'TrackLength'}) %></td>
</tr>
Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_TRACKTIME
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_TRACKTIME 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_TRACKTIME 2008-03-09 13:31:15 UTC (rev 9735)
@@ -37,11 +37,11 @@
<table class="editdiff">
<tr>
<td class="lbl">Old:</td>
- <td class="diff" id="ov::edit<% $this->GetId %>"><% Track::FormatTrackLength($this->GetPrev) %></td>
+ <td class="diff" id="ov::edit<% $this->GetId %>"><% MusicBrainz::Server::Track::FormatTrackLength($this->GetPrev) %></td>
</tr>
<tr>
<td class="lbl">New:</td>
- <td class="diff" id="nv::edit<% $this->GetId %>"><% Track::FormatTrackLength($this->GetNew) %></td>
+ <td class="diff" id="nv::edit<% $this->GetId %>"><% MusicBrainz::Server::Track::FormatTrackLength($this->GetNew) %></td>
</tr>
</table>
Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_REMOVE_TRACK
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_REMOVE_TRACK 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_REMOVE_TRACK 2008-03-09 13:31:15 UTC (rev 9735)
@@ -52,7 +52,7 @@
<tr>
<td class="lbl">Length:</td>
- <td><% Track::FormatTrackLength($this->{'prev.tracklength'}) %></td>
+ <td><% MusicBrainz::Server::Track::FormatTrackLength($this->{'prev.tracklength'}) %></td>
</tr>
% }
Modified: mb_server/branches/terminology/htdocs/comp/release/release_end
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release/release_end 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/htdocs/comp/release/release_end 2008-03-09 13:31:15 UTC (rev 9735)
@@ -57,7 +57,7 @@
foreach my $id (@ids)
{
my $cdtoc = $id->GetCDTOC;
- my $duration = Track::FormatTrackLength($cdtoc->GetLeadoutOffset / 75 * 1000);
+ my $duration = MusicBrainz::Server::Track::FormatTrackLength($cdtoc->GetLeadoutOffset / 75 * 1000);
my $id_numtracks = $cdtoc->GetTrackCount;
my $discid = $cdtoc->GetDiscID;
my $mismatch = (defined $id_numtracks and
Modified: mb_server/branches/terminology/htdocs/comp/release/release_track
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release/release_track 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/htdocs/comp/release/release_track 2008-03-09 13:31:15 UTC (rev 9735)
@@ -153,7 +153,7 @@
}
# 4. length
- my $tracklen = Track::FormatTrackLength($track->GetLength);
+ my $tracklen = MusicBrainz::Server::Track::FormatTrackLength($track->GetLength);
$m->out(sprintf qq!<td class="length%s">!, ($track->GetModPending ? " mp" : ""));
$m->out(length($tracklen)==4 ? " " : "");
$m->out($tracklen);
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/check-attributes
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/check-attributes 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/check-attributes 2008-03-09 13:31:15 UTC (rev 9735)
@@ -47,7 +47,7 @@
my $disclength = 0;
for my $i (0 .. $tracks-1)
{
- my $length = Track::UnformatTrackLength($ARGS{"tracklength$i"});
+ my $length = MusicBrainz::Server::Track::UnformatTrackLength($ARGS{"tracklength$i"});
$disclength += $length if $length > 0;
}
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/check-fields
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/check-fields 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/check-fields 2008-03-09 13:31:15 UTC (rev 9735)
@@ -92,7 +92,7 @@
$seqnumbers{$seq} = 1;
if ($len ne "?:??" and
- Track::UnformatTrackLength($len) < 0)
+ MusicBrainz::Server::Track::UnformatTrackLength($len) < 0)
{
$h{"tracklength$i"} = 1;
push @error, "Invalid time format, use ?:?? for unknown time or
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-add
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-add 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-add 2008-03-09 13:31:15 UTC (rev 9735)
@@ -152,7 +152,7 @@
}
else
{
- my $length = Track::UnformatTrackLength($ARGS{"tracklength$i"});
+ my $length = MusicBrainz::Server::Track::UnformatTrackLength($ARGS{"tracklength$i"});
$length = 0 if $length < 0;
$trackdata .= "TrackDur" . ($realtracks) . "=" . $length . "\n";
}
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit 2008-03-09 13:31:15 UTC (rev 9735)
@@ -334,14 +334,14 @@
my $orig_id = $orig{"trackid$t"};
my $orig_seq = $orig{"trackseq$t"};
my $orig_track = $orig{"track$t"};
- my $orig_length = Track::UnformatTrackLength($orig{"tracklength$t"});
+ my $orig_length = MusicBrainz::Server::Track::UnformatTrackLength($orig{"tracklength$t"});
my $orig_artistid = $orig{sprintf "tr%d_artistid", $t};
# get the new values
my $new_id = $ARGS{"trackid$t"};
my $new_seq = $ARGS{"trackseq$t"};
my $new_track = defined($ARGS{"track$t"}) ? $ARGS{"track$t"} : "";
- my $new_length = Track::UnformatTrackLength($ARGS{"tracklength$t"});
+ my $new_length = MusicBrainz::Server::Track::UnformatTrackLength($ARGS{"tracklength$t"});
my $new_delete = $ARGS{"trackdel$t"};
my $new_artistid = $ARGS{sprintf "tr%d_artistid", $t};
@@ -349,7 +349,7 @@
my $track;
if ($new_id)
{
- $track = Track->new($mb->{DBH});
+ $track = MusicBrainz::Server::Track->new($mb->{DBH});
$track->SetId($new_id);
$track->SetAlbum($releaseid);
$track->LoadFromId
@@ -428,7 +428,7 @@
album => $release,
trackname => $new_track,
tracknum => $new_seq,
- tracklength => Track::UnformatTrackLength($new_length),
+ tracklength => MusicBrainz::Server::Track::UnformatTrackLength($new_length),
artistid => $new_artistid,
);
}
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/init-addrelease
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/init-addrelease 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/init-addrelease 2008-03-09 13:31:15 UTC (rev 9735)
@@ -101,7 +101,7 @@
if ($toc ne "")
{
my $dur = int((($offsets[$i+1] - $offsets[$i])*1000)/75);
- $orig{"tracklength$i"} = Track::FormatTrackLength($dur);
+ $orig{"tracklength$i"} = MusicBrainz::Server::Track::FormatTrackLength($dur);
}
}
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/init-editall
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/init-editall 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/init-editall 2008-03-09 13:31:15 UTC (rev 9735)
@@ -88,12 +88,12 @@
$orig{"trackid$i"} = $tr->GetId;
$orig{"trackseq$i"} = $tr->GetSequence;
$orig{"track$i"} = $tr->GetName;
- $orig{"tracklength$i"} = Track::FormatTrackLength($tr->GetLength);
+ $orig{"tracklength$i"} = MusicBrainz::Server::Track::FormatTrackLength($tr->GetLength);
#$orig{sprintf "tr%d_id", $i} = $tr->GetId;
#$orig{sprintf "tr%d_seq", $i} = $tr->GetSequence;
#$orig{sprintf "tr%d_name", $i} = $tr->GetName;
- #$orig{sprintf "tr%d_length", $i} = Track::FormatTrackLength($tr->GetLength);
+ #$orig{sprintf "tr%d_length", $i} = MusicBrainz::Server::Track::FormatTrackLength($tr->GetLength);
$orig{sprintf "tr%d_mp", $i} = $tr->GetModPending;
# load the artist object for the track
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/review
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/review 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/review 2008-03-09 13:31:15 UTC (rev 9735)
@@ -243,7 +243,7 @@
{
# initialise track object
my $trackid = $ARGS{"trackid$i"};
- my $tr = Track->new($mb->{DBH});
+ my $tr = MusicBrainz::Server::Track->new($mb->{DBH});
$tr->SetId($trackid);
$tr->LoadFromId
or return $m->comp("/comp/error",
@@ -254,7 +254,7 @@
$tr->SetSequence($ARGS{"trackseq$i"});
$tr->SetName($ARGS{"track$i"});
- $tr->SetLength(Track::UnformatTrackLength($ARGS{"tracklength$i"}));
+ $tr->SetLength(MusicBrainz::Server::Track::UnformatTrackLength($ARGS{"tracklength$i"}));
# set track artist, if it is defined, or
# use release artist
@@ -591,14 +591,14 @@
my $orig_id = $orig{"trackid$t"};
my $orig_seq = $orig{"trackseq$t"};
my $orig_track = $orig{"track$t"};
- my $orig_length = Track::UnformatTrackLength($orig{"tracklength$t"});
+ my $orig_length = MusicBrainz::Server::Track::UnformatTrackLength($orig{"tracklength$t"});
my $orig_artistid = $orig{getField($t, "artistid")};
# get new values
my $new_id = $ARGS{"trackid$t"};
my $new_seq = $ARGS{"trackseq$t"};
my $new_track = $ARGS{"track$t"};
- my $new_length = Track::UnformatTrackLength($ARGS{"tracklength$t"});
+ my $new_length = MusicBrainz::Server::Track::UnformatTrackLength($ARGS{"tracklength$t"});
my $new_delete = $ARGS{"trackdel$t"};
my $new_artistid = $ARGS{getField($t, "artistid")};
@@ -738,8 +738,8 @@
new_seq => $new_seq,
new_id => $new_id,
- oldvalue => Track::FormatTrackLength($orig_length),
- newvalue => Track::FormatTrackLength($new_length),
+ oldvalue => MusicBrainz::Server::Track::FormatTrackLength($orig_length),
+ newvalue => MusicBrainz::Server::Track::FormatTrackLength($new_length),
modtype => &ModDefs::MOD_EDIT_TRACKTIME,
cnt => ++$trackchanges
);
Modified: mb_server/branches/terminology/htdocs/comp/trackinfo
===================================================================
--- mb_server/branches/terminology/htdocs/comp/trackinfo 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/htdocs/comp/trackinfo 2008-03-09 13:31:15 UTC (rev 9735)
@@ -75,7 +75,7 @@
<td class="label">
Length:</td>
<td>
- <% Track::FormatTrackLength($track->GetLength) %></td>
+ <% MusicBrainz::Server::Track::FormatTrackLength($track->GetLength) %></td>
</tr>
% }
Modified: mb_server/branches/terminology/htdocs/edit/track/add.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/track/add.html 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/htdocs/edit/track/add.html 2008-03-09 13:31:15 UTC (rev 9735)
@@ -109,7 +109,7 @@
MusicBrainz::Server::Validation::TrimInPlace($trackname);
# check track length
- my $unformatted_tracklength = Track::UnformatTrackLength($tracklength);
+ my $unformatted_tracklength = MusicBrainz::Server::Track::UnformatTrackLength($tracklength);
push @errors, "Please enter a valid track length"
if (not (MusicBrainz::Server::Validation::IsNonNegInteger($unformatted_tracklength) && $unformatted_tracklength >= 0));
Modified: mb_server/branches/terminology/htdocs/edit/track/addnonalbum.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/track/addnonalbum.html 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/htdocs/edit/track/addnonalbum.html 2008-03-09 13:31:15 UTC (rev 9735)
@@ -92,7 +92,7 @@
push @trackname, $currname;
defined(my $currlength= $ARGS{"tracklength$i"}) or last;
- my $lengthasint = Track::UnformatTrackLength($currlength);
+ my $lengthasint = MusicBrainz::Server::Track::UnformatTrackLength($currlength);
push @tracklength, $lengthasint;
}
@@ -247,7 +247,7 @@
class="textfield" size="50" value="<% $trackname[$_-1] %>" /></td>
<td>
<input type="text" name="tracklength<% $_ %>" class="numberfield"
- size="2" value="<% Track::FormatTrackLength($tracklength[$_-1]) %>" /></td>
+ size="2" value="<% MusicBrainz::Server::Track::FormatTrackLength($tracklength[$_-1]) %>" /></td>
<td>
<& /comp/form/jsbutton, id=>"BTN_TRACK::trackname".$_ &></td>
</tr>
Modified: mb_server/branches/terminology/htdocs/edit/track/edit.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/track/edit.html 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/htdocs/edit/track/edit.html 2008-03-09 13:31:15 UTC (rev 9735)
@@ -108,7 +108,7 @@
if (not MusicBrainz::Server::Validation::IsSingleLineString($newtrackname));
# check new track length
- $newlength = Track::UnformatTrackLength($newlength);
+ $newlength = MusicBrainz::Server::Track::UnformatTrackLength($newlength);
push @errors, "The new track length has an invalid format (either ?:?? or a valid length in minutes:seconds is required)"
if (not MusicBrainz::Server::Validation::IsNonNegInteger($newlength));
@@ -169,8 +169,8 @@
# only enter MOD_EDIT_TRACKTIME if the track length
# was modified
- if (Track::FormatTrackLength($newlength) ne
- Track::FormatTrackLength($track->GetLength))
+ if (MusicBrainz::Server::Track::FormatTrackLength($newlength) ne
+ MusicBrainz::Server::Track::FormatTrackLength($track->GetLength))
{
my @mods3 = Moderation->InsertModeration(
DBH => $mb->{DBH},
@@ -247,7 +247,7 @@
<td>
<& /comp/form/currentvalue, track => $track &></td>
<td>
- <div class="oldlength"><% Track::FormatTrackLength($track->GetLength) %></div></td>
+ <div class="oldlength"><% MusicBrainz::Server::Track::FormatTrackLength($track->GetLength) %></div></td>
<td> </td>
</tr>
@@ -279,7 +279,7 @@
<td>
<input type="text" size="4" class="numberfield"
<% $can_add_remove ? "" : 'readonly="readonly"' |n %>
- name="newlength" value="<% $defaultlength || Track::FormatTrackLength($track->GetLength) %>" /></td>
+ name="newlength" value="<% $defaultlength || MusicBrainz::Server::Track::FormatTrackLength($track->GetLength) %>" /></td>
<td>
<& /comp/form/jsbutton, id=>"BTN_TRACK::newtrackname" &></td>
</tr>
Modified: mb_server/branches/terminology/htdocs/freedb/review.html
===================================================================
--- mb_server/branches/terminology/htdocs/freedb/review.html 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/htdocs/freedb/review.html 2008-03-09 13:31:15 UTC (rev 9735)
@@ -61,7 +61,7 @@
my ($i, @t);
for $i (0 .. $args{"tracks"}-1)
{
- my $track = Track->new($mb->{DBH});
+ my $track = MusicBrainz::Server::Track->new($mb->{DBH});
$track->SetId(-1);
$track->SetName($args{"track$i"});
$track->SetSequence(($i+1));
@@ -146,7 +146,7 @@
% {
% $m->comp("/comp/form/hiddenfield",
% "tracklength$i",
-% Track::FormatTrackLength($durations[$i])
+% MusicBrainz::Server::Track::FormatTrackLength($durations[$i])
% ) if ($hasdurations);
% }
@@ -181,7 +181,7 @@
@t = ();
for $i (0 .. $tracks-1)
{
- my $track = Track->new($mb->{DBH});
+ my $track = MusicBrainz::Server::Track->new($mb->{DBH});
$track->SetId(-1);
$track->SetName($args{"track$i"});
$track->SetArtist(0);
@@ -268,7 +268,7 @@
% {
% $m->comp("/comp/form/hiddenfield",
% "tracklength$i",
-% Track::FormatTrackLength($durations[$i])
+% MusicBrainz::Server::Track::FormatTrackLength($durations[$i])
% ) if ($hasdurations);
% }
Modified: mb_server/branches/terminology/htdocs/search/oldsearch.html
===================================================================
--- mb_server/branches/terminology/htdocs/search/oldsearch.html 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/htdocs/search/oldsearch.html 2008-03-09 13:31:15 UTC (rev 9735)
@@ -296,7 +296,7 @@
<% $row->{'trackseq'} %>
</span></td>
<td class="length">
- <% Track::FormatTrackLength($row->{'tracklength'}) %></td>
+ <% MusicBrainz::Server::Track::FormatTrackLength($row->{'tracklength'}) %></td>
% }
Modified: mb_server/branches/terminology/htdocs/show/release/details.html
===================================================================
--- mb_server/branches/terminology/htdocs/show/release/details.html 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/htdocs/show/release/details.html 2008-03-09 13:31:15 UTC (rev 9735)
@@ -130,11 +130,11 @@
# the track length of each track.
if ($show =~ /(times|both)/)
{
- my $len = Track::FormatTrackLength($cdtoc->GetLeadoutOffset/75*1000);
+ my $len = MusicBrainz::Server::Track::FormatTrackLength($cdtoc->GetLeadoutOffset/75*1000);
$m->out(qq!<td style="text-align: center; padding: 0px 4px">$len</td>!);
for (@{ $cdtoc->GetTrackLengths })
{
- $len = Track::FormatTrackLength($_/75*1000);
+ $len = MusicBrainz::Server::Track::FormatTrackLength($_/75*1000);
$m->out(qq!<td style="text-align: center; padding: 0px 4px">$len</td>!);
}
}
Modified: mb_server/branches/terminology/htdocs/show/track/index.html
===================================================================
--- mb_server/branches/terminology/htdocs/show/track/index.html 2008-03-09 13:15:07 UTC (rev 9734)
+++ mb_server/branches/terminology/htdocs/show/track/index.html 2008-03-09 13:31:15 UTC (rev 9735)
@@ -66,7 +66,7 @@
# Instantiate MusicBrainz object, and load release entities
my $mb = $m->comp("/comp/dblogin");
- my $track = Track->new($mb->{DBH});
+ my $track = MusicBrainz::Server::Track->new($mb->{DBH});
if ($trackid) {
$track->SetId($trackid);
$track->LoadFromId
More information about the MusicBrainz-commits
mailing list