[mb-commits] r9742 - in mb_server/branches/terminology: admin admin/cleanup admin/sql/updates cgi-bin cgi-bin/MusicBrainz/Server cgi-bin/MusicBrainz/Server/Handlers/WS/1 cgi-bin/MusicBrainz/Server/Moderation htdocs/comp htdocs/show/artist htdocs/show/label
root at musicbrainz.org
root at musicbrainz.org
Sun Mar 9 16:45:04 UTC 2008
Author: luks
Date: 2008-03-09 16:45:04 +0000 (Sun, 09 Mar 2008)
New Revision: 9742
Added:
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Alias.pm
Removed:
mb_server/branches/terminology/cgi-bin/Alias.pm
Modified:
mb_server/branches/terminology/admin/cleanup/SmartQuotes
mb_server/branches/terminology/admin/sql/updates/20040326-1.pl
mb_server/branches/terminology/admin/startup.pl.default
mb_server/branches/terminology/cgi-bin/FreeDB.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Artist.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/DeferredUpdate.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Artist.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Label.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Label.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ARTISTALIAS.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LABELALIAS.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTALIAS.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_LABELALIAS.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTISTALIAS.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_LABELALIAS.pm
mb_server/branches/terminology/cgi-bin/SearchEngine.pm
mb_server/branches/terminology/htdocs/comp/loadartistalias
mb_server/branches/terminology/htdocs/comp/loadlabelalias
mb_server/branches/terminology/htdocs/show/artist/aliases.html
mb_server/branches/terminology/htdocs/show/label/aliases.html
Log:
Move Alias to MusicBrainz::Server
Modified: mb_server/branches/terminology/admin/cleanup/SmartQuotes
===================================================================
--- mb_server/branches/terminology/admin/cleanup/SmartQuotes 2008-03-09 14:09:34 UTC (rev 9741)
+++ mb_server/branches/terminology/admin/cleanup/SmartQuotes 2008-03-09 16:45:04 UTC (rev 9742)
@@ -193,8 +193,8 @@
}
elsif ($table eq "artistalias")
{
- require Alias;
- my $al = Alias->new($sqlWrite->{DBH}, 'artistalias');
+ require MusicBrainz::Server::Alias;
+ my $al = MusicBrainz::Server::Alias->new($sqlWrite->{DBH}, 'artistalias');
$al->SetId($id);
$al->SetRowId($artistid);
$al->SetName(encode "utf-8", $oname);
Modified: mb_server/branches/terminology/admin/sql/updates/20040326-1.pl
===================================================================
--- mb_server/branches/terminology/admin/sql/updates/20040326-1.pl 2008-03-09 14:09:34 UTC (rev 9741)
+++ mb_server/branches/terminology/admin/sql/updates/20040326-1.pl 2008-03-09 16:45:04 UTC (rev 9742)
@@ -223,8 +223,8 @@
eval {
$sql->Begin;
- require Alias;
- my $alias = Alias->new($mb->{DBH}, "artistalias");
+ require MusicBrainz::Server::Alias;
+ my $alias = MusicBrainz::Server::Alias->new($mb->{DBH}, "artistalias");
$alias->SetId($id);
$alias->LoadFromId or die "No artist alias #$id";
Modified: mb_server/branches/terminology/admin/startup.pl.default
===================================================================
--- mb_server/branches/terminology/admin/startup.pl.default 2008-03-09 14:09:34 UTC (rev 9741)
+++ mb_server/branches/terminology/admin/startup.pl.default 2008-03-09 16:45:04 UTC (rev 9742)
@@ -45,7 +45,7 @@
require ModDefs;
require MusicBrainz::Server::Release;
-require Alias;
+require MusicBrainz::Server::Alias;
require MusicBrainz::Server::Artist;
require DebugLog;
require FreeDB;
Deleted: mb_server/branches/terminology/cgi-bin/Alias.pm
Modified: mb_server/branches/terminology/cgi-bin/FreeDB.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/FreeDB.pm 2008-03-09 14:09:34 UTC (rev 9741)
+++ mb_server/branches/terminology/cgi-bin/FreeDB.pm 2008-03-09 16:45:04 UTC (rev 9742)
@@ -366,9 +366,9 @@
$info->{sortname} = $st->MakeDefaultSortname($info->{artist});
- require Alias;
+ require MusicBrainz::Server::Alias;
require MusicBrainz::Server::Artist;
- $alias = Alias->new($this->{DBH});
+ $alias = MusicBrainz::Server::Alias->new($this->{DBH});
$ar = MusicBrainz::Server::Artist->new($this->{DBH});
# Check to see if the artist has an alias.
Copied: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Alias.pm (from rev 9732, mb_server/branches/terminology/cgi-bin/Alias.pm)
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Artist.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Artist.pm 2008-03-09 14:09:34 UTC (rev 9741)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Artist.pm 2008-03-09 16:45:04 UTC (rev 9742)
@@ -226,8 +226,8 @@
unless ($opts{no_alias})
{
# Check to see if the artist has an alias.
- require Alias;
- my $alias = Alias->new($this->{DBH});
+ require MusicBrainz::Server::Alias;
+ my $alias = MusicBrainz::Server::Alias->new($this->{DBH});
$alias->{table} = "ArtistAlias";
$artist = $alias->Resolve($name);
return $artist if (defined $artist);
@@ -393,8 +393,8 @@
# Insert the old name as an alias for the new one
# TODO this is often a bad idea - remove this code?
- require Alias;
- my $al = Alias->new($old->{DBH});
+ require MusicBrainz::Server::Alias;
+ my $al = MusicBrainz::Server::Alias->new($old->{DBH});
$al->SetTable("ArtistAlias");
$al->Insert($n, $old->GetName);
@@ -562,8 +562,8 @@
{
my ($this) = @_;
- require Alias;
- my $al = Alias->new($this->{DBH});
+ require MusicBrainz::Server::Alias;
+ my $al = MusicBrainz::Server::Alias->new($this->{DBH});
$al->SetTable("ArtistAlias");
my @aliases = $al->GetList($this->GetId);
@aliases = map { $_->[1] } @aliases;
@@ -708,8 +708,8 @@
and return $artists;
# If that failed too, then try the artist aliases
- require Alias;
- my $alias = Alias->new($this->{DBH}, "artistalias");
+ require MusicBrainz::Server::Alias;
+ my $alias = MusicBrainz::Server::Alias->new($this->{DBH}, "artistalias");
if (my $artist = $alias->Resolve($artistname))
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/DeferredUpdate.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/DeferredUpdate.pm 2008-03-09 14:09:34 UTC (rev 9741)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/DeferredUpdate.pm 2008-03-09 16:45:04 UTC (rev 9742)
@@ -270,8 +270,8 @@
$i = 0;
$t0 = [ gettimeofday ];
- require Alias;
- my $aliasobj = Alias->new($dbh, "artistalias");
+ require MusicBrainz::Server::Alias;
+ my $aliasobj = MusicBrainz::Server::Alias->new($dbh, "artistalias");
while (my ($aliasid, $t) = each %artistalias)
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Artist.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Artist.pm 2008-03-09 14:09:34 UTC (rev 9741)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Artist.pm 2008-03-09 16:45:04 UTC (rev 9742)
@@ -127,8 +127,8 @@
if ($inc & INC_ALIASES)
{
- require Alias;
- my $alias = Alias->new($mb->{DBH}, "ArtistAlias");
+ require MusicBrainz::Server::Alias;
+ my $alias = MusicBrainz::Server::Alias->new($mb->{DBH}, "ArtistAlias");
my @list = $alias->GetList($ar->GetId);
$info->{aliases} = \@list;
}
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Label.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Label.pm 2008-03-09 14:09:34 UTC (rev 9741)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Label.pm 2008-03-09 16:45:04 UTC (rev 9742)
@@ -124,8 +124,8 @@
return undef unless $ar->LoadFromId(1);
if ($inc & INC_ALIASES) {
- require Alias;
- my $alias = Alias->new($mb->{DBH}, "LabelAlias");
+ require MusicBrainz::Server::Alias;
+ my $alias = MusicBrainz::Server::Alias->new($mb->{DBH}, "LabelAlias");
my @list = $alias->GetList($ar->GetId);
$info->{aliases} = \@list;
}
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Label.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Label.pm 2008-03-09 14:09:34 UTC (rev 9741)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Label.pm 2008-03-09 16:45:04 UTC (rev 9742)
@@ -347,8 +347,8 @@
$old->SetGlobalIdRedirect($old->GetId, $old->GetMBId, $new->GetId, &TableBase::TABLE_LABEL);
# Insert the old name as an alias for the new one
- require Alias;
- my $al = Alias->new($old->{DBH});
+ require MusicBrainz::Server::Alias;
+ my $al = MusicBrainz::Server::Alias->new($old->{DBH});
$al->SetTable("labelalias");
$al->Insert($n, $old->GetName);
@@ -440,8 +440,8 @@
{
my ($this) = @_;
- require Alias;
- my $al = Alias->new($this->{DBH});
+ require MusicBrainz::Server::Alias;
+ my $al = MusicBrainz::Server::Alias->new($this->{DBH});
$al->SetTable("LabelAlias");
my @aliases = $al->GetList($this->GetId);
@aliases = map { $_->[1] } @aliases;
@@ -584,8 +584,8 @@
and return $labels;
# If that failed too, then try the artist aliases
- require Alias;
- my $alias = Alias->new($this->{DBH}, "labelalias");
+ require MusicBrainz::Server::Alias;
+ my $alias = MusicBrainz::Server::Alias->new($this->{DBH}, "labelalias");
if (my $label = $alias->Resolve($labelname))
{
$labels = $sql->SelectListOfHashes(
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ARTISTALIAS.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ARTISTALIAS.pm 2008-03-09 14:09:34 UTC (rev 9741)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ARTISTALIAS.pm 2008-03-09 16:45:04 UTC (rev 9742)
@@ -42,8 +42,8 @@
defined $newalias or die;
# Check that the alias $self->GetNew does not exist
- require Alias;
- my $al = Alias->new($self->{DBH});
+ require MusicBrainz::Server::Alias;
+ my $al = MusicBrainz::Server::Alias->new($self->{DBH});
$al->SetTable("ArtistAlias");
if (my $other = $al->newFromName($newalias))
@@ -98,8 +98,8 @@
}
# Check that the alias $self->GetNew does not exist
- require Alias;
- my $al = Alias->new($self->{DBH});
+ require MusicBrainz::Server::Alias;
+ my $al = MusicBrainz::Server::Alias->new($self->{DBH});
$al->SetTable("ArtistAlias");
if (my $other = $al->newFromName($self->GetNew))
@@ -125,8 +125,8 @@
my $status = $self->CheckPrerequisites;
return $status if $status;
- require Alias;
- my $al = Alias->new($self->{DBH});
+ require MusicBrainz::Server::Alias;
+ my $al = MusicBrainz::Server::Alias->new($self->{DBH});
$al->SetTable("ArtistAlias");
my $other;
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LABELALIAS.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LABELALIAS.pm 2008-03-09 14:09:34 UTC (rev 9741)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_LABELALIAS.pm 2008-03-09 16:45:04 UTC (rev 9742)
@@ -81,8 +81,8 @@
my $status = $self->CheckPrerequisites;
return $status if $status;
- require Alias;
- my $al = Alias->new($self->{DBH});
+ require MusicBrainz::Server::Alias;
+ my $al = MusicBrainz::Server::Alias->new($self->{DBH});
$al->SetTable("LabelAlias");
my $other;
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTALIAS.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTALIAS.pm 2008-03-09 14:09:34 UTC (rev 9741)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ARTISTALIAS.pm 2008-03-09 16:45:04 UTC (rev 9742)
@@ -50,8 +50,8 @@
# Currently there's a unique index on artistalias.name.
# Refuse to insert the mod if that index would be violated.
- require Alias;
- my $test = Alias->new($self->{DBH}, 'artistalias');
+ require MusicBrainz::Server::Alias;
+ my $test = MusicBrainz::Server::Alias->new($self->{DBH}, 'artistalias');
if (my $other = $test->newFromName($newname))
{
@@ -90,8 +90,8 @@
{
my $self = shift;
- require Alias;
- my $alias = Alias->new($self->{DBH}, "artistalias");
+ require MusicBrainz::Server::Alias;
+ my $alias = MusicBrainz::Server::Alias->new($self->{DBH}, "artistalias");
$alias->SetId($self->GetRowId);
unless ($alias->LoadFromId)
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_LABELALIAS.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_LABELALIAS.pm 2008-03-09 14:09:34 UTC (rev 9741)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_LABELALIAS.pm 2008-03-09 16:45:04 UTC (rev 9742)
@@ -59,8 +59,8 @@
{
my $self = shift;
- require Alias;
- my $alias = Alias->new($self->{DBH}, "labelalias");
+ require MusicBrainz::Server::Alias;
+ my $alias = MusicBrainz::Server::Alias->new($self->{DBH}, "labelalias");
$alias->SetId($self->GetRowId);
unless ($alias->LoadFromId)
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTISTALIAS.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTISTALIAS.pm 2008-03-09 14:09:34 UTC (rev 9741)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ARTISTALIAS.pm 2008-03-09 16:45:04 UTC (rev 9742)
@@ -64,8 +64,8 @@
{
my $this = shift;
- require Alias;
- my $al = Alias->new($this->{DBH});
+ require MusicBrainz::Server::Alias;
+ my $al = MusicBrainz::Server::Alias->new($this->{DBH});
$al->SetTable("ArtistAlias");
$al->SetId($this->GetRowId);
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_LABELALIAS.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_LABELALIAS.pm 2008-03-09 14:09:34 UTC (rev 9741)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_LABELALIAS.pm 2008-03-09 16:45:04 UTC (rev 9742)
@@ -50,8 +50,8 @@
{
my $this = shift;
- require Alias;
- my $al = Alias->new($this->{DBH});
+ require MusicBrainz::Server::Alias;
+ my $al = MusicBrainz::Server::Alias->new($this->{DBH});
$al->SetTable("labelalias");
$al->SetId($this->GetRowId);
Modified: mb_server/branches/terminology/cgi-bin/SearchEngine.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/SearchEngine.pm 2008-03-09 14:09:34 UTC (rev 9741)
+++ mb_server/branches/terminology/cgi-bin/SearchEngine.pm 2008-03-09 16:45:04 UTC (rev 9742)
@@ -493,8 +493,8 @@
if ($r->{'numartistaliases'})
{
- require Alias;
- my $al = Alias->new($self->{DBH}, "ArtistAlias");
+ require MusicBrainz::Server::Alias;
+ my $al = MusicBrainz::Server::Alias->new($self->{DBH}, "ArtistAlias");
my $aliases = $al->LoadFull($r->{'artistid'});
for my $alias (@$aliases)
@@ -509,8 +509,8 @@
{
if ($r->{'numlabelaliases'})
{
- require Alias;
- my $al = Alias->new($self->{DBH}, "labelalias");
+ require MusicBrainz::Server::Alias;
+ my $al = MusicBrainz::Server::Alias->new($self->{DBH}, "labelalias");
my $aliases = $al->LoadFull($r->{'labelid'});
for my $alias (@$aliases)
Modified: mb_server/branches/terminology/htdocs/comp/loadartistalias
===================================================================
--- mb_server/branches/terminology/htdocs/comp/loadartistalias 2008-03-09 14:09:34 UTC (rev 9741)
+++ mb_server/branches/terminology/htdocs/comp/loadartistalias 2008-03-09 16:45:04 UTC (rev 9742)
@@ -50,7 +50,7 @@
if ($error eq "")
{
# if the $id parameter is a GUID
- my $alias = Alias->new($mb->{DBH}, "artistalias");
+ my $alias = MusicBrainz::Server::Alias->new($mb->{DBH}, "artistalias");
$alias->SetId($id);
if ($alias->LoadFromId(1))
Modified: mb_server/branches/terminology/htdocs/comp/loadlabelalias
===================================================================
--- mb_server/branches/terminology/htdocs/comp/loadlabelalias 2008-03-09 14:09:34 UTC (rev 9741)
+++ mb_server/branches/terminology/htdocs/comp/loadlabelalias 2008-03-09 16:45:04 UTC (rev 9742)
@@ -50,7 +50,7 @@
if ($error eq "")
{
# if the $id parameter is a GUID
- my $alias = Alias->new($mb->{DBH}, "labelalias");
+ my $alias = MusicBrainz::Server::Alias->new($mb->{DBH}, "labelalias");
$alias->SetId($id);
if ($alias->LoadFromId(1))
Modified: mb_server/branches/terminology/htdocs/show/artist/aliases.html
===================================================================
--- mb_server/branches/terminology/htdocs/show/artist/aliases.html 2008-03-09 14:09:34 UTC (rev 9741)
+++ mb_server/branches/terminology/htdocs/show/artist/aliases.html 2008-03-09 16:45:04 UTC (rev 9742)
@@ -49,7 +49,7 @@
$m->comp("/comp/sidebar-notitle", pagetitle => $title);
$m->comp("/comp/artisttitle", artist => $artist);
- my $alias = Alias->new($mb->{DBH}, "ArtistAlias");
+ my $alias = MusicBrainz::Server::Alias->new($mb->{DBH}, "ArtistAlias");
my @list = $alias->GetList($artist->GetId);
# see if one of the releases has a moderation pending flag.
Modified: mb_server/branches/terminology/htdocs/show/label/aliases.html
===================================================================
--- mb_server/branches/terminology/htdocs/show/label/aliases.html 2008-03-09 14:09:34 UTC (rev 9741)
+++ mb_server/branches/terminology/htdocs/show/label/aliases.html 2008-03-09 16:45:04 UTC (rev 9742)
@@ -49,7 +49,7 @@
$m->comp("/comp/sidebar-notitle", pagetitle => $title);
$m->comp("/comp/labeltitle", label => $label);
- my $alias = Alias->new($mb->{DBH}, "LabelAlias");
+ my $alias = MusicBrainz::Server::Alias->new($mb->{DBH}, "LabelAlias");
my @list = $alias->GetList($label->GetId);
# see if one of the releases has a moderation pending flag.
More information about the MusicBrainz-commits
mailing list