From d4b02587b2b328f6b694a445bcdbf7becd02fff1 Mon Sep 17 00:00:00 2001 From: kimicol Date: Sun, 16 Jun 2024 19:09:54 +0200 Subject: [PATCH 1/3] refs 2: remove unused sort by completion of instruments --- index.php | 160 +----------------------------------------------------- 1 file changed, 1 insertion(+), 159 deletions(-) diff --git a/index.php b/index.php index 0c811ab..dee5087 100755 --- a/index.php +++ b/index.php @@ -15,89 +15,6 @@ $token_ok = (token_found($arv_config['tokens_dir'], $token) >= 2); $f = 'Archives_HMAP.csv'; - -// Instuments minimum pour pouvoir jouer un morceau -// Ex: au moins flûte 1, clar 1, sax 1, etc. -$instru_oblig = array( - 'Conducteur', - 'Flûte 1', - 'Hautbois 1 ', - 'Clarinette 1 Sib', - 'Clarinette Basse', - 'Sax Alto 1', - 'Sax Ténor 1 ', - 'Sax Baryton', - 'Trompette 1', - 'Cor fa 1 + Mib', - 'Trombone Ut 1', - 'Baryton sib clé de sol', - 'Basse Sib clé de fa', - 'Batterie', - 'Percussion 1', -); - -// Tous les instruments de l'HMAP -// $instru_oblig + piccolo, flûte 2, clar 2/3, sax 2/3, etc. -$instru_hmap = -array( - 'Piccolo', - 'Flûte 2 ', - 'Hautbois 2', - 'Clarinette 2 Sib', - 'Clarinette 3 Sib', - 'Sax Alto 2 ', - 'Sax Alto 3 ', - 'Sax Ténor 2', - 'Bugle 1', - 'Bugle 2', - 'Cornet 1', - 'Cornet 2', - 'Cornet 3', - 'Trompette 2', - 'Trompette 3', - 'Cor fa 2 + Mib', - 'Trombone Ut 2', - 'Tuba sib clé de fa', - 'Euphonium Ut clé de fa', - 'Euph 1 Sib clé de fa + sol', - 'Basse Sib clé de sol', - 'Percussion 2', - 'Timbales', -); - -$instru_hmap = array_merge($instru_hmap, $instru_oblig); - -// Autres instrus -/* - 'Ptte flûte réb', - 'Basson 1', - 'Basson 2', - 'Petite Clarinette Mib', - 'Clarinette Alto', - 'Clarinette Solo', - 'Sax. Soprano', - 'Sax Basse', - 'Cor fa 3 + Mib', - 'Cor fa 4 + Mib', - 'Trombone Ut 3', - 'Trombone Ut 4', - 'Trombone Sib 1 clé fa', - 'Trombone Sib2 Clé fa', - 'Trombone Sib3 clé fa', - 'Trombone Sib 4 clé fa', - 'Trombone sib 1 clé sol', - 'TromboneSib2 clé de sol', - 'Trombone Sib 3 clé de sol', - 'Tuba Ut clé de fa', - 'Euphonium 2 Sib clé de fa', - 'Contrebasse Sib clé de fa', - 'Contrebasse Sib clé de sol', - 'Contrebasse Mib clé de fa', - 'Contrebasse Mib clé de sol', - 'Contrebasse Ut clé de Fa', - 'Divers', -*/ - ?> @@ -168,13 +85,11 @@ ?>

Arvin l'archiviste

@@ -241,11 +156,7 @@ - - $l) - { - $oblig_compt = 0; - $hmap_compt = 0; - for($j=4; $j'; - //if(!$lv) { if($i>=3) break; } } - $oblig_compt = 0; - $hmap_compt = 0; - for($j=4; $j'.(int)(100*$oblig_compt/count($instru_oblig)).'% / '. - (int)(100*$hmap_compt/count($instru_hmap)).'%'; - */ if($token_ok && is_dir($arv_config['docs_dir'].'/'.$l[3])) { echo '
Télécharger
'; } echo "\n"; - - if($lv) - { - echo ''; - //var_dump($l); - echo '
    '; - $oblig_compt = 0; - for($j=4; $j'; - echo $entete[$j]; - if($en_stock) echo ' ('.$l[$j].')'; - echo ''; - } - echo '
'; - - echo '
'; - } - } echo '
'; From bc96ea43c298f355ca939fd9be6a2527fc22baad Mon Sep 17 00:00:00 2001 From: kimicol Date: Sun, 16 Jun 2024 19:10:32 +0200 Subject: [PATCH 2/3] refs 2: Add file listing all instruments --- private/docs/instruments.csv | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 private/docs/instruments.csv diff --git a/private/docs/instruments.csv b/private/docs/instruments.csv new file mode 100644 index 0000000..32a386c --- /dev/null +++ b/private/docs/instruments.csv @@ -0,0 +1,23 @@ +name_fr,name_eng,tune,regex_fr,regex_en +basson,bassoon,ut +batterie,drums, +bugle,flugelhorn,Bb +clarinette,clarinet,A;Bb;Eb +clarinette basse,clarinet bass, +claviers,, +conducteur,, +cor,horn,Eb;F +cornet,cornet,Bb +euphonium,euphonium,Bb;C +flute,flute, +hautbois,oboe, +mallet,, +percussion,,percu(ssion)? +piccolo,piccolo, +saxophone alto,,sax[o|ophone]? alto +saxophone baryton,,sax[o|ophone]? baryton +saxophone tenor,,sax[o|ophone]? tenor +timbales,timballes,,, +trompette,trumpet,Bb;C +trombone,trombone,C +tuba,tuba,Bb;C From fa63eaa8b87c0ea8fa56e8a12777b58794763c2e Mon Sep 17 00:00:00 2001 From: kimicol Date: Thu, 8 Aug 2024 21:57:26 +0200 Subject: [PATCH 3/3] WIP: refs 2: Add options to download all instruments of a program --- index.php | 54 +++++++++++++++++++++++++++++++++++++++++++++++++----- util.php | 24 ++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 5 deletions(-) diff --git a/index.php b/index.php index dee5087..ec70be2 100755 --- a/index.php +++ b/index.php @@ -85,12 +85,15 @@ ?> +

Arvin l'archiviste

@@ -143,6 +146,51 @@
+ +
+ '; + } + ?> + Télécharger toutes les partitions d'un instrument : + + + + + +
+
\n"; } echo ''; - -//echo '

'; - - ?> diff --git a/util.php b/util.php index 464c0a9..1b91da8 100755 --- a/util.php +++ b/util.php @@ -141,4 +141,28 @@ function listing_render_list($listing, $token, $ref, $config, $base='.', $fileba echo ''; } +function get_instruments($csvfilename) +{ + $res = array(); + $line = 1; + $csvfile = fopen($csvfilename, 'r'); + fgetcsv($csvfile); + $entete = fgetcsv($csvfile); + while($line) + { + $line = fgetcsv($csvfile); + if($line[0] != '') + { + $instr = array(); + $instr["name_fr"] = $line[0]; + $intsr["name_en"] = $line[1]; + $instr["tune"] = $line[2]; + $instr["regex_fr"] = $line[3]; + $instr["regex_en"] = $line[4]; + $res[$instr["name_fr"]] = $instr; + } + } + return $res; +} + ?>