[Slim-Checkins] r11390 - in /trunk/server: HTML/EN/html/docs/cli-api.html Slim/Control/Commands.pm

[fred at svn.slimdevices.com]

Author: fred
Date: Sat Feb 10 16:37:38 2007
New Revision: 11390

URL: http://svn.slimdevices.com?rev=11390&view=rev
Log:
Bug: N/A
Description: We want the form "year", not "year_id"


Modified:
    trunk/server/HTML/EN/html/docs/cli-api.html
    trunk/server/Slim/Control/Commands.pm

Modified: trunk/server/HTML/EN/html/docs/cli-api.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/html/docs/cli-api.html?rev=11390&r1=11389&r2=11390&view=diff
==============================================================================
--- trunk/server/HTML/EN/html/docs/cli-api.html (original)
+++ trunk/server/HTML/EN/html/docs/cli-api.html Sat Feb 10 16:37:38 2007
@@ -51,6 +51,8 @@
 </p>
 <ul>
 	<li>
+		Deprecated the tag &quot;year_id&quot; in favour of &quot;year&quot; in the 
+		&quot;<a href="#playlistcontrol">playlistcontrol</a>&quot; command.
 	</li>
 </ul>
 <p>
@@ -5531,8 +5533,11 @@
 			artist_id and/or album_id parameter is ignored.</td>
 	</tr>
 	<tr>
-		<td>year_id</td>
-		<td>Year ID, to restrict the results to the given year.</td>
+		<td>year|year_id</td>
+		<td>
+			Year, to restrict the results to the given year. The form year_id is accepted
+			for backwared compatibility but is deprecated.
+		</td>
 	</tr>
 	<tr>
 		<td>playlist_id</td>

Modified: trunk/server/Slim/Control/Commands.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Control/Commands.pm?rev=11390&r1=11389&r2=11390&view=diff
==============================================================================
--- trunk/server/Slim/Control/Commands.pm (original)
+++ trunk/server/Slim/Control/Commands.pm Sat Feb 10 16:37:38 2007
@@ -1309,6 +1309,11 @@
 			$find->{'me.album'} = $album_id;
 		}
 
+		if (defined(my $year = $request->getParam('year'))) {
+
+			$find->{'me.year'} = $year;
+		}
+		# Fred: form year_id DEPRECATED in 7.0
 		if (defined(my $year_id = $request->getParam('year_id'))) {
 
 			$find->{'me.year'} = $year_id;