[Slimp3-checkins] CVS: slimp3/server/lib/SliMP3 Pages.pm,1.26,1.27 HTTP.pm,1.200,1.201

[Robert M. II <gr...@us...>]

Update of /cvsroot/slimp3/slimp3/server/lib/SliMP3
In directory sc8-pr-cvs1:/tmp/cvs-serv9474

Modified Files:
	Pages.pm HTTP.pm 
Log Message:

Fixed a couple of bugs in pages.pm.  One could cause the server to die
if the songinfo page was requested without specifying songurl.  The other
was preventing Browse By Album from appearing at the top of the Browse by Album
page.

Commented out some obsolete pages from HTTP.pm.  The artists, albums, and songs
functions were removed in favor of browseid3 in HTTP.pm version 1.60, but the
calls to them for the html requests by those names remained.  Requesting those
pages would cause the server to die.


Index: Pages.pm
===================================================================
RCS file: /cvsroot/slimp3/slimp3/server/lib/SliMP3/Pages.pm,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Pages.pm	3 Nov 2002 22:55:51 -0000	1.26
--- Pages.pm	27 Nov 2002 02:29:00 -0000	1.27
***************
*** 500,504 ****
  
  	if (!$song) {
! 		my $song = songPath($params{'genre'}, $params{'artist'}, $params{'album'}, $params{'track'});
  	}
  
--- 500,504 ----
  
  	if (!$song) {
! 		my $song = SliMP3::Info::songPath($params{'genre'}, $params{'artist'}, $params{'album'}, $params{'track'});
  	}
  
***************
*** 572,576 ****
  	    $list_form{'pwditem'} = string('BROWSE_BY_ALBUM');
  		$params{'pwd_list'} .= &SliMP3::HTTP::filltemplatefile("browseid3_pwdlist.html", \%list_form);
! 		$params{'pwditem'} = string('BROWSE_BY_ALBUM');
  	} elsif (defined($genre) && $genre eq '*') {
  		%list_form=();
--- 572,576 ----
  	    $list_form{'pwditem'} = string('BROWSE_BY_ALBUM');
  		$params{'pwd_list'} .= &SliMP3::HTTP::filltemplatefile("browseid3_pwdlist.html", \%list_form);
! 		$params{'browseby'} = string('BROWSE_BY_ALBUM');
  	} elsif (defined($genre) && $genre eq '*') {
  		%list_form=();

Index: HTTP.pm
===================================================================
RCS file: /cvsroot/slimp3/slimp3/server/lib/SliMP3/HTTP.pm,v
retrieving revision 1.200
retrieving revision 1.201
diff -C2 -d -r1.200 -r1.201
*** HTTP.pm	3 Nov 2002 22:55:51 -0000	1.200
--- HTTP.pm	27 Nov 2002 02:29:01 -0000	1.201
***************
*** 773,788 ****
  	    } elsif ($path =~ /browseid3\.htm/) {
  			$body = SliMP3::Pages::browseid3($client, %params);
! 			
! 	    } elsif ($path =~ /artists\.htm/) {
! 			$body = SliMP3::Pages::artists($client, %params);
! 			
! 	    } elsif ($path =~ /albums\.htm/) {
! 			$body = SliMP3::Pages::albums($client, %params);
! 			
  	    } elsif ($path =~ /songinfo\.htm/) {
  			$body = SliMP3::Pages::songinfo($client, %params);
- 			
- 	    } elsif ($path =~ /songs\.htm/) {
- 			$body = SliMP3::Pages::songs($client, %params);
  			
  	    } elsif ($path =~ /search\.htm/) {
--- 773,789 ----
  	    } elsif ($path =~ /browseid3\.htm/) {
  			$body = SliMP3::Pages::browseid3($client, %params);
! 	##########################
! 	# The following should most likely be removed, either that or replaced
! 	# by calls to SliMP3::Pages::browseid3() with parameters appropriately
! 	##########################
! 	#    } elsif ($path =~ /artists\.htm/) {
! 	#		$body = SliMP3::Pages::artists($client, %params);
! 	#    } elsif ($path =~ /albums\.htm/) {
! 	#		$body = SliMP3::Pages::albums($client, %params);
! 	#    } elsif ($path =~ /songs\.htm/) {
! 	#		$body = SliMP3::Pages::songs($client, %params);
! 	##########################
  	    } elsif ($path =~ /songinfo\.htm/) {
  			$body = SliMP3::Pages::songinfo($client, %params);
  			
  	    } elsif ($path =~ /search\.htm/) {