Changes:

 - output changes to produce proper XHTML 1.0 output 
   (note: only default template modified; other templates need work too)

 - gnump3d::url::encodeEntities: a naive implementation

 - search description on the results page works again

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnump3d/gnump3d/ChangeLog,v
retrieving revision 1.40
diff -u -r1.40 ChangeLog
--- ChangeLog	2 Nov 2003 14:18:29 -0000	1.40
+++ ChangeLog	2 Nov 2003 16:44:48 -0000
@@ -34,12 +34,14 @@
         - BUGFIX:  'Random Selection' on the directory index links properly.
 	- BUGFIX: Added several new test scripts.
 	- BUGFIX: Advanced playlists contain the track lengths in seconds.
-	- BUGFIX: gnump3d-index has a valid shebang ling.
-	- BUGFIX: Searching with no terms returns an error.
+	- BUGFIX: gnump3d-index has a valid shebang line.
+	- BUGFIX: Searching with no terms returns an error rather than all files.
+	- BUGFIX: Searching on genre fixed.
+	- BUGFIX: XHTML 1.0 output cleanups.
 	
 	- PLUGINS: preferences plugin shows installed languages.
-	           (doesnt allow switching; wanna encourage more contributiosn)
-        - PLUGINS: Searching has been enhanced to support artist, etc.
+	           (doesnt allow switching; wanna encourage more contributions)
+        - PLUGINS: Now possible to searching artist, album, or song title.
 
 
 
Index: bin/gnump3d2
===================================================================
RCS file: /cvsroot/gnump3d/gnump3d/bin/gnump3d2,v
retrieving revision 1.41
diff -u -r1.41 gnump3d2
--- bin/gnump3d2	2 Nov 2003 14:22:12 -0000	1.41
+++ bin/gnump3d2	2 Nov 2003 16:44:49 -0000
@@ -2346,17 +2346,36 @@
     {
 	$total =~ s/<PLAYLISTS>.*<\/PLAYLISTS>//gsx;
     }
+    else
+    {
+      $total =~ s/<\/?PLAYLISTS>//g;
+    }
+
     if ( $totalFiles eq 0 )
     {
       $total =~ s/<FILES>.*<\/FILES>//gsx;
     }
+    else
+    {
+      $total =~ s/<\/?FILES>//g;
+    }
+
     if ( $totalSubdirs eq 0 )
     {
       $total =~ s/<DIRS>.*<\/DIRS>//gsx;
     }
+    else
+    {
+      $total =~ s/<\/?DIRS>//g;
+    }
+
     if ( $totalMovies eq 0 )
     {
       $total =~ s/<MOVIES>.*<\/MOVIES>//gsx;
+    }
+    else
+    {
+      $total =~ s/<\/?MOVIES>//g;
     }
 
     #
Index: etc/gnump3d.conf
===================================================================
RCS file: /cvsroot/gnump3d/gnump3d/etc/gnump3d.conf,v
retrieving revision 1.7
diff -u -r1.7 gnump3d.conf
--- etc/gnump3d.conf	1 Nov 2003 16:23:20 -0000	1.7
+++ etc/gnump3d.conf	2 Nov 2003 16:44:49 -0000
@@ -485,7 +485,7 @@
 #  $RECURSE    = A link to play the contents of the directory recursively.
 #
 #
-directory_format = <tr><td width="10%">&nbsp;</td><td><a href="$LINK">$DIR_NAME</a><td><td>$SONG_COUNT</td><td>$DIR_COUNT</td><td>[$RECURSE]</td></tr>
+directory_format = <tr><td width="10%">&nbsp;</td><td><a href="$LINK">$DIR_NAME</a></td><td>$SONG_COUNT</td><td>$DIR_COUNT</td><td>[$RECURSE]</td></tr>
 
 #
 # directory_format = <tr><td><a href="$LINK">$DIR_NAME</a></td></tr>
Index: lib/gnump3d/tagcache.pm
===================================================================
RCS file: /cvsroot/gnump3d/gnump3d/lib/gnump3d/tagcache.pm,v
retrieving revision 1.3
diff -u -r1.3 tagcache.pm
--- lib/gnump3d/tagcache.pm	31 Oct 2003 17:16:37 -0000	1.3
+++ lib/gnump3d/tagcache.pm	2 Nov 2003 16:44:49 -0000
@@ -36,6 +36,7 @@
 use gnump3d::ogginfo;
 use gnump3d::mp3info;
 use gnump3d::oggtagreader;
+use gnump3d::url;
 
 # set the version for version checking
 my $VERSION = '$Revision: 1.3 $';
@@ -401,7 +402,7 @@
 	if (defined( $TAGS{$key} ) )
 	{
 	    # Do the insertion.
-	    $format = $pre . $TAGS{$key} . $post;
+	    $format = $pre . gnump3d::url::encodeEntities( $TAGS{$key} ) . $post;
 	}
 	else
 	{
@@ -442,7 +443,7 @@
 
     return($format);
 
-  }
+}
 
 
 #
Index: lib/gnump3d/url.pm
===================================================================
RCS file: /cvsroot/gnump3d/gnump3d/lib/gnump3d/url.pm,v
retrieving revision 1.2
diff -u -r1.2 url.pm
--- lib/gnump3d/url.pm	23 Oct 2003 09:00:40 -0000	1.2
+++ lib/gnump3d/url.pm	2 Nov 2003 16:44:49 -0000
@@ -91,7 +91,7 @@
 sub encodeEntities( $ )
 {
     my ( $text ) = ( @_ );
-    
+    $text =~ s/&/&amp;/g;
     return( $text );
 }
 
Index: lib/gnump3d/plugins/random.pm
===================================================================
RCS file: /cvsroot/gnump3d/gnump3d/lib/gnump3d/plugins/random.pm,v
retrieving revision 1.6
diff -u -r1.6 random.pm
--- lib/gnump3d/plugins/random.pm	27 Oct 2003 19:29:36 -0000	1.6
+++ lib/gnump3d/plugins/random.pm	2 Nov 2003 16:44:49 -0000
@@ -223,10 +223,10 @@
 	    # Escape the link to the songs.
 	    $file = &urlEncode( $file );
 
-	    $form .= "<input type=\"hidden\" name=\"track$count\"  value=\"$file\">\n";
+	    $form .= "<input type=\"hidden\" name=\"track$count\"  value=\"$file\" />\n";
 	    $count ++;
 	}
-	$form .= "<input type=\"submit\" name=\"submit\" value=\"Play\">\n";
+	$form .= "<input type=\"submit\" name=\"submit\" value=\"Play\" />\n";
 	$form .= "</form></td>\n";
 
 
@@ -245,7 +245,7 @@
 	$form   .= "<option value=\"40\">40</option>\n";
 	$form   .= "<option value=\"50\">50</option>\n";
 	$form   .= "</select>\n";
-	$form   .= "<input type=\"submit\" name=\"submit\" value=\"Try Again\">\n";
+	$form   .= "<input type=\"submit\" name=\"submit\" value=\"Try Again\" />\n";
 	$form   .= "[ <a href=\"/random/directory\">Random Directory</a> ]  </form> </td></tr></table>\n";
 	$output .= $form;
 
Index: lib/gnump3d/plugins/search.pm
===================================================================
RCS file: /cvsroot/gnump3d/gnump3d/lib/gnump3d/plugins/search.pm,v
retrieving revision 1.7
diff -u -r1.7 search.pm
--- lib/gnump3d/plugins/search.pm	2 Nov 2003 14:06:21 -0000	1.7
+++ lib/gnump3d/plugins/search.pm	2 Nov 2003 16:44:49 -0000
@@ -33,6 +33,7 @@
 #
 #
 
+use gnump3d::url;
 
 #
 #  Return the author of this plugin.
@@ -111,23 +112,32 @@
 	my @LINES = <CACHE>;
 	close( CACHE );
 
-        my $searchingsomething = 0;
-
-	#
-	# Remove XSS attacks
-	#
+        #
+        # description of our search terms
+        #
+        my $searchsummary = '';
 
         foreach my $st (qw(q artist album song year genre))
         {
             if ( defined( $ARGUMENTS{$st} ) && length( $ARGUMENTS{$st} ) )
             {
+                # Remove XSS attacks
                 $ARGUMENTS{$st} =~ s/</&lt;/g;
                 $ARGUMENTS{$st} =~ s/>/&gt;/g;
+                if ( $st eq 'q' )
+                {
+                    $searchsummary .= $ARGUMENTS{$st} . ', ';
+                }
+                else 
+                {
+                    $searchsummary .= $st . ' ' . $ARGUMENTS{$st} . ', ';
+                }
             }
-            $searchingsomething ++;
 	}
+        $searchsummary =~ s/ $//g;
+        $searchsummary =~ s/,$//;
 
-        if ( ! $searchingsomething )
+        if ( ! $searchsummary )
         {
             #
             # we don't seem to be searching anything
@@ -275,7 +285,7 @@
 		    $line =~ s/\$RELEASE/$RELEASE/g;
 		    $line =~ s/\$DIRECTORY/\//g;
 		    $line =~ s/\$TITLE/Search Results/g;
-		    $line =~ s/\$TERMS/$terms/g;
+		    $line =~ s/\$TERMS/$searchsummary/g;
 
 		    if ( $line =~ /(.*)\$BANNER(.*)/ )
 		    {
@@ -537,6 +547,7 @@
 	    my $count = 0;
 	    foreach my $name ( @dirs )
 	    {
+                $name = gnump3d::url::encodeEntities($name);
 		$text .= "<option value=\"$name\">$name</option>\n";
 	    }
 	    $text .= "</select>\n";
Index: templates/Tabular/index.html
===================================================================
RCS file: /cvsroot/gnump3d/gnump3d/templates/Tabular/index.html,v
retrieving revision 1.3
diff -u -r1.3 index.html
--- templates/Tabular/index.html	27 Oct 2003 19:27:05 -0000	1.3
+++ templates/Tabular/index.html	2 Nov 2003 16:44:49 -0000
@@ -3,11 +3,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <title>GNUMP3d :: $DIRECTORY </title>
-<meta http-equiv="content-type"content="text/html;charset=iso-8859-1"/>
-<meta name="description" content="CSS techniques to demonstrate pure CSS tabbed navigation menu" />
-<meta name="keywords" content="" />
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
 <style type="text/css">
 body {margin: 0;
 padding: 0;
Index: templates/default/footer.tmpl
===================================================================
RCS file: /cvsroot/gnump3d/gnump3d/templates/default/footer.tmpl,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 footer.tmpl
--- templates/default/footer.tmpl	28 Jul 2003 22:26:38 -0000	1.1.1.1
+++ templates/default/footer.tmpl	2 Nov 2003 16:44:49 -0000
@@ -1,5 +1,4 @@
 
-
 </td>
 </tr>
 </table>
Index: templates/default/header.tmpl
===================================================================
RCS file: /cvsroot/gnump3d/gnump3d/templates/default/header.tmpl,v
retrieving revision 1.3
diff -u -r1.3 header.tmpl
--- templates/default/header.tmpl	2 Nov 2003 14:03:14 -0000	1.3
+++ templates/default/header.tmpl	2 Nov 2003 16:44:49 -0000
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml11-transitional.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
  <title>GNUMP3d [ $HOSTNAME : $DIRECTORY ]</title>
@@ -8,10 +8,9 @@
 
 <body bgcolor="white">
 
-<!-- header -->
 <center>
  <form action="/search" method="get">
- <table width="80%" bgcolor="silver" border="0" cellpadding="2">
+ <table width="80%" bgcolor="silver" border="0" cellpadding="2" summary="quick search">
   <tr><td align="center">
   <strong>::<a href="http://www.gnump3d.org">GNUMP3d</a> server on $HOSTNAME::  </strong>
   </td></tr>
@@ -24,7 +23,7 @@
  </form>
 </center>
 
-<table width="100%" border="0">
+<table width="100%" border="0" summary="">
 <tr>
 <td valign="top" width="200">
 <p>&nbsp;</p>
Index: templates/default/random.html
===================================================================
RCS file: /cvsroot/gnump3d/gnump3d/templates/default/random.html,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 random.html
--- templates/default/random.html	28 Jul 2003 22:26:38 -0000	1.1.1.1
+++ templates/default/random.html	2 Nov 2003 16:44:49 -0000
@@ -1,8 +1,8 @@
 <!-- include="header.tmpl" -->
 
-<table border="0" cellpadding="0" cellspacing="2" width="100%" bgcolor="#ff0000">
+<table border="0" cellpadding="0" cellspacing="2" width="100%" bgcolor="#ff0000" summary="">
 <tr><td>
-<table border="0" cellpadding="0" cellspacing="0" width="100%" bgcolor="#eaecef">
+<table border="0" cellpadding="0" cellspacing="0" width="100%" bgcolor="#eaecef" summary="random music">
 <tr bgcolor="#d1d5d7"><td colspan="7"><center><h3>Listen To Random Music</h3></center></td></tr>
 <tr><td>
 $TEXT
Index: templates/default/results.html
===================================================================
RCS file: /cvsroot/gnump3d/gnump3d/templates/default/results.html,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 results.html
--- templates/default/results.html	28 Jul 2003 22:26:38 -0000	1.1.1.1
+++ templates/default/results.html	2 Nov 2003 16:44:49 -0000
@@ -8,10 +8,10 @@
 </p>
 
 
-<table border="0" cellpadding="0" cellspacing="2" width="100%" bgcolor="#ff0000">
+<table border="0" cellpadding="0" cellspacing="2" width="100%" bgcolor="#ff0000" summary="">
 <tr><td>
-<table border="0" cellpadding="0" cellspacing="0" width="100%" bgcolor="#eaecef">
-<tr bgcolor="#d1d5d7"><td colspan="2" align="center"><h3>Search results for '<i>$TERMS</i>'</h3></td></tr>
+<table border="0" cellpadding="0" cellspacing="0" width="100%" bgcolor="#eaecef" summary="search results">
+<tr bgcolor="#d1d5d7"><td colspan="2" align="center"><h3>Search results for $TERMS</h3></td></tr>
 $RESULTS
 </table>
 </td></tr>
Index: templates/default/search.html
===================================================================
RCS file: /cvsroot/gnump3d/gnump3d/templates/default/search.html,v
retrieving revision 1.2
diff -u -r1.2 search.html
--- templates/default/search.html	2 Nov 2003 14:15:01 -0000	1.2
+++ templates/default/search.html	2 Nov 2003 16:44:49 -0000
@@ -2,15 +2,15 @@
 
 
 <form action="/search" method="get">
-<table border="0" cellpadding="0" cellspacing="2" width="100%" bgcolor="#ff0000">
+<table border="0" cellpadding="0" cellspacing="2" width="100%" bgcolor="#ff0000" summary="">
 <tr><td>
-<table border="0" cellpadding="0" cellspacing="0" width="100%" bgcolor="#eaecef">
+<table border="0" cellpadding="0" cellspacing="0" width="100%" bgcolor="#eaecef" summary="search archive">
 <tr><td colspan="2" align="center"><b>Search Archive For Music</b></td></tr>
 <tr><td>&nbsp;</td><td>&nbsp;</td></tr>
 <tr><td align="right">Search any field:</td><td align="left"><input type="text" name="q" size="40" /></td></tr>
 <tr><td align="right">Search for:</td><td align="left">
- <input type="radio" name="type" value="all" checked> All Terms
- <input type="radio" name="type" value="any"> Any Terms
+ <input type="radio" name="type" value="all" checked /> All Terms
+ <input type="radio" name="type" value="any" /> Any Terms
 </td></tr>
 <tr><td align="right">Search artist:</td><td align="left"><input type="text" name="artist" size="40" /></td></tr>
 <tr><td align="right">Search album:</td><td align="left"><input type="text" name="album" size="40" /></td></tr>
@@ -19,8 +19,8 @@
 <tr><td align="right">Start Directory:</td><td align="left">$SELECT_COMBO</td></tr>
 <tr><td align="right">Limit to genre:</td><td align="left">$GENRE_COMBO</td></tr>
 <tr><td align="right">Play Results:</td><td align="left">
- <input type="radio" name="play" value="0" checked> No
- <input type="radio" name="play" value="1"> Yes
+ <input type="radio" name="play" value="0" checked /> No
+ <input type="radio" name="play" value="1" /> Yes
 </td></tr>
 <tr><td>&nbsp;</td><td>&nbsp;</td></tr>
 <tr><td>&nbsp;</td><td><input type="submit" /></td></tr>