[mb-commits] r10290 - in mb_server/branches/TemplateToolkit/lib: . MusicBrainz/Server MusicBrainz/Server/Facade MusicBrainz/Server/Handlers/WS/1 MusicBrainz/Server/Moderation
root at musicbrainz.org
root at musicbrainz.org
Mon Sep 1 23:49:09 UTC 2008
Author: acid2
Date: 2008-09-01 23:49:09 +0000 (Mon, 01 Sep 2008)
New Revision: 10290
Modified:
mb_server/branches/TemplateToolkit/lib/Insert.pm
mb_server/branches/TemplateToolkit/lib/MM_2_1.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Facade/ReleaseEvent.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Handlers/WS/1/Common.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_EVENTS_OLD.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/ReleaseEvent.pm
mb_server/branches/TemplateToolkit/lib/QuerySupport.pm
Log:
[GS]etFormat -> format
[GS]etYMD -> date
GetYear/Month/Day -> year, month, day
(in ReleaseEvent)
Modified: mb_server/branches/TemplateToolkit/lib/Insert.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/Insert.pm 2008-09-01 23:48:15 UTC (rev 10289)
+++ mb_server/branches/TemplateToolkit/lib/Insert.pm 2008-09-01 23:49:09 UTC (rev 10290)
@@ -615,12 +615,12 @@
}
$rel->SetRelease($albumid);
- $rel->SetYMD(@ymd);
+ $rel->date(@ymd);
$rel->country($release->{country});
$rel->SetLabel($release->{label});
$rel->cat_no($release->{catno});
$rel->barcode($release->{barcode});
- $rel->SetFormat($release->{format});
+ $rel->format($release->{format});
$rel->InsertSelf();
$release->{release_insertid} = $rel->GetId();
Modified: mb_server/branches/TemplateToolkit/lib/MM_2_1.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MM_2_1.pm 2008-09-01 23:48:15 UTC (rev 10289)
+++ mb_server/branches/TemplateToolkit/lib/MM_2_1.pm 2008-09-01 23:49:09 UTC (rev 10290)
@@ -192,7 +192,7 @@
{
my $cid = $rel->country;
my $c = $country_obj->newFromId($cid);
- my ($year, $month, $day) = $rel->GetYMD();
+ my ($year, $month, $day) = $rel->date();
$releasedate = $year;
$releasedate .= sprintf "-%02d", $month if ($month != 0);
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Facade/ReleaseEvent.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Facade/ReleaseEvent.pm 2008-09-01 23:48:15 UTC (rev 10289)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Facade/ReleaseEvent.pm 2008-09-01 23:49:09 UTC (rev 10290)
@@ -21,8 +21,8 @@
return $class->new({
catalog_number => $event->cat_no,
country => $event->country,
- date => $event->GetSortDate,
- format => $event->GetFormat ? $event->GetFormatName : "",
+ date => $event->sort_date,
+ format => $event->format ? $event->format_name : "",
barcode => $event->barcode,
label => MusicBrainz::Server::Facade::Label->new({
name => $event->label_name,
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Handlers/WS/1/Common.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Handlers/WS/1/Common.pm 2008-09-01 23:48:15 UTC (rev 10289)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Handlers/WS/1/Common.pm 2008-09-01 23:49:09 UTC (rev 10290)
@@ -451,7 +451,7 @@
{
my $cid = $rel->country;
my $c = $country_obj->newFromId($cid);
- my ($year, $month, $day) = $rel->GetYMD();
+ my ($year, $month, $day) = $rel->date();
my ($releasedate) = $year;
$releasedate .= sprintf "-%02d", $month if ($month != 0);
$releasedate .= sprintf "-%02d", $day if ($day != 0);
@@ -465,7 +465,7 @@
print '"';
printf ' catalog-number="%s"', xml_escape($rel->cat_no) if $rel->cat_no;
printf ' barcode="%s"', xml_escape($rel->barcode) if $rel->barcode;
- printf ' format="%s"', xml_escape($formatNames{$rel->GetFormat}) if $rel->GetFormat;
+ printf ' format="%s"', xml_escape($formatNames{$rel->format}) if $rel->format;
if (($inc & INC_LABELS) && $rel->GetLabel)
{
print '>';
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_EVENTS_OLD.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_EVENTS_OLD.pm 2008-09-01 23:48:15 UTC (rev 10289)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_EVENTS_OLD.pm 2008-09-01 23:49:09 UTC (rev 10290)
@@ -74,13 +74,13 @@
die unless $row->GetRelease == $al->GetId;
$row->InsertSelf;
$new{"add".$i++} = sprintf "d=%s c=%d id=%d l=%d n=%s b=%s f=%d",
- $row->GetSortDate,
+ $row->sort_date,
$row->country,
$row->GetId,
$row->GetLabel,
_EncodeText($row->cat_no),
_EncodeText($row->barcode),
- $row->GetFormat;
+ $row->format;
}
$i = 0;
@@ -90,28 +90,28 @@
die unless $obj->GetRelease == $al->GetId;
my $old = sprintf "d=%s c=%d id=%d l=%d n=%s b=%s f=%d",
- $obj->GetSortDate,
+ $obj->sort_date,
$obj->country,
$obj->GetId,
$obj->GetLabel,
_EncodeText($obj->cat_no),
_EncodeText($obj->barcode),
- $obj->GetFormat;
+ $obj->format;
$obj->country($row->{"country"});
- $obj->SetYMD(@$row{qw( year month day )});
+ $obj->date(@$row{qw( year month day )});
$obj->SetLabel($row->{label});
$obj->cat_no($row->{catno});
$obj->barcode($row->{barcode});
- $obj->SetFormat($row->{format});
+ $obj->format($row->{format});
my $new = sprintf "nd=%s nc=%d nl=%d nn=%s nb=%s nf=%d",
- $obj->GetSortDate,
+ $obj->sort_date,
$obj->country,
$obj->GetLabel,
_EncodeText($obj->cat_no),
_EncodeText($obj->barcode),
- $obj->GetFormat;
+ $obj->format;
$new{"edit".$i++} = "$old $new";
}
@@ -121,13 +121,13 @@
{
die unless $row->GetRelease == $al->GetId;
$new{"remove".$i++} = sprintf "d=%s c=%d id=%d l=%d n=%s b=%s f=%d",
- $row->GetSortDate,
+ $row->sort_date,
$row->country,
$row->GetId,
$row->GetLabel,
_EncodeText($row->cat_no),
_EncodeText($row->barcode),
- $row->GetFormat;
+ $row->format;
}
return $self->SuppressInsert
@@ -308,11 +308,11 @@
}
if ($r->country != $t->{'c'}
- or $r->GetSortDate ne $t->{'d'}
+ or $r->sort_date ne $t->{'d'}
or $r->GetLabel != $t->{'l'}
or $r->cat_no ne $t->{'n'}
or $r->barcode ne $t->{'b'}
- or $r->GetFormat != $t->{'f'})
+ or $r->format != $t->{'f'})
{
push @notes, "$display has already been changed";
next;
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/ReleaseEvent.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/ReleaseEvent.pm 2008-09-01 23:48:15 UTC (rev 10289)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/ReleaseEvent.pm 2008-09-01 23:49:09 UTC (rev 10290)
@@ -163,39 +163,43 @@
sub label_mbid { $_[0]{labelgid} }
-sub GetFormat { $_[0]{format} }
-sub SetFormat { $_[0]{format} = $_[1] }
-sub GetFormatName { $ReleaseFormatNames{$_[0]{format}} }
+sub format
+{
+ my ($self, $new_format) = @_;
-sub GetYMD
-{
- map { 0+$_ } split '-', $_[0]{'releasedate'};
+ if (defined $new_format) { $self->{format} = $new_format; }
+ return $self->{format};
}
-sub GetYear
+sub format_name { $ReleaseFormatNames{$_[0]{format}} }
+
+sub date
{
- ($_[0]->GetYMD)[0];
-}
+ my $self = shift;
-sub GetMonth
-{
- ($_[0]->GetYMD)[1];
+ if (@_)
+ {
+ my ($y, $m, $d) = @_;
+
+ $self->{'releasedate'} = sprintf "%04d-%02d-%02d",
+ $y || 0, $m || 0, $d || 0;
+ }
+
+ map { 0 + $_ } split('-', $self->{releasedate});
}
-sub GetDay
+sub year { ($_[0]->date)[0]; }
+sub month { ($_[0]->date)[1]; }
+sub day { ($_[0]->date)[2]; }
+
+sub sort_date
{
- ($_[0]->GetYMD)[2];
-}
+ my ($self, $new_date) = @_;
-sub SetYMD
-{
- my ($self, $y, $m, $d) = @_;
- $self->{'releasedate'} = sprintf "%04d-%02d-%02d",
- $y || 0, $m || 0, $d || 0;
+ if (defined $new_date) { $self->date(split /-/, $new_date); }
+ return $self->{releasedate};
}
-sub GetSortDate { $_[0]{'releasedate'} }
-sub SetSortDate { $_[0]->SetYMD(split /-/, $_[1]) }
# GetModPending / SetModPending - see TableBase
sub ToString {
@@ -256,11 +260,11 @@
"INSERT INTO release (album, country, releasedate, label, catno, barcode, format) VALUES (?, ?, ?, ?, ?, ?, ?)",
$self->GetRelease,
$self->country,
- $self->GetSortDate,
+ $self->sort_date,
$self->GetLabel || undef,
$self->cat_no || undef,
$self->barcode || undef,
- $self->GetFormat || undef,
+ $self->format || undef,
);
$self->SetId($sql->GetLastInsertId("release"));
}
@@ -270,19 +274,19 @@
my ($self, %new) = @_;
my $sql = Sql->new($self->{DBH});
$self->country($new{"country"});
- $self->SetSortDate($new{"date"});
+ $self->sort_date($new{"date"});
$self->SetLabel($new{"label"});
$self->cat_no($new{"catno"});
$self->barcode($new{"barcode"});
- $self->SetFormat($new{"format"});
+ $self->format($new{"format"});
$sql->Do(
"UPDATE release SET country = ?, releasedate = ?, label = ?, catno = ?, barcode = ?, format = ? WHERE id = ?",
$self->country,
- $self->GetSortDate,
+ $self->sort_date,
$self->GetLabel || undef,
$self->cat_no || undef,
$self->barcode || undef,
- $self->GetFormat || undef,
+ $self->format || undef,
$self->GetId,
);
}
Modified: mb_server/branches/TemplateToolkit/lib/QuerySupport.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/QuerySupport.pm 2008-09-01 23:48:15 UTC (rev 10289)
+++ mb_server/branches/TemplateToolkit/lib/QuerySupport.pm 2008-09-01 23:49:09 UTC (rev 10290)
@@ -1178,7 +1178,7 @@
{
my $cid = $rel->country;
my $c = $country_obj->newFromId($cid);
- my ($year, $month, $day) = $rel->GetYMD();
+ my ($year, $month, $day) = $rel->date();
$releasedate = $year;
$releasedate .= sprintf "-%02d", $month if ($month != 0);
More information about the MusicBrainz-commits
mailing list