diff --git a/cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/IntegrationControllerTest.php b/cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/IntegrationControllerTest.php
index 07b8972cdb9f3681966dfd771367ae788e00ff97..bfa86a10728f6bd5dfb31eb129735faaa898fd22 100644
--- a/cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/IntegrationControllerTest.php
+++ b/cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/IntegrationControllerTest.php
@@ -36,7 +36,7 @@ abstract class Cosmo_IntegrationControllerControlActionTestCase extends CosmoCon
parent::setUp();
Class_IntBib::beVolatile();
Class_Cosmogramme_Integration::beVolatile();
- Class_Cosmogramme_ProfilDonnees::beVolatile();
+ Class_IntProfilDonnees::beVolatile();
$this->file_system = $this->mock();
Class_Cosmogramme_Integration::setFileSystem($this->file_system);
@@ -80,7 +80,7 @@ class Cosmo_IntegrationControllerControlActionWithBibTest extends Cosmo_Integrat
->whenCalled('filesize')->answers(1024)
;
- $profil = $this->fixture('Class_Cosmogramme_ProfilDonnees',
+ $profil = $this->fixture('Class_IntProfilDonnees',
['id' => 1,
'type_fichier' => 1]);
diff --git a/library/Class/Cosmogramme/Integration.php b/library/Class/Cosmogramme/Integration.php
index 1be05660c303d996352eb944967d96b18925d555..4845303f9e84129c01d74f11001d67f0ae4328e1 100644
--- a/library/Class/Cosmogramme/Integration.php
+++ b/library/Class/Cosmogramme/Integration.php
@@ -34,7 +34,7 @@ class Class_Cosmogramme_Integration extends Storm_Model_Abstract {
'role' => 'int_bib',
'referenced_in' => 'id_bib'],
- 'profil_donnees' => ['model' => 'Class_Cosmogramme_ProfilDonnees',
+ 'profil_donnees' => ['model' => 'Class_IntProfilDonnees',
'role' => 'integration',
'referenced_in' => 'profil']];
diff --git a/library/Class/Cosmogramme/Integration/PhasePanier.php b/library/Class/Cosmogramme/Integration/PhasePanier.php
index 033b75bfb46306dd48acdffb05395d68f1c2614e..372403a47a3f092c01f581dc94f07fd172a8b248 100644
--- a/library/Class/Cosmogramme/Integration/PhasePanier.php
+++ b/library/Class/Cosmogramme/Integration/PhasePanier.php
@@ -27,6 +27,14 @@ class Class_Cosmogramme_Integration_PhasePanier extends Class_Cosmogramme_Integr
protected function _init($new_phase) {}
protected function _processLine($line, $integration) {
+ $line->withDataDo(
+ function($data) {
+ $this->importBasketRecord(str_getcsv($data));
+ });
+ }
+
+
+ protected function importBasketRecord($datas) {
}
diff --git a/library/Class/Cosmogramme/Integration/PhaseReservation.php b/library/Class/Cosmogramme/Integration/PhaseReservation.php
index 8e27ee9fe83f85feddff0dff7d890552dc6451cb..45da9466e8feefb4608f16f04969437f012a6c4c 100644
--- a/library/Class/Cosmogramme/Integration/PhaseReservation.php
+++ b/library/Class/Cosmogramme/Integration/PhaseReservation.php
@@ -31,10 +31,7 @@ class Class_Cosmogramme_Integration_PhaseReservation extends Class_Cosmogramme_I
protected function _processLine($line, $integration) {
$transaction = new Class_Cosmogramme_Integration_Transaction($integration);
- $line->withDataDo(
- function($data) use ($transaction) {
- $transaction->importHold($data);
- });
+ $line->withDataDo([$transaction, 'importHold']);
}
@@ -44,11 +41,12 @@ class Class_Cosmogramme_Integration_PhaseReservation extends Class_Cosmogramme_I
protected function _shouldIgnoreLine($line, $integration) {
- $is_pergame_header = function($data) {
- return substr($data, 0, 13) == 'BIB_T_RESERVE';
- };
+ return $line->withDataDo([$this, 'isPergameHeader']);
+ }
+
- return ($line->withDataDo($is_pergame_header));
+ public function isPergameHeader($data) {
+ return substr($data, 0, 13) == 'BIB_T_RESERVE';
}
}
diff --git a/library/Class/Cosmogramme/ProfilDonnees.php b/library/Class/Cosmogramme/ProfilDonnees.php
deleted file mode 100644
index edd76a2a13672929d0e677f397bd2ee360b106c8..0000000000000000000000000000000000000000
--- a/library/Class/Cosmogramme/ProfilDonnees.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012-2014, Agence Française Informatique (AFI). All rights reserved.
- *
- * BOKEH is free software; you can redistribute it and/or modify
- * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
- * the Free Software Foundation.
- *
- * There are special exceptions to the terms and conditions of the AGPL as it
- * is applied to this software (see README file).
- *
- * BOKEH is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
- * along with BOKEH; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-class Class_Cosmogramme_ProfilDonnees extends Storm_Model_Abstract {
- const FILE_TYPE_RECORDS = 0;
- const FILE_TYPE_USERS = 1;
- const FILE_TYPE_LOANS = 2;
- const FILE_TYPE_HOLDS = 3;
-
- protected $_table_name = 'profil_donnees';
- protected $_table_primary = 'id_profil';
-
- public function isHolds() {
- return self::FILE_TYPE_HOLDS == $this->getTypeFichier();
- }
-}
-?>
\ No newline at end of file
diff --git a/library/Class/IntProfilDonnees.php b/library/Class/IntProfilDonnees.php
index 1d38b8d0dd994b21139548f11d021f3b09befb4a..b266e297b01fb601b08f9acadfc81516d6cb3a45 100644
--- a/library/Class/IntProfilDonnees.php
+++ b/library/Class/IntProfilDonnees.php
@@ -439,6 +439,12 @@ class Class_IntProfilDonnees extends Storm_Model_Abstract {
$config[0]['champ_availability'] = $value;
return $this->setAttributs($config);
}
+
+
+
+ public function isHolds() {
+ return self::FT_HOLDS == $this->getTypeFichier();
+ }
}
?>
\ No newline at end of file
diff --git a/tests/library/Class/Cosmogramme/Integration/PhasePanierTest.php b/tests/library/Class/Cosmogramme/Integration/PhasePanierTest.php
index 68baf48c9ef340f11c9735b7be0b8719b08db6b6..e6af8cf5fbce5d69095a2fa043818f5cea22f678 100644
--- a/tests/library/Class/Cosmogramme/Integration/PhasePanierTest.php
+++ b/tests/library/Class/Cosmogramme/Integration/PhasePanierTest.php
@@ -65,7 +65,7 @@ class PhasePanierTest extends Class_Cosmogramme_Integration_PhaseTestCase {
$this->fixture('Class_Cosmogramme_Integration',
['id' => 123,
'bib' => Class_IntBib::find(2),
- 'profil_donnees' => Class_Cosmogramme_ProfilDonnees::find(102),
+ 'profil_donnees' => Class_IntProfilDonnees::find(102),
'type_operation' => Class_Cosmogramme_Integration::TYPE_OPERATION_TOTAL,
'traite' => 'non',
'fichier' => 'baskets.txt',
diff --git a/tests/library/Class/Cosmogramme/Integration/PhaseReservationTest.php b/tests/library/Class/Cosmogramme/Integration/PhaseReservationTest.php
index fe245551df970365c626836af978cb4a9221023b..a8c0511ce1d782463dea3bfbd9064c52efd0dd00 100644
--- a/tests/library/Class/Cosmogramme/Integration/PhaseReservationTest.php
+++ b/tests/library/Class/Cosmogramme/Integration/PhaseReservationTest.php
@@ -52,11 +52,11 @@ abstract class PhaseReservationTestCase extends Class_Cosmogramme_Integration_Ph
'nom_court' => 'Annexe 2',
'sigb' => 1]);
- $profil = $this->fixture('Class_Cosmogramme_ProfilDonnees',
+ $profil = $this->fixture('Class_IntProfilDonnees',
['id' => 102,
'libelle' => 'Réservations Pergame',
'accents' => 2,
- 'type_fichier' => Class_Cosmogramme_ProfilDonnees::FILE_TYPE_HOLDS,
+ 'type_fichier' => Class_IntProfilDonnees::FT_HOLDS,
'format' => 3,
'attributs' => 'a:4:{i:0;a:6:{s:8:"type_doc";a:11:{i:0;a:3:{s:4:"code";s:1:"0";s:5:"label";s:0:"";s:8:"zone_995";s:0:"";}i:1;a:3:{s:4:"code";s:1:"1";s:5:"label";s:5:"am;na";s:8:"zone_995";s:6:"LIV;MS";}i:2;a:3:{s:4:"code";s:1:"2";s:5:"label";s:2:"as";s:8:"zone_995";s:3:"PER";}i:3;a:3:{s:4:"code";s:1:"3";s:5:"label";s:3:"i;j";s:8:"zone_995";s:17:"CD;LIVCD;LIVK7;K7";}i:4;a:3:{s:4:"code";s:1:"4";s:5:"label";s:1:"g";s:8:"zone_995";s:20:"DIAPO;DVD;VHS;VHD;VD";}i:5;a:3:{s:4:"code";s:1:"5";s:5:"label";s:3:"l;m";s:8:"zone_995";s:3:"CDR";}i:6;a:3:{s:4:"code";s:1:"6";s:5:"label";s:3:"c;d";s:8:"zone_995";s:3:"MM;";}i:7;a:3:{s:4:"code";s:1:"7";s:5:"label";s:3:"f;k";s:8:"zone_995";s:21:"PHOTO;EST;EKTA;CPL;CP";}i:8;a:3:{s:4:"code";s:1:"8";s:5:"label";s:0:"";s:8:"zone_995";s:3:"DOS";}i:9;a:3:{s:4:"code";s:1:"9";s:5:"label";s:0:"";s:8:"zone_995";s:0:"";}i:10;a:3:{s:4:"code";s:2:"10";s:5:"label";s:0:"";s:8:"zone_995";s:6:"WEB;MF";}}s:17:"champ_code_barres";s:1:"f";s:11:"champ_genre";s:0:"";s:13:"champ_section";s:1:"q";s:17:"champ_emplacement";s:1:"u";s:12:"champ_annexe";s:1:"a";}i:1;a:1:{s:6:"champs";s:63:"ID_PERGAME;IDABON;ORDREABON;SUPPORT;ID_NOTICE_ORIGINE;DATE_RESA";}i:2;a:1:{s:6:"champs";s:63:"ID_PERGAME;IDABON;ORDREABON;SUPPORT;ID_NOTICE_ORIGINE;DATE_RESA";}i:3;a:1:{s:6:"champs";s:63:"ID_PERGAME;IDABON;ORDREABON;SUPPORT;ID_NOTICE_ORIGINE;DATE_RESA";}}']);
@@ -117,7 +117,7 @@ class PhaseReservationCallBackBeforeLastTest
$this->_integration = $this->fixture('Class_Cosmogramme_Integration',
['id' => 22331,
'bib' => Class_IntBib::find(2),
- 'profil_donnees' => Class_Cosmogramme_ProfilDonnees::find(102),
+ 'profil_donnees' => Class_IntProfilDonnees::find(102),
'type_operation' => Class_Cosmogramme_Integration::TYPE_OPERATION_TOTAL,
'traite' => 'non',
'fichier' => 'holds.txt',
@@ -180,7 +180,7 @@ class PhaseReservationValidCronFirstRunTest extends PhaseReservationTestCase {
$this->fixture('Class_Cosmogramme_Integration',
['id' => 22331,
'bib' => Class_IntBib::find(2),
- 'profil_donnees' => Class_Cosmogramme_ProfilDonnees::find(102),
+ 'profil_donnees' => Class_IntProfilDonnees::find(102),
'type_operation' => Class_Cosmogramme_Integration::TYPE_OPERATION_TOTAL,
'traite' => 'non',
'fichier' => 'holds.txt',