Moved lists back to same folder as songs.

Seems Songbook doesn't traverse directories when looking for set lists

diff --git a/Andrew/Glen Park.lst b/Andrew/Glen Park.lst
new file mode 100644 (file)
index 0000000..ca705ff
--- /dev/null
+++ b/Andrew/Glen Park.lst
@@ -0,0 +1,28 @@
+Glen Park
+Bartender Blues - James Taylor
+Brown Eyed Girl - Van Morrison
+Different Devil - Chickenfoot
+Good Lovin - The Rascals
+A Hard Day's Night - Beatles
+Hey Jude - Beatles
+I'll Be Your Baby Tonight - Bob Dylan
+Imagine - John Lennon
+Lay Down Sally - Eric Clapton
+Let It Be - Beatles
+The Letter - Joe Cocker
+Love Her Madly - Doors
+Lyin Eyes - Eagles
+Peaceful, Easy Feeling - Eagles
+Revolution - Beatles
+Sister Golden Hair - America
+Sitting on the Dock of the Bay - Otis Redding
+Something - Beatles
+Soul Man - The Blues Brothers
+Sultans of Swing - Dire Straights
+Take It Easy - Eagles
+Turn the Page - Bob Seager
+Under the Boardwalk - The Drifters
+Ventura Highway - America
+Who'll Stop The Rain - Creedence Clearwater Revival
+Wild Nights - Van Morrison
+Your Momma Don't Dance - Loggins and Messina

diff --git a/Andrew/Lists/Glen Park.lst b/Andrew/Lists/Glen Park.lst
deleted file mode 100644 (file)
index ca705ff..0000000
--- a/Andrew/Lists/Glen Park.lst
+++ /dev/null
@@ -1,28 +0,0 @@
-Glen Park
-Bartender Blues - James Taylor
-Brown Eyed Girl - Van Morrison
-Different Devil - Chickenfoot
-Good Lovin - The Rascals
-A Hard Day's Night - Beatles
-Hey Jude - Beatles
-I'll Be Your Baby Tonight - Bob Dylan
-Imagine - John Lennon
-Lay Down Sally - Eric Clapton
-Let It Be - Beatles
-The Letter - Joe Cocker
-Love Her Madly - Doors
-Lyin Eyes - Eagles
-Peaceful, Easy Feeling - Eagles
-Revolution - Beatles
-Sister Golden Hair - America
-Sitting on the Dock of the Bay - Otis Redding
-Something - Beatles
-Soul Man - The Blues Brothers
-Sultans of Swing - Dire Straights
-Take It Easy - Eagles
-Turn the Page - Bob Seager
-Under the Boardwalk - The Drifters
-Ventura Highway - America
-Who'll Stop The Rain - Creedence Clearwater Revival
-Wild Nights - Van Morrison
-Your Momma Don't Dance - Loggins and Messina

diff --git a/Andrew/Lists/New Songs.lst b/Andrew/Lists/New Songs.lst
deleted file mode 100644 (file)
index 7b805bb..0000000
--- a/Andrew/Lists/New Songs.lst
+++ /dev/null
@@ -1,15 +0,0 @@
-New Songs
-All My Loving - Beatles
-Let It Be - Beatles
-Dust in the Wind - Kansas
-Lyin Eyes - Eagles
-Pink Houses - John Cougar
-Something - Beatles
-Running on Empty - Jackson Browne
-Blackbird - Beatles
-Sister Golden Hair - America
-Here Comes the Sun - Beatles
-Nights in White Satin - Moody Blues
-Tears in Heaven - Eric Clapton
-Can't Find My Way Home
-Knocking on Heaven's Door

diff --git a/Andrew/Lists/Practice.lst b/Andrew/Lists/Practice.lst
deleted file mode 100644 (file)
index eeb8256..0000000
--- a/Andrew/Lists/Practice.lst
+++ /dev/null
@@ -1,43 +0,0 @@
-Practice List
-Peaceful, Easy Feeling - Eagles
-Stand By Me
-Nowhere Man - Beatles
-I Can See Clearly - Johnny Nash
-Doctor My Eyes - Jackson Browne
-People Get Ready
-I've Just Seen a Face - Beatles
-Lay Down Sally - Eric Clapton
-Behind Blue Eyes - The Who
-Mary Jane's Last Dance
-Norwegian Wood - Beatles
-New Kid in Town - Eagles
-Harvest Moon - Neil Young
-Suite Judy Blue Eyes - Crosby, Stills and Nash
-Black Water - Doobie Brothers
-Feeling Alright
-Seven Bridges Road - Eagles
-Ventura Highway - America
-If I Ever Lose My Faith In You - Sting
-Under the Boardwalk
-One After 909 - Beatles
-Best of My Love - Eagles
-Landslide - Fleetwood Mac
-From the Beginning - Emerson, Lake and Palmer
-California Dreamin - Moma's and Papa's
-Take It Easy - Eagles
-Sultans of Swing - Dire Straights
-Your Momma Don't Dance - Loggins and Messina
-Don't Let Me Down - Beatles
-Love Will Keep us Alive - Eagles
-All You Need Is Love - Beatles
-Do It Again - Steely Dan
-Soul Man - The Blues Brothers
-What a Wonderful World - Louis Armstrong
-While My Guitar Gently Weeps - Beatles
-A Day in a Life - Beatles
-Wild Nights - Van Morrison
-The Letter - Joe Cocker
-Run To You - Bryan Adams
-Refugee - Tom Petty
-Reeling in the Years - Steely Dan
-Desperado - Eagles

diff --git a/Andrew/New Songs.lst b/Andrew/New Songs.lst
new file mode 100644 (file)
index 0000000..7b805bb
--- /dev/null
+++ b/Andrew/New Songs.lst
@@ -0,0 +1,15 @@
+New Songs
+All My Loving - Beatles
+Let It Be - Beatles
+Dust in the Wind - Kansas
+Lyin Eyes - Eagles
+Pink Houses - John Cougar
+Something - Beatles
+Running on Empty - Jackson Browne
+Blackbird - Beatles
+Sister Golden Hair - America
+Here Comes the Sun - Beatles
+Nights in White Satin - Moody Blues
+Tears in Heaven - Eric Clapton
+Can't Find My Way Home
+Knocking on Heaven's Door

diff --git a/Andrew/Practice.lst b/Andrew/Practice.lst
new file mode 100644 (file)
index 0000000..eeb8256
--- /dev/null
+++ b/Andrew/Practice.lst
@@ -0,0 +1,43 @@
+Practice List
+Peaceful, Easy Feeling - Eagles
+Stand By Me
+Nowhere Man - Beatles
+I Can See Clearly - Johnny Nash
+Doctor My Eyes - Jackson Browne
+People Get Ready
+I've Just Seen a Face - Beatles
+Lay Down Sally - Eric Clapton
+Behind Blue Eyes - The Who
+Mary Jane's Last Dance
+Norwegian Wood - Beatles
+New Kid in Town - Eagles
+Harvest Moon - Neil Young
+Suite Judy Blue Eyes - Crosby, Stills and Nash
+Black Water - Doobie Brothers
+Feeling Alright
+Seven Bridges Road - Eagles
+Ventura Highway - America
+If I Ever Lose My Faith In You - Sting
+Under the Boardwalk
+One After 909 - Beatles
+Best of My Love - Eagles
+Landslide - Fleetwood Mac
+From the Beginning - Emerson, Lake and Palmer
+California Dreamin - Moma's and Papa's
+Take It Easy - Eagles
+Sultans of Swing - Dire Straights
+Your Momma Don't Dance - Loggins and Messina
+Don't Let Me Down - Beatles
+Love Will Keep us Alive - Eagles
+All You Need Is Love - Beatles
+Do It Again - Steely Dan
+Soul Man - The Blues Brothers
+What a Wonderful World - Louis Armstrong
+While My Guitar Gently Weeps - Beatles
+A Day in a Life - Beatles
+Wild Nights - Van Morrison
+The Letter - Joe Cocker
+Run To You - Bryan Adams
+Refugee - Tom Petty
+Reeling in the Years - Steely Dan
+Desperado - Eagles

diff --git a/web/displayset.php b/web/displayset.php
index eee3770..6ca458f 100644 (file)
--- a/web/displayset.php
+++ b/web/displayset.php
@@ -37,7 +37,7 @@ print "<ol>";
 
 $firstLine = true;
 
-foreach (file("$songDir/Lists/$set") as $line) {
+foreach (file("$songDir/$set") as $line) {
   // Skip first line which is merely the set name again
   if ($firstLine) {
     $firstLine = false;

diff --git a/web/songbook.php b/web/songbook.php
index 97debf9..ae50faa 100644 (file)
--- a/web/songbook.php
+++ b/web/songbook.php
@@ -26,7 +26,7 @@ function getSongs ($songDir) {
 } // getSongs
 
 function getSets ($songDir) {
-  return glob("$songDir/Lists/*.lst");
+  return glob("$songDir/*.lst");
 } // getSets
 
 function songsDropdown () {