From 71f59ec0c9c281383dcd89660955e620a0f8f40f Mon Sep 17 00:00:00 2001
From: Olivier Berten <olivier.berten@gmail.com>
Date: Sat, 9 Jan 2021 15:09:38 +0100
Subject: [PATCH] Some incipit listing fixes

---
 incipit.php | 2 +-
 scores.php  | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/incipit.php b/incipit.php
index 24cdf94..9f0c33b 100644
--- a/incipit.php
+++ b/incipit.php
@@ -13,7 +13,7 @@ echo "<h2>$title</h2>\n";
 if($l) {
 	$sql1 = 'SELECT * FROM '.db('chants').' WHERE `incipit` LIKE "'.$l.'%" ORDER BY incipit ASC';
 } else {
-	$sql1 = 'SELECT * FROM '.db('chants').' WHERE `incipit` LIKE "" ORDER BY incipit ASC';
+	$sql1 = 'SELECT * FROM '.db('chants')." WHERE `incipit` LIKE '' OR UPPER(incipit) REGEXP '^[^A-Zƌ].*' ORDER BY incipit ASC";
 }
 $req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
 $chants = array();
diff --git a/scores.php b/scores.php
index 83bd4a8..b12bbd6 100644
--- a/scores.php
+++ b/scores.php
@@ -7,11 +7,12 @@ include('include/header.php');
 
 echo "<h2>Chants</h2>\n";
 echo "<h4>by incipit</h4>\n";
-$sql1 = 'SELECT DISTINCT UPPER(SUBSTRING(incipit,1,1)) AS letters FROM '.db('chants').' ORDER BY letters ASC';
+$sql1 = 'SELECT DISTINCT UPPER(SUBSTRING(incipit,1,1)) AS letters FROM '.db('chants')." WHERE UPPER(incipit) REGEXP '^[A-Zƌ]' ORDER BY letters ASC";
 $req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
 echo "<div><ul class=\"alphabet\">\n";
+echo "<li><a href=\"incipit.php?letter=\">no incipit</a></li>\n";
 while($s = $req1->fetch_assoc()) {
-	echo "<li><a href=\"incipit.php?letter=".$s['letters']."\">".($s['letters']?$s['letters']:"no incipit")."</a></li>\n";
+	echo "<li><a href=\"incipit.php?letter=".$s['letters']."\">".$s['letters']."</a></li>\n";
 }
 echo "</ul></div>\n<div style=\"clear:both;\"></div>\n";
 
@@ -20,7 +21,7 @@ $sql1 = 'SELECT * FROM '.db('chants').' WHERE `office-part` != "" GROUP BY `offi
 $req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
 echo "<div><ul>\n";
 while($s = $req1->fetch_assoc()) {
-	echo '<li class="usage '.$s['office-part'].'"><a href="usage.php?id='.$s['office-part'].'">'.$txt['usage'][$s['office-part']]."</a></li>\n";
+	echo '<li class="usage '.$s['office-part'].'"><a href="usage.php?id='.$s['office-part'].'">'.($txt['usage'][$s['office-part']]?$txt['usage'][$s['office-part']]:$s['office-part'])."</a></li>\n";
 }
 echo "</ul></div>\n";