Fix ups on Maynard's list

Also changed displayset.php to display the Artist in all cases and link
it if we have any songs by the Artist in the songbook

diff --git a/Andrew/Maynards.lst b/Andrew/Maynards.lst
index 23d1f33..4179658 100644 (file)
--- a/Andrew/Maynards.lst
+++ b/Andrew/Maynards.lst
@@ -4,8 +4,8 @@ Black Magic Woman - Santana
 Born Under a Bad Sign - Cream
 Brown Eyed Girl - Van Morrison
 Crossroads - Cream
-Fast as you  - Dwight Yokum
-Get Back - The Beatles
+Fast as you - Dwight Yokum
+Get Back - Beatles
 Here Comes the Sun - Beatles
 I've just seen a Face - Beatles
 Knocking on Heaven's Door - Bob Dylan
@@ -13,21 +13,21 @@ Like a Rolling Stone - Bob Dylan
 Little Wing - Jimmy Hendrix
 My Sweet Lord - George Harrison
 Norwegian Wood - Beatles
-One after 909 - The Beatles
+One after 909 - Beatles
 Outside Woman Blues - Cream
 Oyo como va - Santana
 Peaceful Easy Feeling - Eagles
-Ramblin Man - Allman Brothers *
+Ramblin Man - Allman Brothers
 Running Down a Dream - Tom Petty
-Stand By Me
+Stand By Me - John  Lennon
 The Wind Cries Mary - Jimmy Hendrix
 While my Guitar Gently Weeps - Beatles
 Last Dance with Mary Jane - Tom Petty
 With a Little Help From my Friends - Beatles
-Fire - Hendrix
-Good Times Bad Times - Led Zepplin
-Purple Haze - Hendrx
+Fire - Jimmy Hendrix
+Good Times Bad Times - Led Zeppelin
+Purple Haze - Jimmy Hendrix
 Stormy Monday - Allman Brothers
-Summertime
+Summertime - George Gershwin
 You've Got a Friend - James Taylor
 Hotel California - Eagles
\ No newline at end of file

diff --git a/web/displayset.php b/web/displayset.php
index 704f405..854c98e 100644 (file)
--- a/web/displayset.php
+++ b/web/displayset.php
@@ -61,7 +61,9 @@ foreach (file("$songDir/$set") as $line) {
     print basename($song);
   } // if
 
-  $artist = getArtist ("$songDir/$song.pro"); 
+  if ($artist == '') {
+    $artist = getArtist ("$songDir/$song.pro");
+  } // if
 
   if ($artist != '') {
     print " - ";