diff --git a/VERSIONS b/VERSIONS
index be44ec9b0822f47d125af2c8db94622e553f44fd..0f93afd8ca8980f17254e63fb8ffcce94eb3c3de 100644
--- a/VERSIONS
+++ b/VERSIONS
@@ -1,7 +1,11 @@
+ticket #13837: SIGB Microbib: correction lecture titres contenant le caractère 0xca (°)
+
ticket #13302 :
- Correction du renommage des catégories de RSS.
- On peut déplacer une catégorie de catégorie parente et bibliothèque
+
+
16/06/2014 - v6.45.3
- ticket #13866 : Correction de l'indexation des facettes de domaines pour les sitothèques
- ajout de l'indexation temps réel des sitothèques lors de leur enregistrement.
diff --git a/cosmogramme/tests/php/classes/NoticeIntegrationTest.php b/cosmogramme/tests/php/classes/NoticeIntegrationTest.php
index 2cfb08eda9ca37bd34636a166e49fa397ec7b20c..4d9dd6027ebb686eb90975826c3f00b7bab898a5 100644
--- a/cosmogramme/tests/php/classes/NoticeIntegrationTest.php
+++ b/cosmogramme/tests/php/classes/NoticeIntegrationTest.php
@@ -31,9 +31,16 @@ abstract class NoticeIntegrationTestCase extends ModelTestCase {
$_insert_increment;
+ public function getProfilDonnees() {
+ return $this->_profil_donnees;
+ }
+
+
public function setupProfilDonnees() {
$this->_insert_increment = 12;
+ $this->_profil_donnees = $this->getProfilDonnees();
+
if (!isset($this->_profil_donnees))
return;
@@ -633,6 +640,14 @@ class NoticeIntegrationZanzibarTest extends NoticeIntegrationTestCase {
$this->loadNotice("unimarc_zanzibara");
}
+
+ /** @test */
+ public function subfield200AShouldBeZanzibaraVol8() {
+ $this->assertEquals('Zanzibara, vol. 8',
+ $this->notice_integration->get_subfield('200', 'a')[0]);
+ }
+
+
/** @test */
public function subfield345AShouldBeGAM() {
$this->assertEquals('GAM',
@@ -732,7 +747,7 @@ class NoticeIntegrationLearningWithRenvoisTest extends NoticeIntegrationTestCase
/** @test */
- public function matiersShouldContainsFrey() {
+ public function auteursShouldContainsFrey() {
$this->assertContains('FREY FRAI PIERRE PIER',
$this->notice_integration->noticeToDBEnreg($this->notice_data)['auteurs']);
}
@@ -740,6 +755,89 @@ class NoticeIntegrationLearningWithRenvoisTest extends NoticeIntegrationTestCase
+
+class NoticeIntegrationBearsBeerMicrobibTest extends NoticeIntegrationTestCase {
+ public function getProfilDonnees() {
+ return
+ ['id_profil' => 106,
+ 'libelle' => 'Microbib',
+ 'accents' => '1',
+ 'rejet_periodiques' => '1',
+ 'id_article_periodique' => '2',
+ 'type_fichier' => '0',
+ 'format' => '0',
+ 'attributs' => serialize(
+ [ [
+ 'type_doc' => [
+ [ 'code' => '0', 'label' => '', 'zone_995' => '' ],
+ [ 'code' => '1', 'label' => 'am;as', 'zone_995' => 'az' ],
+ [ 'code' => '2', 'label' => '', 'zone_995' => ''],
+ [ 'code' => '3', 'label' => 'i;j;k', 'zone_995' => ''],
+ [ 'code' => '4', 'label' => 'g','zone_995' => ''],
+ [ 'code' => '5', 'label' => 'l;m', 'zone_995' => ''],
+ [ 'code' => '8', 'label' => '', 'zone_995' => ''],
+ [ 'code' => '9', 'label' => '', 'zone_995' => '' ],
+ [ 'code' => '10', 'label' => '', 'zone_995' => ''],
+ [ 'code' => '9', 'label' => '', 'zone_995' => ''],
+ [ 'code' => '10', 'label' => '', 'zone_995' => '']
+ ],
+ 'champ_code_barres' => 'f',
+ 'champ_cote' => 'k',
+ 'champ_type_doc' => '',
+ 'champ_genre' => 'e',
+ 'champ_section' => 'q',
+ 'champ_emplacement' => 'u',
+ 'champ_annexe' => ''
+ ],
+
+ [ 'champs' => ''],
+ [ 'champs' => ''],
+ [ 'champs' => ''],
+ [ 'champs' => '', 'xml_balise_abonne' => '', 'xml_champs_abonne' => [ 'IDABON' => '',
+ 'ORDREABON' => '',
+ 'NOM' => '',
+ 'PRENOM' => '',
+ 'NAISSANCE' => '',
+ 'PASSWORD' => '',
+ 'MAIL' => '',
+ 'DATE_DEBUT' => '',
+ 'DATE_FIN' => '',
+ 'ID_SIGB' => '' ] ],
+ [ 'zone' => '995', 'champ' => 's', 'format' => '3', 'jours' => '', 'valeurs' => 'nouveaute']
+ ])];
+ }
+
+
+ public function setUp() {
+ parent::setUp();
+ $this->loadNotice("unimarc_bears_beer");
+ }
+
+
+ /** @test */
+ public function auteursShouldContainsBEAULIEUJIMMY() {
+ $this->assertEquals('BEAULIEU BOLI JIMMY JIMI APOSTOLIDES APOSTOLID JEAN JAN MARIE MARI BOSSE BOS SIMON BOUCHARD BOUCHAR GREGOIRE GREGOIR PIERRE PIER BROERSMA MATTHEW MATEW DELPORTE DELPORT JULIE JULI DOYON DOION RIVEST RIVES EKEBOM EKEBON TERHI TERI FORSYTHE FORSIT GENEST CATHERINE KATERIN GIARD JIAR LUC GIRARD JIRAR PASCAL PASKAL GOLDBERG GOLDBER ELEONORE ELEONOR HUBER UB MARKUS MARKU IRIS IRI JOLY JOLI BENOIT BENOI LEMAY LEMAI SYLVAIN SILVIN MUSTURI TOMMI TOMI NYLSO NILSO OBOM OBON PISHIER PICHI RICCI RIKSI STEFANO SAMSON JACQUES JAK DIECK DIEK MARTIN TOM TRAHAN TRAN SEBASTIEN SEBASTIN TURGEON TURJON DAVID DAVI VAYRYNEN VAIRINAN MIKKO MIKO VIAU VIO MICHEL WARD OIR BARNABY BARNABI WIGGERT OUIJER GREGOR ZVIANE ZVIAN',
+ $this->notice_integration->noticeToDBEnreg($this->notice_data)['auteurs']);
+ }
+
+
+ /** @test */
+ public function titlesContainsBEAR() {
+ $this->assertEquals('BEARS BEAR BEER BE FORMULE FORMUL N00 1',
+ $this->notice_integration->noticeToDBEnreg($this->notice_data)['titres']);
+ }
+
+
+ /** @test */
+ public function titleShouldBeBears() {
+ $this->assertEquals('Bears + beer : formule n°1',
+ $this->notice_integration->get_subfield('200', 'a')[0]);
+
+ }
+}
+
+
+
class NoticeIntegrationDimancheALaPiscineTest extends NoticeIntegrationTestCase {
protected $_profil_donnees =
['id_profil' => 111,
diff --git a/library/Class/NoticeUnimarc/Writer.php b/library/Class/NoticeUnimarc/Writer.php
index bd6d15da04809d6eb853605e33af6eaaf983e8cf..ec4e54d51fd9feb95069e88f042e5cf7d188f304 100644
--- a/library/Class/NoticeUnimarc/Writer.php
+++ b/library/Class/NoticeUnimarc/Writer.php
@@ -429,39 +429,39 @@ class Class_NoticeUnimarc_Writer extends Class_NoticeUnimarc {
chr(0xc2).chr(0x61) => 'á',
chr(0xc2).chr(0x65) => 'é',
chr(0xc2).chr(0x69) => 'Ã',
- chr(0xc2).chr(0x6e) => 'ñ', // Rajout
+ chr(0xc2).chr(0x6e) => 'ñ',
chr(0xc2).chr(0x6f) => 'ó',
chr(0xc2).chr(0x75) => 'ú',
chr(0xc2).chr(0x79) => 'ý',
- chr(0xc2).chr(0xb0) => 'C', // Rajout
+ chr(0xc2).chr(0xb0) => 'C',
chr(0xc3).chr(0x41) => 'Â',
chr(0xc3).chr(0x45) => 'Ê',
chr(0xc3).chr(0x49) => 'ÃŽ',
chr(0xc3).chr(0x4f) => 'Ô',
chr(0xc3).chr(0x55) => 'Û',
chr(0xc3).chr(0x61) => 'â',
- chr(0xc3).chr(0x63) => 'E', // Rajout
- chr(0xc3).chr(0x64) => 'É', // Rajout
+ chr(0xc3).chr(0x63) => 'E',
+ chr(0xc3).chr(0x64) => 'É',
chr(0xc3).chr(0x65) => 'ê',
- chr(0xc3).chr(0x67) => 'E', // Rajout
+ chr(0xc3).chr(0x67) => 'E',
chr(0xc3).chr(0x69) => 'î',
chr(0xc3).chr(0x6f) => 'ô',
chr(0xc3).chr(0x75) => 'û',
- chr(0xc3).chr(0x8a) => 'E', // Rajout
- chr(0xc3).chr(0xa9) => 'é', // Rajout
- chr(0xc3).chr(0xa8) => 'è', // Rajout
- chr(0xc3).chr(0xa7) => 'ç', // Rajout
- chr(0xc3).chr(0xa0) => 'Ã ', // Rajout
- chr(0xc3).chr(0xa2) => 'â', // Rajout
- chr(0xc3).chr(0xab) => 'ë', // Rajout
- chr(0xc3).chr(0xaa) => 'ê', // Rajout
- chr(0xc3).chr(0x80) => 'Ã ', // Rajout
- chr(0xc3).chr(0x82) => 'A', // Rajout
- chr(0xc3).chr(0x87) => 'C', // Rajout
- chr(0xc3).chr(0xb4) => 'ô', // Rajout
- chr(0xc3).chr(0xbb) => 'û', // Rajout
- chr(0xc3).chr(0xaf) => 'ï', // Rajout
- chr(0xc3).chr(0xae) => 'î', // Rajout
+ chr(0xc3).chr(0x8a) => 'E',
+ chr(0xc3).chr(0xa9) => 'é',
+ chr(0xc3).chr(0xa8) => 'è',
+ chr(0xc3).chr(0xa7) => 'ç',
+ chr(0xc3).chr(0xa0) => 'Ã ',
+ chr(0xc3).chr(0xa2) => 'â',
+ chr(0xc3).chr(0xab) => 'ë',
+ chr(0xc3).chr(0xaa) => 'ê',
+ chr(0xc3).chr(0x80) => 'Ã ',
+ chr(0xc3).chr(0x82) => 'A',
+ chr(0xc3).chr(0x87) => 'C',
+ chr(0xc3).chr(0xb4) => 'ô',
+ chr(0xc3).chr(0xbb) => 'û',
+ chr(0xc3).chr(0xaf) => 'ï',
+ chr(0xc3).chr(0xae) => 'î',
chr(0xc4).chr(0x41) => 'Ã',
chr(0xc4).chr(0x4e) => 'Ñ',
chr(0xc4).chr(0x4f) => 'Õ',
@@ -470,27 +470,28 @@ class Class_NoticeUnimarc_Writer extends Class_NoticeUnimarc {
chr(0xc4).chr(0x6f) => 'õ',
chr(0xc8).chr(0x45) => 'Ë',
chr(0xc8).chr(0x49) => 'Ã',
- chr(0xc8).chr(0x61) => 'ä', // rajout
+ chr(0xc8).chr(0x61) => 'ä',
chr(0xc8).chr(0x65) => 'ë',
chr(0xc8).chr(0x69) => 'ï',
- chr(0xc8).chr(0x6f) => 'ö', // rajout
- chr(0xc8).chr(0x75) => 'ü', // rajout
+ chr(0xc8).chr(0x6f) => 'ö',
+ chr(0xc8).chr(0x75) => 'ü',
chr(0xc8).chr(0x79) => 'ÿ',
chr(0xc9).chr(0x41) => 'Ä',
chr(0xc9).chr(0x4f) => 'Ö',
chr(0xc9).chr(0x55) => 'Ü',
chr(0xc9).chr(0x61) => 'ä',
- chr(0xc9).chr(0x65) => 'ë', // Rajout
- chr(0xc9).chr(0x69) => 'ï', // Rajout
+ chr(0xc9).chr(0x65) => 'ë',
+ chr(0xc9).chr(0x69) => 'ï',
chr(0xc9).chr(0x6f) => 'ö',
chr(0xc9).chr(0x75) => 'ü',
- chr(0xc9).chr(0x79) => 'ÿ', // Rajout
+ chr(0xc9).chr(0x79) => 'ÿ',
chr(0xca).chr(0x41) => 'Ã…',
chr(0xca).chr(0x61) => 'Ã¥',
- chr(0xca).chr(0x30) => '°', // Rajout
- chr(0xca).chr(0x20) => '°', // Rajout
+ chr(0xca).chr(0x30) => '°',
+ chr(0xca).chr(0x20) => '°',
chr(0xd0).chr(0x43) => 'Ç',
chr(0xd0).chr(0x63) => 'ç',
+ chr(0xca) => '°',
chr(0xe1) =>'Æ',
chr(0xe2) =>'Ã',
chr(0xe9) =>'Ø',
@@ -698,39 +699,39 @@ class Class_NoticeUnimarc_Writer extends Class_NoticeUnimarc {
chr(0xe2).chr(0x61) => 'á',
chr(0xe2).chr(0x65) => 'é',
chr(0xe2).chr(0x69) => 'Ã',
- chr(0xe2).chr(0x6e) => 'ñ', // Rajout
+ chr(0xe2).chr(0x6e) => 'ñ',
chr(0xe2).chr(0x6f) => 'ó',
chr(0xe2).chr(0x75) => 'ú',
chr(0xe2).chr(0x79) => 'ý',
- chr(0xe2).chr(0xb0) => 'C', // Rajout
+ chr(0xe2).chr(0xb0) => 'C',
chr(0xe3).chr(0x41) => 'Â',
chr(0xe3).chr(0x45) => 'Ê',
chr(0xe3).chr(0x49) => 'ÃŽ',
chr(0xe3).chr(0x4f) => 'Ô',
chr(0xe3).chr(0x55) => 'Û',
chr(0xe3).chr(0x61) => 'â',
- chr(0xe3).chr(0x63) => 'E', // Rajout
- chr(0xe3).chr(0x64) => 'É', // Rajout
+ chr(0xe3).chr(0x63) => 'E',
+ chr(0xe3).chr(0x64) => 'É',
chr(0xe3).chr(0x65) => 'ê',
- chr(0xe3).chr(0x67) => 'E', // Rajout
+ chr(0xe3).chr(0x67) => 'E',
chr(0xe3).chr(0x69) => 'î',
chr(0xe3).chr(0x6f) => 'ô',
chr(0xe3).chr(0x75) => 'û',
- chr(0xe3).chr(0x8a) => 'E', // Rajout
- chr(0xe3).chr(0xa9) => 'é', // Rajout
- chr(0xe3).chr(0xa8) => 'è', // Rajout
- chr(0xe3).chr(0xa7) => 'ç', // Rajout
- chr(0xe3).chr(0xa0) => 'Ã ', // Rajout
- chr(0xe3).chr(0xa2) => 'â', // Rajout
- chr(0xe3).chr(0xab) => 'ë', // Rajout
- chr(0xe3).chr(0xaa) => 'ê', // Rajout
- chr(0xe3).chr(0x80) => 'Ã ', // Rajout
- chr(0xe3).chr(0x82) => 'A', // Rajout
- chr(0xe3).chr(0x87) => 'C', // Rajout
- chr(0xe3).chr(0xb4) => 'ô', // Rajout
- chr(0xe3).chr(0xbb) => 'û', // Rajout
- chr(0xe3).chr(0xaf) => 'ï', // Rajout
- chr(0xe3).chr(0xae) => 'î', // Rajout
+ chr(0xe3).chr(0x8a) => 'E',
+ chr(0xe3).chr(0xa9) => 'é',
+ chr(0xe3).chr(0xa8) => 'è',
+ chr(0xe3).chr(0xa7) => 'ç',
+ chr(0xe3).chr(0xa0) => 'Ã ',
+ chr(0xe3).chr(0xa2) => 'â',
+ chr(0xe3).chr(0xab) => 'ë',
+ chr(0xe3).chr(0xaa) => 'ê',
+ chr(0xe3).chr(0x80) => 'Ã ',
+ chr(0xe3).chr(0x82) => 'A',
+ chr(0xe3).chr(0x87) => 'C',
+ chr(0xe3).chr(0xb4) => 'ô',
+ chr(0xe3).chr(0xbb) => 'û',
+ chr(0xe3).chr(0xaf) => 'ï',
+ chr(0xe3).chr(0xae) => 'î',
chr(0xe4).chr(0x41) => 'Ã',
chr(0xe4).chr(0x4e) => 'Ñ',
chr(0xe4).chr(0x4f) => 'Õ',
@@ -739,11 +740,11 @@ class Class_NoticeUnimarc_Writer extends Class_NoticeUnimarc {
chr(0xe4).chr(0x6f) => 'õ',
chr(0xe8).chr(0x45) => 'Ë',
chr(0xe8).chr(0x49) => 'Ã',
- chr(0xe8).chr(0x61) => 'ä', // rajout
+ chr(0xe8).chr(0x61) => 'ä',
chr(0xe8).chr(0x65) => 'ë',
chr(0xe8).chr(0x69) => 'ï',
- chr(0xe8).chr(0x6f) => 'ö', // rajout
- chr(0xe8).chr(0x75) => 'ü', // rajout
+ chr(0xe8).chr(0x6f) => 'ö',
+ chr(0xe8).chr(0x75) => 'ü',
chr(0xe8).chr(0x79) => 'ÿ',
chr(0xea).chr(0x41) => 'Ã…',
chr(0xea).chr(0x61) => 'Ã¥',