[mb-commits] r9756 - in mb_server/branches/terminology: admin admin/reports cgi-bin cgi-bin/MusicBrainz/Server cgi-bin/MusicBrainz/Server/Handlers/WS/1 htdocs htdocs/comp/browse htdocs/comp/release_editor htdocs/edit/album htdocs/show/artist htdocs/show/label
root at musicbrainz.org
root at musicbrainz.org
Mon Mar 10 17:34:39 UTC 2008
Author: luks
Date: 2008-03-10 17:34:38 +0000 (Mon, 10 Mar 2008)
New Revision: 9756
Modified:
mb_server/branches/terminology/admin/RDFDump.pl
mb_server/branches/terminology/admin/reports/DuplicateTrackNumbers
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/Handlers/WS/1/Common.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm
mb_server/branches/terminology/cgi-bin/QuerySupport.pm
mb_server/branches/terminology/cgi-bin/TaggerSupport.pm
mb_server/branches/terminology/htdocs/browsevarious.html
mb_server/branches/terminology/htdocs/comp/browse/filtersbox
mb_server/branches/terminology/htdocs/comp/release_editor/check-attributes
mb_server/branches/terminology/htdocs/comp/release_editor/form-attributes
mb_server/branches/terminology/htdocs/edit/album/attrform
mb_server/branches/terminology/htdocs/show/artist/index.html
mb_server/branches/terminology/htdocs/show/label/index.html
Log:
s/ALBUM_ATTR/RELEASE_ATTR/
Modified: mb_server/branches/terminology/admin/RDFDump.pl
===================================================================
--- mb_server/branches/terminology/admin/RDFDump.pl 2008-03-10 17:23:33 UTC (rev 9755)
+++ mb_server/branches/terminology/admin/RDFDump.pl 2008-03-10 17:34:38 UTC (rev 9756)
@@ -230,15 +230,15 @@
shift @attrs;
foreach $attr (@attrs)
{
- if ($attr >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_START &&
- $attr <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END)
+ if ($attr >= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_START &&
+ $attr <= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_END)
{
$out .= $rdf->Element("rdf:type", "", "rdf:resource",
$rdf->GetMMNamespace() . "Type" .
$album->GetAttributeName($attr));
}
- elsif ($attr >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_START &&
- $attr <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END)
+ elsif ($attr >= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_START &&
+ $attr <= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_END)
{
$out .= $rdf->Element("mm:release", "", "rdf:resource",
$rdf->GetMMNamespace() . "Status" .
Modified: mb_server/branches/terminology/admin/reports/DuplicateTrackNumbers
===================================================================
--- mb_server/branches/terminology/admin/reports/DuplicateTrackNumbers 2008-03-10 17:23:33 UTC (rev 9755)
+++ mb_server/branches/terminology/admin/reports/DuplicateTrackNumbers 2008-03-10 17:34:38 UTC (rev 9756)
@@ -84,7 +84,7 @@
ORDER BY
ar.sortname, al.name
EOF
- [ &MusicBrainz::Server::Release::ALBUM_ATTR_NONALBUMTRACKS ],
+ [ &MusicBrainz::Server::Release::RELEASE_ATTR_NONALBUMTRACKS ],
);
}
Modified: mb_server/branches/terminology/cgi-bin/MM_2_0.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MM_2_0.pm 2008-03-10 17:23:33 UTC (rev 9755)
+++ mb_server/branches/terminology/cgi-bin/MM_2_0.pm 2008-03-10 17:34:38 UTC (rev 9756)
@@ -125,13 +125,13 @@
my @attrs = $album->GetAttributes();
foreach $attr (@attrs)
{
- if ($attr >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_START &&
- $attr <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END)
+ if ($attr >= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_START &&
+ $attr <= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_END)
{
$out .= $this->Element("rdf:type", "", "rdf:resource", $this->GetMMNamespace() . $album->GetAttributeName($attr));
}
- elsif ($attr >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_START &&
- $attr <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END)
+ elsif ($attr >= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_START &&
+ $attr <= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_END)
{
$out .= $this->Element("mm:release", "", "rdf:resource", $this->GetMMNamespace() . $album->GetAttributeName($attr));
}
Modified: mb_server/branches/terminology/cgi-bin/MM_2_1.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MM_2_1.pm 2008-03-10 17:23:33 UTC (rev 9755)
+++ mb_server/branches/terminology/cgi-bin/MM_2_1.pm 2008-03-10 17:34:38 UTC (rev 9756)
@@ -170,14 +170,14 @@
my @attrs = $album->GetAttributes();
foreach $attr (@attrs)
{
- if ($attr >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_START &&
- $attr <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END)
+ if ($attr >= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_START &&
+ $attr <= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_END)
{
$out .= $this->Element("mm:releaseType", "", "rdf:resource", $this->GetMMNamespace() .
"Type" . $album->GetAttributeName($attr));
}
- elsif ($attr >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_START &&
- $attr <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END)
+ elsif ($attr >= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_START &&
+ $attr <= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_END)
{
$out .= $this->Element("mm:releaseStatus", "", "rdf:resource", $this->GetMMNamespace() .
"Status" . $album->GetAttributeName($attr));
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-10 17:23:33 UTC (rev 9755)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Handlers/WS/1/Common.pm 2008-03-10 17:34:38 UTC (rev 9756)
@@ -113,34 +113,34 @@
my %typeShortcuts =
(
- 'NonAlbumTrack' => MusicBrainz::Server::Release::ALBUM_ATTR_NONALBUMTRACKS,
- 'Album' => MusicBrainz::Server::Release::ALBUM_ATTR_ALBUM,
- 'Single' => MusicBrainz::Server::Release::ALBUM_ATTR_SINGLE,
- 'EP' => MusicBrainz::Server::Release::ALBUM_ATTR_EP,
- 'Compilation' => MusicBrainz::Server::Release::ALBUM_ATTR_COMPILATION,
- 'Soundtrack' => MusicBrainz::Server::Release::ALBUM_ATTR_SOUNDTRACK,
- 'Spokenword' => MusicBrainz::Server::Release::ALBUM_ATTR_SPOKENWORD,
- 'Interview' => MusicBrainz::Server::Release::ALBUM_ATTR_INTERVIEW,
- 'Audiobook' => MusicBrainz::Server::Release::ALBUM_ATTR_AUDIOBOOK,
- 'Live' => MusicBrainz::Server::Release::ALBUM_ATTR_LIVE,
- 'Remix' => MusicBrainz::Server::Release::ALBUM_ATTR_REMIX,
- 'Other' => MusicBrainz::Server::Release::ALBUM_ATTR_OTHER
+ 'NonAlbumTrack' => MusicBrainz::Server::Release::RELEASE_ATTR_NONALBUMTRACKS,
+ 'Album' => MusicBrainz::Server::Release::RELEASE_ATTR_ALBUM,
+ 'Single' => MusicBrainz::Server::Release::RELEASE_ATTR_SINGLE,
+ 'EP' => MusicBrainz::Server::Release::RELEASE_ATTR_EP,
+ 'Compilation' => MusicBrainz::Server::Release::RELEASE_ATTR_COMPILATION,
+ 'Soundtrack' => MusicBrainz::Server::Release::RELEASE_ATTR_SOUNDTRACK,
+ 'Spokenword' => MusicBrainz::Server::Release::RELEASE_ATTR_SPOKENWORD,
+ 'Interview' => MusicBrainz::Server::Release::RELEASE_ATTR_INTERVIEW,
+ 'Audiobook' => MusicBrainz::Server::Release::RELEASE_ATTR_AUDIOBOOK,
+ 'Live' => MusicBrainz::Server::Release::RELEASE_ATTR_LIVE,
+ 'Remix' => MusicBrainz::Server::Release::RELEASE_ATTR_REMIX,
+ 'Other' => MusicBrainz::Server::Release::RELEASE_ATTR_OTHER
);
my %statusShortcuts =
(
- 'Official' => MusicBrainz::Server::Release::ALBUM_ATTR_OFFICIAL,
- 'Promotion' => MusicBrainz::Server::Release::ALBUM_ATTR_PROMOTION,
- 'Bootleg' => MusicBrainz::Server::Release::ALBUM_ATTR_BOOTLEG,
- 'PseudoRelease' => MusicBrainz::Server::Release::ALBUM_ATTR_PSEUDO_RELEASE,
- 'sa-Official' => MusicBrainz::Server::Release::ALBUM_ATTR_OFFICIAL,
- 'sa-Promotion' => MusicBrainz::Server::Release::ALBUM_ATTR_PROMOTION,
- 'sa-Bootleg' => MusicBrainz::Server::Release::ALBUM_ATTR_BOOTLEG,
- 'sa-PseudoRelease' => MusicBrainz::Server::Release::ALBUM_ATTR_PSEUDO_RELEASE,
- 'va-Official' => MusicBrainz::Server::Release::ALBUM_ATTR_OFFICIAL,
- 'va-Promotion' => MusicBrainz::Server::Release::ALBUM_ATTR_PROMOTION,
- 'va-Bootleg' => MusicBrainz::Server::Release::ALBUM_ATTR_BOOTLEG,
- 'va-PseudoRelease' => MusicBrainz::Server::Release::ALBUM_ATTR_PSEUDO_RELEASE,
+ 'Official' => MusicBrainz::Server::Release::RELEASE_ATTR_OFFICIAL,
+ 'Promotion' => MusicBrainz::Server::Release::RELEASE_ATTR_PROMOTION,
+ 'Bootleg' => MusicBrainz::Server::Release::RELEASE_ATTR_BOOTLEG,
+ 'PseudoRelease' => MusicBrainz::Server::Release::RELEASE_ATTR_PSEUDO_RELEASE,
+ 'sa-Official' => MusicBrainz::Server::Release::RELEASE_ATTR_OFFICIAL,
+ 'sa-Promotion' => MusicBrainz::Server::Release::RELEASE_ATTR_PROMOTION,
+ 'sa-Bootleg' => MusicBrainz::Server::Release::RELEASE_ATTR_BOOTLEG,
+ 'sa-PseudoRelease' => MusicBrainz::Server::Release::RELEASE_ATTR_PSEUDO_RELEASE,
+ 'va-Official' => MusicBrainz::Server::Release::RELEASE_ATTR_OFFICIAL,
+ 'va-Promotion' => MusicBrainz::Server::Release::RELEASE_ATTR_PROMOTION,
+ 'va-Bootleg' => MusicBrainz::Server::Release::RELEASE_ATTR_BOOTLEG,
+ 'va-PseudoRelease' => MusicBrainz::Server::Release::RELEASE_ATTR_PSEUDO_RELEASE,
);
my %formatNames =
@@ -956,7 +956,7 @@
}
if (defined $args->{releasestatus} && $args->{releasestatus} =~ /^\d+$/)
{
- $query .= " AND status:" . ($args->{releasestatus} - MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_START + 1) . "^0.0001";
+ $query .= " AND status:" . ($args->{releasestatus} - MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_START + 1) . "^0.0001";
}
if ($args->{count} > 0)
{
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm 2008-03-10 17:23:33 UTC (rev 9755)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Release.pm 2008-03-10 17:34:38 UTC (rev 9756)
@@ -43,29 +43,29 @@
use constant NONALBUMTRACKS_NAME => "[non-album tracks]";
-use constant ALBUM_ATTR_NONALBUMTRACKS => 0;
+use constant RELEASE_ATTR_NONALBUMTRACKS => 0;
-use constant ALBUM_ATTR_ALBUM => 1;
-use constant ALBUM_ATTR_SINGLE => 2;
-use constant ALBUM_ATTR_EP => 3;
-use constant ALBUM_ATTR_COMPILATION => 4;
-use constant ALBUM_ATTR_SOUNDTRACK => 5;
-use constant ALBUM_ATTR_SPOKENWORD => 6;
-use constant ALBUM_ATTR_INTERVIEW => 7;
-use constant ALBUM_ATTR_AUDIOBOOK => 8;
-use constant ALBUM_ATTR_LIVE => 9;
-use constant ALBUM_ATTR_REMIX => 10;
-use constant ALBUM_ATTR_OTHER => 11;
+use constant RELEASE_ATTR_ALBUM => 1;
+use constant RELEASE_ATTR_SINGLE => 2;
+use constant RELEASE_ATTR_EP => 3;
+use constant RELEASE_ATTR_COMPILATION => 4;
+use constant RELEASE_ATTR_SOUNDTRACK => 5;
+use constant RELEASE_ATTR_SPOKENWORD => 6;
+use constant RELEASE_ATTR_INTERVIEW => 7;
+use constant RELEASE_ATTR_AUDIOBOOK => 8;
+use constant RELEASE_ATTR_LIVE => 9;
+use constant RELEASE_ATTR_REMIX => 10;
+use constant RELEASE_ATTR_OTHER => 11;
-use constant ALBUM_ATTR_OFFICIAL => 100;
-use constant ALBUM_ATTR_PROMOTION => 101;
-use constant ALBUM_ATTR_BOOTLEG => 102;
-use constant ALBUM_ATTR_PSEUDO_RELEASE => 103;
+use constant RELEASE_ATTR_OFFICIAL => 100;
+use constant RELEASE_ATTR_PROMOTION => 101;
+use constant RELEASE_ATTR_BOOTLEG => 102;
+use constant RELEASE_ATTR_PSEUDO_RELEASE => 103;
-use constant ALBUM_ATTR_SECTION_TYPE_START => ALBUM_ATTR_ALBUM;
-use constant ALBUM_ATTR_SECTION_TYPE_END => ALBUM_ATTR_OTHER;
-use constant ALBUM_ATTR_SECTION_STATUS_START => ALBUM_ATTR_OFFICIAL;
-use constant ALBUM_ATTR_SECTION_STATUS_END => ALBUM_ATTR_PSEUDO_RELEASE;
+use constant RELEASE_ATTR_SECTION_TYPE_START => ALBUM_ATTR_ALBUM;
+use constant RELEASE_ATTR_SECTION_TYPE_END => ALBUM_ATTR_OTHER;
+use constant RELEASE_ATTR_SECTION_STATUS_START => ALBUM_ATTR_OFFICIAL;
+use constant RELEASE_ATTR_SECTION_STATUS_END => ALBUM_ATTR_PSEUDO_RELEASE;
my %AlbumAttributeNames = (
0 => [ "Non-Album Track", "Non-Album Tracks", "(Special case)"],
@@ -261,9 +261,9 @@
my ($type, $status);
for (@$attrs)
{
- return () if $_ == ALBUM_ATTR_NONALBUMTRACKS;
- $type = $_ if $_ >= ALBUM_ATTR_SECTION_TYPE_START and $_ <= ALBUM_ATTR_SECTION_TYPE_END;
- $status = $_ if $_ >= ALBUM_ATTR_SECTION_STATUS_START and $_ <= ALBUM_ATTR_SECTION_STATUS_END;
+ return () if $_ == RELEASE_ATTR_NONALBUMTRACKS;
+ $type = $_ if $_ >= RELEASE_ATTR_SECTION_TYPE_START and $_ <= ALBUM_ATTR_SECTION_TYPE_END;
+ $status = $_ if $_ >= RELEASE_ATTR_SECTION_STATUS_START and $_ <= ALBUM_ATTR_SECTION_STATUS_END;
}
($type, $status);
}
@@ -287,7 +287,7 @@
sub IsNonAlbumTracks
{
my @attrs = @{$_[0]->{attrs}};
- return (scalar(@attrs) == 2 && $attrs[1] == ALBUM_ATTR_NONALBUMTRACKS);
+ return (scalar(@attrs) == 2 && $attrs[1] == RELEASE_ATTR_NONALBUMTRACKS);
}
sub FindNonAlbum
@@ -298,7 +298,7 @@
my $sql = Sql->new($this->{DBH});
my $ids = $sql->SelectSingleColumnArray(
"SELECT id FROM album WHERE artist = ?
- AND attributes[2] = " . &ALBUM_ATTR_NONALBUMTRACKS,
+ AND attributes[2] = " . &RELEASE_ATTR_NONALBUMTRACKS,
$artist,
);
@@ -388,7 +388,7 @@
# insert one.
$this->SetArtist($artist);
$this->SetName(&NONALBUMTRACKS_NAME);
- $this->SetAttributes(&ALBUM_ATTR_NONALBUMTRACKS);
+ $this->SetAttributes(&RELEASE_ATTR_NONALBUMTRACKS);
my $id = $this->Insert;
$this->LoadFromId
Modified: mb_server/branches/terminology/cgi-bin/QuerySupport.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/QuerySupport.pm 2008-03-10 17:23:33 UTC (rev 9755)
+++ mb_server/branches/terminology/cgi-bin/QuerySupport.pm 2008-03-10 17:34:38 UTC (rev 9756)
@@ -1151,14 +1151,14 @@
foreach my $attr (@attrs)
{
- if ($attr >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_START &&
- $attr <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END)
+ if ($attr >= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_START &&
+ $attr <= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_END)
{
$out .= $rdf->Element("mm:releaseType", "", "rdf:resource", $rdf->GetMMNamespace() .
"Type" . $album->GetAttributeName($attr));
}
- elsif ($attr >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_START &&
- $attr <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END)
+ elsif ($attr >= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_START &&
+ $attr <= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_END)
{
$out .= $rdf->Element("mm:releaseStatus", "", "rdf:resource", $rdf->GetMMNamespace() .
"Status" . $album->GetAttributeName($attr));
Modified: mb_server/branches/terminology/cgi-bin/TaggerSupport.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/TaggerSupport.pm 2008-03-10 17:23:33 UTC (rev 9755)
+++ mb_server/branches/terminology/cgi-bin/TaggerSupport.pm 2008-03-10 17:34:38 UTC (rev 9756)
@@ -510,8 +510,8 @@
my @attrs = $al->GetAttributes();
foreach $attr (@attrs)
{
- if ($attr >= &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_START &&
- $attr <= &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END)
+ if ($attr >= &MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_START &&
+ $attr <= &MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_END)
{
$albumtype = $attr;
last;
@@ -556,8 +556,8 @@
my @attrs = $al->GetAttributes();
foreach $attr (@attrs)
{
- if ($attr >= &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_START &&
- $attr <= &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END)
+ if ($attr >= &MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_START &&
+ $attr <= &MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_END)
{
$albumtype = $attr;
last;
@@ -865,7 +865,7 @@
artist=>$ar->GetName(),
mbid=>$al->GetMBId(),
name=>$al->GetName(),
- albumtype=>MusicBrainz::Server::Release::ALBUM_ATTR_COMPILATION
+ albumtype=>MusicBrainz::Server::Release::RELEASE_ATTR_COMPILATION
})
]);
}
@@ -881,7 +881,7 @@
push @ids, $this->SetSim(ALBUMID, { id=>$row->{'albumid'},
name=>$row->{'albumname'},
mbid=>$row->{'albumgid'},
- albumtype=>MusicBrainz::Server::Release::ALBUM_ATTR_COMPILATION });
+ albumtype=>MusicBrainz::Server::Release::RELEASE_ATTR_COMPILATION });
}
@ids = sort { $b->{sim} <=> $a->{sim} } @ids;
@@ -987,11 +987,11 @@
# If one album is blank, and the other is an album, copy it over to favor it.
$A{album} = $B{album} if ($A{album} eq '' && $B{album} ne '' &&
- $B{albumtype} == &MusicBrainz::Server::Release::ALBUM_ATTR_ALBUM);
+ $B{albumtype} == &MusicBrainz::Server::Release::RELEASE_ATTR_ALBUM);
# Now check the reverse case as well.
$B{album} = $A{album} if ($B{album} eq '' && $A{album} ne '' &&
- $A{albumtype} == &MusicBrainz::Server::Release::ALBUM_ATTR_ALBUM);
+ $A{albumtype} == &MusicBrainz::Server::Release::RELEASE_ATTR_ALBUM);
$index |= 8 if ($A{album} ne '' && $B{album} ne '');
Modified: mb_server/branches/terminology/htdocs/browsevarious.html
===================================================================
--- mb_server/branches/terminology/htdocs/browsevarious.html 2008-03-10 17:23:33 UTC (rev 9755)
+++ mb_server/branches/terminology/htdocs/browsevarious.html 2008-03-10 17:34:38 UTC (rev 9756)
@@ -63,13 +63,13 @@
# handle release type argument
MusicBrainz::Server::Validation::IsNonNegInteger($reltype) or $reltype = 0;
- $reltype >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_START or $reltype = 0;
- $reltype <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END or $reltype = 0;
+ $reltype >= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_START or $reltype = 0;
+ $reltype <= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_END or $reltype = 0;
# handle release status argument
MusicBrainz::Server::Validation::IsNonNegInteger($relstatus) or $relstatus = 0;
- $relstatus >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_START or $relstatus = 0;
- $relstatus <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END or $relstatus = 0;
+ $relstatus >= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_START or $relstatus = 0;
+ $relstatus <= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_END or $relstatus = 0;
# handle artists argument
$artists = ""
Modified: mb_server/branches/terminology/htdocs/comp/browse/filtersbox
===================================================================
--- mb_server/branches/terminology/htdocs/comp/browse/filtersbox 2008-03-10 17:23:33 UTC (rev 9755)
+++ mb_server/branches/terminology/htdocs/comp/browse/filtersbox 2008-03-10 17:34:38 UTC (rev 9756)
@@ -40,7 +40,7 @@
$m->out(qq!<table class="listing">!);
$m->out(qq!<tr><td class="left"><b>Release Type: </b></td><td class="left">!);
- for my $rt (0, MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_START .. MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END)
+ for my $rt (0, MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_START .. MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END)
{
my $name = ($rt ? MusicBrainz::Server::Release->GetAttributeName($rt) : "All");
$m->out(" | ") if $rt;
@@ -51,7 +51,7 @@
$m->out(qq!</td></tr>!);
$m->out(qq!<tr><td class="left"><b>Release Status: </b></td><td class="left">!);
- for my $rt (0, MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_START .. MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END)
+ for my $rt (0, MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_START .. MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END)
{
my $name = ($rt ? MusicBrainz::Server::Release->GetAttributeName($rt) : "All");
$m->out(" | ") if $rt;
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/check-attributes
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/check-attributes 2008-03-10 17:23:33 UTC (rev 9755)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/check-attributes 2008-03-10 17:34:38 UTC (rev 9756)
@@ -52,14 +52,14 @@
}
# guess release attributes from most common factors
- $ARGS{"attr_status_guessed"} = MusicBrainz::Server::Release::ALBUM_ATTR_OFFICIAL;
+ $ARGS{"attr_status_guessed"} = MusicBrainz::Server::Release::RELEASE_ATTR_OFFICIAL;
- $ARGS{"attr_type_guessed"} = MusicBrainz::Server::Release::ALBUM_ATTR_ALBUM;
- $ARGS{"attr_type_guessed"} = MusicBrainz::Server::Release::ALBUM_ATTR_COMPILATION
+ $ARGS{"attr_type_guessed"} = MusicBrainz::Server::Release::RELEASE_ATTR_ALBUM;
+ $ARGS{"attr_type_guessed"} = MusicBrainz::Server::Release::RELEASE_ATTR_COMPILATION
if $hasmultipletrackartists;
- $ARGS{"attr_type_guessed"} = MusicBrainz::Server::Release::ALBUM_ATTR_SINGLE
+ $ARGS{"attr_type_guessed"} = MusicBrainz::Server::Release::RELEASE_ATTR_SINGLE
if ($disclength ? ($disclength < 30*60*1000) : ($tracks <= 5));
- $ARGS{"attr_type_guessed"} = MusicBrainz::Server::Release::ALBUM_ATTR_EP
+ $ARGS{"attr_type_guessed"} = MusicBrainz::Server::Release::RELEASE_ATTR_EP
if $releasename =~ /\bEP\b/i;
}
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/form-attributes
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/form-attributes 2008-03-10 17:23:33 UTC (rev 9755)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/form-attributes 2008-03-10 17:34:38 UTC (rev 9756)
@@ -62,8 +62,8 @@
[ "" , "I don't know" ],
(map {
[ $_, MusicBrainz::Server::Release->GetAttributeName($_) ]
- } &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_START
- .. &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END)
+ } &MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_START
+ .. &MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_END)
]
},
$attr_type
@@ -78,8 +78,8 @@
[ "" , "I don't know" ],
(map {
[ $_, MusicBrainz::Server::Release->GetAttributeName($_) ]
- } &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_START
- .. &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END)
+ } &MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_START
+ .. &MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_END)
]
},
$attr_status
Modified: mb_server/branches/terminology/htdocs/edit/album/attrform
===================================================================
--- mb_server/branches/terminology/htdocs/edit/album/attrform 2008-03-10 17:23:33 UTC (rev 9755)
+++ mb_server/branches/terminology/htdocs/edit/album/attrform 2008-03-10 17:34:38 UTC (rev 9756)
@@ -138,7 +138,7 @@
label => "Release type",
selection => $type_value,
fieldname => $type_fieldname,
- valuelist => [ &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_START .. &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END ],
+ valuelist => [ &MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_START .. &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END ],
attrlist => $attrlist,
pushindex => \@indexes,
&>
@@ -147,7 +147,7 @@
label => "Release status",
selection => $status_value,
fieldname => $status_fieldname,
- valuelist => [ &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_START .. &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END ],
+ valuelist => [ &MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_START .. &MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END ],
attrlist => $attrlist,
pushindex => \@indexes,
&>
Modified: mb_server/branches/terminology/htdocs/show/artist/index.html
===================================================================
--- mb_server/branches/terminology/htdocs/show/artist/index.html 2008-03-10 17:23:33 UTC (rev 9755)
+++ mb_server/branches/terminology/htdocs/show/artist/index.html 2008-03-10 17:34:38 UTC (rev 9756)
@@ -93,11 +93,11 @@
for my $attr ($a->GetAttributes)
{
- $a->{_attr_type} = $attr if ($attr >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_START &&
- $attr <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END);
- $a->{_attr_status} = $attr if ($attr >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_START &&
- $attr <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END);
- $a->{_attr_type} = $attr if ($attr == MusicBrainz::Server::Release::ALBUM_ATTR_NONALBUMTRACKS);
+ $a->{_attr_type} = $attr if ($attr >= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_START &&
+ $attr <= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_END);
+ $a->{_attr_status} = $attr if ($attr >= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_START &&
+ $attr <= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_END);
+ $a->{_attr_type} = $attr if ($attr == MusicBrainz::Server::Release::RELEASE_ATTR_NONALBUMTRACKS);
}
# The "actual values", used for display
@@ -105,8 +105,8 @@
$a->{_actual_attr_status} = $a->{_attr_status};
# Used for sorting
- $a->{_attr_type} = MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END + 1 if (not defined $a->{_attr_type});
- $a->{_attr_status} = MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END + 1 if (not defined $a->{_attr_status});
+ $a->{_attr_type} = MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_END + 1 if (not defined $a->{_attr_type});
+ $a->{_attr_status} = MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_END + 1 if (not defined $a->{_attr_status});
};
# Sort by:
@@ -231,10 +231,10 @@
for my $album (@albums)
{
my ($type, $status) = $album->GetReleaseTypeAndStatus();
- push @shortlist, $album if ($type == &MusicBrainz::Server::Release::ALBUM_ATTR_ALBUM ||
- $type == &MusicBrainz::Server::Release::ALBUM_ATTR_EP ||
- $type == &MusicBrainz::Server::Release::ALBUM_ATTR_COMPILATION ||
- $type == &MusicBrainz::Server::Release::ALBUM_ATTR_SINGLE);
+ push @shortlist, $album if ($type == &MusicBrainz::Server::Release::RELEASE_ATTR_ALBUM ||
+ $type == &MusicBrainz::Server::Release::RELEASE_ATTR_EP ||
+ $type == &MusicBrainz::Server::Release::RELEASE_ATTR_COMPILATION ||
+ $type == &MusicBrainz::Server::Release::RELEASE_ATTR_SINGLE);
}
if (scalar(@shortlist))
{
@@ -298,7 +298,7 @@
$album->SetMultipleTrackArtists($album->GetArtist != $artist->GetId() ? 1 : 0);
$album->{_is_va_} = ($album->GetArtist == &ModDefs::VARTIST_ID or
$album->GetArtist != $artist->GetId());
- $album->{_is_nonalbum_} = ($album->{_attr_type} == MusicBrainz::Server::Release::ALBUM_ATTR_NONALBUMTRACKS);
+ $album->{_is_nonalbum_} = ($album->{_attr_type} == MusicBrainz::Server::Release::RELEASE_ATTR_NONALBUMTRACKS);
$album->{_section_key_} = (
$album->{_is_va_} . " " . $album->{_attr_type}
Modified: mb_server/branches/terminology/htdocs/show/label/index.html
===================================================================
--- mb_server/branches/terminology/htdocs/show/label/index.html 2008-03-10 17:23:33 UTC (rev 9755)
+++ mb_server/branches/terminology/htdocs/show/label/index.html 2008-03-10 17:34:38 UTC (rev 9756)
@@ -79,11 +79,11 @@
for my $attr ($a->GetAttributes)
{
- $a->{_attr_type} = $attr if ($attr >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_START &&
- $attr <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END);
- $a->{_attr_status} = $attr if ($attr >= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_START &&
- $attr <= MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END);
- $a->{_attr_type} = $attr if ($attr == MusicBrainz::Server::Release::ALBUM_ATTR_NONALBUMTRACKS);
+ $a->{_attr_type} = $attr if ($attr >= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_START &&
+ $attr <= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_END);
+ $a->{_attr_status} = $attr if ($attr >= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_START &&
+ $attr <= MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_END);
+ $a->{_attr_type} = $attr if ($attr == MusicBrainz::Server::Release::RELEASE_ATTR_NONALBUMTRACKS);
}
# The "actual values", used for display
@@ -91,8 +91,8 @@
$a->{_actual_attr_status} = $a->{_attr_status};
# Used for sorting
- $a->{_attr_type} = MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_TYPE_END + 1 if (not defined $a->{_attr_type});
- $a->{_attr_status} = MusicBrainz::Server::Release::ALBUM_ATTR_SECTION_STATUS_END + 1 if (not defined $a->{_attr_status});
+ $a->{_attr_type} = MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_TYPE_END + 1 if (not defined $a->{_attr_type});
+ $a->{_attr_status} = MusicBrainz::Server::Release::RELEASE_ATTR_SECTION_STATUS_END + 1 if (not defined $a->{_attr_status});
};
my $SortAlbums;
More information about the MusicBrainz-commits
mailing list