[mb-commits] r10287 - in mb_server/branches/TemplateToolkit/lib: . MusicBrainz/Server MusicBrainz/Server/Facade MusicBrainz/Server/Handlers/WS/1

[root at musicbrainz.org]

Author: acid2
Date: 2008-09-01 23:46:00 +0000 (Mon, 01 Sep 2008)
New Revision: 10287

Modified:
   mb_server/branches/TemplateToolkit/lib/Moderation.pm
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Facade/Release.pm
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Handlers/WS/1/Common.pm
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Release.pm
Log:
GetLanguage -> language (in Moderation & Release), GetScript -> script (in Release)

Modified: mb_server/branches/TemplateToolkit/lib/Moderation.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/Moderation.pm	2008-09-01 23:45:14 UTC (rev 10286)
+++ mb_server/branches/TemplateToolkit/lib/Moderation.pm	2008-09-01 23:46:00 UTC (rev 10287)
@@ -640,7 +640,7 @@
     return $self->{language};
 }
 
-sub GetLanguage
+sub language
 {
 	my $self = shift;
 	my $id = $self->language_id or return undef;

Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Facade/Release.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Facade/Release.pm	2008-09-01 23:45:14 UTC (rev 10286)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Facade/Release.pm	2008-09-01 23:46:00 UTC (rev 10287)
@@ -64,15 +64,15 @@
         disc_ids           => $release->GetDiscidCount,
         first_release_date => $release->GetFirstReleaseDate,
         id                 => $release->GetId,
-        language_code      => $release->GetLanguage ? $release->GetLanguage->GetISOCode3T : '',
-        language           => $release->GetLanguage ? $release->GetLanguage->GetName : '',
+        language_code      => $release->language ? $release->language->GetISOCode3T : '',
+        language           => $release->language ? $release->language->GetName : '',
         mbid               => $release->GetMBId,
         name               => $release->GetName,
         puid_count         => $release->GetPuidCount,
         quality            => ModDefs::GetQualityText($release->quality),
         release_status     => $status,
         release_type       => $type,
-        script             => $release->GetScript   ? $release->GetScript->GetName : '',
+        script             => $release->script   ? $release->script->GetName : '',
         track_count        => $release->track_count,
 
         _r                 => $release,

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:45:14 UTC (rev 10286)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Handlers/WS/1/Common.pm	2008-09-01 23:46:00 UTC (rev 10287)
@@ -375,8 +375,8 @@
     if ($lang || $script)
     {
         print '<text-representation';
-        print ' language="' . uc($al->GetLanguage->GetISOCode3T()) . '"' if ($lang);
-        print ' script="' . $al->GetScript->GetISOCode . '"' if ($script);
+        print ' language="' . uc($al->language->GetISOCode3T()) . '"' if ($lang);
+        print ' script="' . $al->script->GetISOCode . '"' if ($script);
         print '/>';
     }
 
@@ -417,11 +417,11 @@
 sub xml_language
 {
 	my $al = $_[0];
-	my ($lang) = $al->GetLanguage;
+	my ($lang) = $al->language;
 	my ($name) = (defined $lang ? $lang->GetName : "?");
-	my ($code) = (defined $lang ? $al->GetLanguage->GetISOCode3T() : "?");
-	my ($script) = (defined $al->GetScript ? $al->GetScript->GetName : "?");
-	my ($editpending) = ($al->GetLanguageModPending() ? 'editpending="1"' : '');
+	my ($code) = (defined $lang ? $al->language->GetISOCode3T() : "?");
+	my ($script) = (defined $al->script ? $al->script->GetName : "?");
+	my ($editpending) = ($al->language_has_mod_pending() ? 'editpending="1"' : '');
 
 	return '<mm:language '.$editpending.' '
 	     . 'code="'.xml_escape($code).'" '

Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Release.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Release.pm	2008-09-01 23:45:14 UTC (rev 10286)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Release.pm	2008-09-01 23:46:00 UTC (rev 10287)
@@ -124,9 +124,12 @@
     return $self->{script};
 }
 
-sub SetLanguageModPending
+sub language_has_mod_pending
 {
-   $_[0]->{modpending_lang} = $_[1];
+    my ($self, $new_val) = @_;
+
+    if (defined $new_val) { $self->{modpending_lang} = $new_val; }
+    return $self->{modpending_lang} || 0;
 }
 
 sub quality_has_mod_pending
@@ -187,7 +190,7 @@
     return ($self->{asin} || "") =~ /(\S+)/ ? $1 : "";
 }
 
-sub GetLanguage
+sub language
 {
 	my $self = shift;
 	my $id = $self->language_id or return undef;
@@ -195,7 +198,7 @@
 	return MusicBrainz::Server::Language->newFromId($self->{DBH}, $id);
 }
 
-sub GetScript
+sub script
 {
 	my $self = shift;
 	my $id = $self->script_id or return undef;
@@ -203,11 +206,6 @@
 	return MusicBrainz::Server::Script->newFromId($self->{DBH}, $id);
 }
 
-sub GetLanguageModPending
-{
-	return $_[0]->{modpending_lang} || 0;
-}
-
 sub GetAttributeName
 {
    return $AlbumAttributeNames{$_[1]}->[0];