From 0eea33e5e407f5ad34236ede403560e0e29c73d9 Mon Sep 17 00:00:00 2001
From: Olivier Berten <olivier.berten@gmail.com>
Date: Thu, 20 Jul 2017 21:07:52 +0100
Subject: [PATCH] Add Cantus ID field

---
 chant.php               |  2 ++
 chant_edit.php          |  5 +++--
 gregobase_structure.sql | 28 ++++++++++++++++------------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/chant.php b/chant.php
index d92e573..90340eb 100644
--- a/chant.php
+++ b/chant.php
@@ -100,6 +100,8 @@ if($c['version'] > '') echo '<h4>Version</h4><ul><li>'.$c['version']."</li></ul>
 
 if($c['office-part'] > '') echo '<h4>Usage</h4><ul><li><span class="usage '.$c['office-part'].'">'.$txt['usage'][$c['office-part']]."</span></li></ul>\n";
 
+if($c['cantusid'] > '') echo '<h4>Cantus ID</h4><ul><li><a target="_blank" href="http://cantusindex.org/id/'.$c['cantusid'].'">'.$c['cantusid']."</a></li></ul>\n";
+
 $tags = array();
 $sql = 'SELECT * FROM '.db('chant_tags').' WHERE chant_id = '.$id;
 $req = $mysqli->query($sql) or die('Erreur SQL !<br />'.$sql.'<br />'.$mysqli->error);
diff --git a/chant_edit.php b/chant_edit.php
index 076fb25..a0a4815 100644
--- a/chant_edit.php
+++ b/chant_edit.php
@@ -93,7 +93,7 @@ if(!$logged_in) {
 	$mysqli->query($sql) or die('Erreur SQL !<br />'.$sql.'<br />'.$mysqli->error);
 	$id = $mysqli->insert_id;
 	$mypost['id'] = $id;
-	foreach(array('version','office-part','mode','mode_var','commentary','initial','transcriber','gabc','gabc_verses','tex_verses','remarks') as $k) {
+	foreach(array('cantusid','version','office-part','mode','mode_var','commentary','initial','transcriber','gabc','gabc_verses','tex_verses','remarks') as $k) {
 		if($mypost[$k] > '' && $mypost[$k] != "(c4)") {
 			$sql = 'UPDATE '.db('chants').' SET `'.$k.'` = "'.$mysqli->real_escape_string($mypost[$k]).'" WHERE `id` = '.$id;
 			$mysqli->query($sql) or die('Erreur SQL !<br />'.$sql.'<br />'.$mysqli->error);
@@ -168,7 +168,7 @@ if(!$logged_in) {
 	natcasesort($new_tags);
 	unset($mypost['tags']);
 
-	$fields = array('id','incipit','version','office-part','mode','mode_var','commentary','initial','transcriber','gabc','gabc_verses','tex_verses','remarks');
+	$fields = array('id','incipit','cantusid','version','office-part','mode','mode_var','commentary','initial','transcriber','gabc','gabc_verses','tex_verses','remarks');
 	$old = array();
 	$new = array();
 	foreach($fields as $f) {
@@ -275,6 +275,7 @@ if(!$logged_in) {
 	echo '<div id="info">
 	';
 	echo '<h4>Incipit</h4><input name="incipit" value="'.$c['incipit'].'" />'."\n";
+	echo '<h4>Cantus ID</h4><input name="cantusid" value="'.$c['cantusid'].'" />'."\n";
 	echo '<h4>Version</h4><input name="version" value="'.$c['version'].'" />'."\n";
 	echo '<h4>Usage</h4><select name="office-part">'."\n";
 	echo '<option value="">Choose usage</option>'."\n";
diff --git a/gregobase_structure.sql b/gregobase_structure.sql
index 2a3a707..12a3277 100644
--- a/gregobase_structure.sql
+++ b/gregobase_structure.sql
@@ -1,13 +1,15 @@
 -- phpMyAdmin SQL Dump
--- version 4.6.0-rc2
--- http://www.phpmyadmin.net
+-- version 4.7.1
+-- https://www.phpmyadmin.net/
 --
--- Client :  localhost
--- Généré le :  Ven 18 Mars 2016 à 09:58
--- Version du serveur :  5.5.47-0ubuntu0.14.04.1
--- Version de PHP :  5.5.33-1+deb.sury.org~trusty+1
+-- Hôte : localhost
+-- Généré le :  jeu. 20 juil. 2017 à 22:05
+-- Version du serveur :  10.0.29-MariaDB-0ubuntu0.16.04.1
+-- Version de PHP :  7.0.18-0ubuntu0.16.04.1
 
 SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
+SET AUTOCOMMIT = 0;
+START TRANSACTION;
 SET time_zone = "+00:00";
 
 
@@ -53,6 +55,7 @@ CREATE TABLE `gregobase_changesets` (
 
 CREATE TABLE `gregobase_chants` (
   `id` int(11) NOT NULL,
+  `cantusid` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
   `version` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
   `incipit` varchar(256) COLLATE utf8_unicode_ci NOT NULL,
   `initial` tinyint(4) NOT NULL DEFAULT '1',
@@ -150,7 +153,7 @@ CREATE TABLE `gregobase_tags` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 --
--- Index pour les tables exportées
+-- Index pour les tables déchargées
 --
 
 --
@@ -209,29 +212,30 @@ ALTER TABLE `gregobase_tags`
   ADD UNIQUE KEY `tag` (`tag`);
 
 --
--- AUTO_INCREMENT pour les tables exportées
+-- AUTO_INCREMENT pour les tables déchargées
 --
 
 --
 -- AUTO_INCREMENT pour la table `gregobase_chants`
 --
 ALTER TABLE `gregobase_chants`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=7503;
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=7907;
 --
 -- AUTO_INCREMENT pour la table `gregobase_pleasefix`
 --
 ALTER TABLE `gregobase_pleasefix`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=2831;
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=2849;
 --
 -- AUTO_INCREMENT pour la table `gregobase_sources`
 --
 ALTER TABLE `gregobase_sources`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=25;
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=32;
 --
 -- AUTO_INCREMENT pour la table `gregobase_tags`
 --
 ALTER TABLE `gregobase_tags`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=44;
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=109;COMMIT;
+
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;