Merge branch 'hotline-master'

VERSIONS_HOTLINE/merge_fix_on_patch_250

+ - hotine : correction du patch 250.php
\ No newline at end of file

cosmogramme/php/_init.php

@@ -2,7 +2,7 @@
 // Constantes
 error_reporting(E_ERROR | E_PARSE);
 
-define("PATCH_LEVEL","253");
+define("PATCH_LEVEL","254");
 
 define("APPLI","cosmogramme");
 define("COSMOPATH", "/var/www/html/vhosts/opac2/www/htdocs");

cosmogramme/sql/patch/patch_250.php

 <?php
-$adapter = Zend_Db_Table::getDefaultAdapter();
-$adapter->query("UPDATE variables SET liste = '$format_liste' WHERE clef = 'import_format'");
 ?>
\ No newline at end of file

cosmogramme/sql/patch/patch_253.php

 <?php
 $adapter = Zend_Db_Table::getDefaultAdapter();
-$adapter->query('alter table notices_articles modify clef_chapeau varchar(100) NULL');
-$adapter->query('alter table notices_articles modify clef_numero varchar(20) NULL');
-$adapter->query('alter table notices_articles modify clef_article varchar(20) NULL');
-$adapter->query('alter table notices_articles modify clef_unimarc varchar(15) NULL');
-$adapter->query('alter table notices_articles modify unimarc text NULL');
-$adapter->query('alter table notices_articles modify date_maj varchar(20) NULL');
-$adapter->query('alter table notices_articles modify qualite tinyint(4) NULL');
+$format_liste = "0:Unimarc\r\n1:Ascii tabulé\r\n2:Ascii séparé par des points-virgule\r\n3:Ascii séparé par des \"|\"\r\n4:Xml\r\n5:CSV\r\n6:Marc21\r\n";
+$adapter->query("UPDATE variables SET liste = '$format_liste' WHERE clef = 'import_format'");
 ?>
\ No newline at end of file

cosmogramme/sql/patch/patch_254.php

+<?php
+$adapter = Zend_Db_Table::getDefaultAdapter();
+$adapter->query('alter table notices_articles modify clef_chapeau varchar(100) NULL');
+$adapter->query('alter table notices_articles modify clef_numero varchar(20) NULL');
+$adapter->query('alter table notices_articles modify clef_article varchar(20) NULL');
+$adapter->query('alter table notices_articles modify clef_unimarc varchar(15) NULL');
+$adapter->query('alter table notices_articles modify unimarc text NULL');
+$adapter->query('alter table notices_articles modify date_maj varchar(20) NULL');
+$adapter->query('alter table notices_articles modify qualite tinyint(4) NULL');
+?>
\ No newline at end of file