===================================================================
RCS file: /cvs/mp3/bin/addsearch.pl,v
retrieving revision 1.2
retrieving revision 1.4
diff -u -r1.2 -r1.4
--- mp3/bin/addsearch.pl 2006/08/12 01:14:53 1.2
+++ mp3/bin/addsearch.pl 2007/02/08 23:03:15 1.4
@@ -1,5 +1,5 @@
#!/usr/bin/perl -w
-# $RedRiver$
+# $RedRiver: addsearch.pl,v 1.3 2007/02/08 20:04:03 andrew Exp $
########################################################################
# Search.pl *** Searches the full list of songs and finds matches.
#
@@ -12,12 +12,7 @@
#use MP3::Info;
#my qw/ @playlist $maplay $filename $basedir $htmldir /;
-my $listfile = 'fulllist.lst';
-my $list = '/var/www/mp3/playlist/' . $listfile;
-
-my $playlist = '/var/www/mp3/playlist/playlist.lst';
-
my $exe = 'addmp3playlist.pl';
my $Search = 'search.pl';
@@ -25,6 +20,12 @@
# *** MAIN ***
#######################################################################
+my $prefix = $ENV{'QUERY_STRING'};
+if ($prefix) {
+ $prefix =~ s/%(..)/pack("c",hex($1))/ge;
+} else {
+ $prefix ='';
+}
print "Content-Type: text/html\n\n";
print "\n\n\n\n\t MP3 Search\n";
@@ -47,9 +48,17 @@
my @Fields_To_Search = $Query->param('Fields');
@Fields_To_Search = ('Artist', 'Album', 'Song') unless @Fields_To_Search;
+my $listfile = $prefix . 'fulllist.lst';
+my $list = '/var/www/mp3/playlist/' . $listfile;
+my $playlist = '/var/www/mp3/playlist/' . $prefix . 'playlist.lst';
+if ($prefix && $Query->param('Submit') eq 'Approve All') {
+ $playlist = '/var/www/mp3/playlist/' . $prefix . 'fulllist.lst';
+}
+
#print $Query->header;
#print "Search_Term: $Search_Term
\n";
+
print $Query->start_form(-action=>$Search);
# $Query->hidden('Fields', \@Fields_To_Search);
@@ -86,7 +95,7 @@
print "
\n";
foreach my $filename (@playlist) {
- #print "\t$filename\n";
+ #print "\t$filename\n";
AddSong($filename);
$counter++;
}