[mb-commits] r10327 - in mb_server/branches/Discographies-BRANCH: admin/sql/updates admin/sql/vertical/rawdata cgi-bin/MusicBrainz/Server

[root at musicbrainz.org]

Author: niklas
Date: 2008-09-16 20:38:03 +0000 (Tue, 16 Sep 2008)
New Revision: 10327

Modified:
   mb_server/branches/Discographies-BRANCH/admin/sql/updates/20080711-1.sql
   mb_server/branches/Discographies-BRANCH/admin/sql/vertical/rawdata/CreateTables.sql
   mb_server/branches/Discographies-BRANCH/cgi-bin/MusicBrainz/Server/CollectionPreference.pm
Log:
renamed showattributes column to removeattributes and changed this in the code. updated default values of that column

Modified: mb_server/branches/Discographies-BRANCH/admin/sql/updates/20080711-1.sql
===================================================================
--- mb_server/branches/Discographies-BRANCH/admin/sql/updates/20080711-1.sql	2008-09-16 18:25:22 UTC (rev 10326)
+++ mb_server/branches/Discographies-BRANCH/admin/sql/updates/20080711-1.sql	2008-09-16 20:38:03 UTC (rev 10327)
@@ -15,7 +15,7 @@
 	emailnotifications				BOOLEAN DEFAULT TRUE, -- send notifications by e-mail?
 	notificationinterval			INTEGER DEFAULT 7, -- specifies how many days in advance of a release date the user want to be notified
 	ignorecollectionattributes		INTEGER[], -- list of attributes to ignore when displaying missing releases
-	showattributes					INTEGER[] DEFAULT '{1,2,100}' -- list of attributes to show releases of
+	ignoreattributes				INTEGER[] DEFAULT '{0,3,4,5,6,7,8,9,10,11,101,102,103}' -- list of attributes to ignore releases of
 );
 
 CREATE TABLE collection_ignore_time_range

Modified: mb_server/branches/Discographies-BRANCH/admin/sql/vertical/rawdata/CreateTables.sql
===================================================================
--- mb_server/branches/Discographies-BRANCH/admin/sql/vertical/rawdata/CreateTables.sql	2008-09-16 18:25:22 UTC (rev 10326)
+++ mb_server/branches/Discographies-BRANCH/admin/sql/vertical/rawdata/CreateTables.sql	2008-09-16 20:38:03 UTC (rev 10327)
@@ -39,7 +39,7 @@
 	publiccollection				BOOLEAN NOT NULL, -- publicly display collection?
 	emailnotifications				BOOLEAN DEFAULT TRUE, -- send notifications by e-mail?
 	notificationinterval			INTEGER DEFAULT 7, -- specifies how many days in advance of a release date the user want to be notified
-	showattributes					INTEGER[] DEFAULT '{1,2,100}' -- list of attributes to show releases of
+	ignoreattributes				INTEGER[] DEFAULT '{0,3,4,5,6,7,8,9,10,11,101,102,103}' -- list of attributes to ignore releases of
 );
 
 CREATE TABLE collection_ignore_time_range

Modified: mb_server/branches/Discographies-BRANCH/cgi-bin/MusicBrainz/Server/CollectionPreference.pm
===================================================================
--- mb_server/branches/Discographies-BRANCH/cgi-bin/MusicBrainz/Server/CollectionPreference.pm	2008-09-16 18:25:22 UTC (rev 10326)
+++ mb_server/branches/Discographies-BRANCH/cgi-bin/MusicBrainz/Server/CollectionPreference.pm	2008-09-16 20:38:03 UTC (rev 10327)
@@ -280,7 +280,7 @@
 	eval
 	{
 		$rawsql->Begin();
-		$rawsql->Do("UPDATE collection_info SET showattributes = '{" . join(',', @{$showTypes}) . "}' WHERE id = ?", $this->{collectionId});
+		$rawsql->Do("UPDATE collection_info SET ignoreattributes = '{" . join(',', @{$showTypes}) . "}' WHERE id = ?", $this->{collectionId});
 	};
 	
 	if($@)
@@ -303,7 +303,7 @@
 	my $rawsql = Sql->new($this->{RAWDBH});
 	
 
-	my $showTypes = $rawsql->SelectSingleValue('SELECT showattributes FROM collection_info WHERE id = ?', $this->{collectionId});
+	my $showTypes = $rawsql->SelectSingleValue('SELECT ignoreattributes FROM collection_info WHERE id = ?', $this->{collectionId});
 	
 	# convert to {1,2,3} formatted string to array
 	my $showTypesPrefString = $showTypes;