X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2Fdisplayset.php;h=eee37702f49281cd8a639d280c9153fa64449fbd;hb=b66990e2c6a579429e165707664031315a512eac;hp=111c43af5d5ca88313c67f9a874c11b9b4a6c047;hpb=3fb37fca3a2cfd094e936635616421cc52ada97d;p=songbook.git

diff --git a/web/displayset.php b/web/displayset.php
index 111c43a..eee3770 100644
--- a/web/displayset.php
+++ b/web/displayset.php
@@ -4,14 +4,14 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   <meta name="GENERATOR" content="Mozilla/4.61 [en] (Win98; U) [Netscape]">
-  <title>Songbook Artist</title>
+  <title>Songbook List</title>
   <link rel="stylesheet" type="text/css" media="screen" href="/css/Music.css">
   <link rel="stylesheet" type="text/css" media="print" href="/css/Print.css">
   <link rel="SHORTCUT ICON" href="http://defaria.com/favicon.ico" type="image/png">
 
 <?php
 include_once "songbook.php";
-$set = $_REQUEST ["set"];
+$set = $_REQUEST["set"];
 ?>
 
 <style>
@@ -31,44 +31,54 @@ width: 100%;
 <div id="content">
 
 <?php
-global $songDir;
+global $songDir, $artists;
 
 print "<ol>";
 
 $firstLine = true;
 
-foreach (file("$songDir/$set") as $line) {
+foreach (file("$songDir/Lists/$set") as $line) {
   // Skip first line which is merely the set name again
   if ($firstLine) {
     $firstLine = false;
     continue;
   } // if
 
-  if (preg_match ("/(.*)\s+-\s+(.*)/", $line, $matches)) {
-    $song   = trim ($matches[1]);
-    $artist = trim ($matches[2]);
+  if (preg_match("/(.*)\s+-\s+(.*)/", $line, $matches)) {
+    $song   = trim($matches[1]);
+    $artist = trim($matches[2]);
   } else {
-    $song   = trim ($line);
-    $artist = "";
+    $song   = trim($line);
+    $artist = '';
   } // if
 
   if (file_exists ("$songDir/$song.pro")) {
     print "<li><a href=\"webchord.cgi?chordpro=$song.pro\">";
-    print basename ($song);
+    print basename($song);
     print "</a>";
   } else {
     print "<li>";
-    print basename ($song);
-  }
+    print basename($song);
+  } // if
+
+  if ($artist == '') {
+    $artist = getArtist ("$songDir/$song.pro");
+  } // if
+
+  if ($artist != '') {
+    print " - ";
 
-  if ($artist <> "") {
-    print " - <a href=\"displayartist.php?artist=$artist\">$artist</a>";
+    if (in_array ($artist, $artists)) {
+      print "<a href=\"displayartist.php?artist=$artist\">$artist</a>";
+    } else {
+       print $artist;
+    } // if
   } // if
 
   print "</li>";
 } // foreach
 
-print "</okkkl>";
+print "</ol>";
 ?>
 
 </body>
