diff --git a/library/Class/CodifAnnexe.php b/library/Class/CodifAnnexe.php
index 3432f21f05eb0b8db3ad4643fadc553c884b911d..710e05eae8da3d30dad752dc445be0ec125da2f5 100644
--- a/library/Class/CodifAnnexe.php
+++ b/library/Class/CodifAnnexe.php
@@ -19,6 +19,24 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+class CodifAnnexeLoader extends Storm_Model_Loader {
+ public function findAllByPickup() {
+ return Class_CodifAnnexe::findAllBy(['no_pickup' => '0',
+ 'order' => 'libelle']);
+ }
+
+
+ public function findLibelleByCode($code) {
+ return (($annexe = Class_CodifAnnexe::findFirstBy(['code' => $code]))
+ || ($annexe = Class_CodifAnnexe::findFirstBy(['id_origine' => $code])))
+ ? $annexe->getLibelle()
+ : '';
+ }
+
+}
+
+
+
class Class_CodifAnnexe extends Storm_Model_Abstract {
use Trait_Translator;
@@ -27,6 +45,7 @@ class Class_CodifAnnexe extends Storm_Model_Abstract {
protected
$_table_name = 'codif_annexe',
$_table_primary = 'id_annexe',
+ $_loader_class = 'CodifAnnexeLoader',
$_default_attribute_values = ['libelle' => '',
'id_bib' => 0,
'id_origine' => '',
@@ -40,19 +59,6 @@ class Class_CodifAnnexe extends Storm_Model_Abstract {
'int_bib' => ['through' => 'bib']];
- public static function findAllByPickup() {
- return self::getLoader()->findAllBy(array('no_pickup' => '0',
- 'order' => 'libelle'));
- }
-
-
- public static function findLibelleByCode($code) {
- return
- ($annexe = self::getLoader()->findFirstBy(['code' => $code]))
- ? $annexe->getLibelle()
- : '';
- }
-
public function getMailIntBib() {
return $this->getIntBib()->getMail();
diff --git a/library/Class/CommSigb.php b/library/Class/CommSigb.php
index d9a0568d7b1ed37a5bba805d9ff236e268a33e0d..cf96df07565cc7f5ca0bf61c304201163785ba6f 100644
--- a/library/Class/CommSigb.php
+++ b/library/Class/CommSigb.php
@@ -77,7 +77,7 @@ class Class_CommSigb {
if (!$code_annexe = $sigb_exemplaire->getCodeAnnexe())
return $exemplaire;
- if ($annexe = Class_CodifAnnexe::findFirstBy(['code' => $code_annexe]))
+ if ($annexe = Class_CodifAnnexe::findFirstBy(['id_origine' => $code_annexe]))
$exemplaire->setIdBib($annexe->getIdBib());
return $exemplaire;
diff --git a/library/Class/WebService/SIGB/Dynix/LookupMyAccountInfoResponseReader.php b/library/Class/WebService/SIGB/Dynix/LookupMyAccountInfoResponseReader.php
index 95c0621ebc3e5f20e63974cdc9d5839f4d08e02c..30f94409cad992e27d813d62296590179208cf62 100644
--- a/library/Class/WebService/SIGB/Dynix/LookupMyAccountInfoResponseReader.php
+++ b/library/Class/WebService/SIGB/Dynix/LookupMyAccountInfoResponseReader.php
@@ -16,7 +16,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
class Class_WebService_SIGB_Dynix_LookupMyAccountInfoResponseReader {
@@ -103,20 +103,18 @@ class Class_WebService_SIGB_Dynix_LookupMyAccountInfoResponseReader {
}
}
-
+
public function endHoldKey($data) {
$this->_current_operation->setId($data);
}
public function endCheckoutLibraryId($data) {
- if ($annexe = Class_CodifAnnexe::findFirstBy(['code' => $data]))
- $this->_current_operation->setBibliotheque($annexe->getLibelle());
+ $this->_current_operation->setBibliotheque(Class_CodifAnnexe::findLibelleByCode($data));
}
public function endPickupLibraryID($data) {
- if ($annexe = Class_CodifAnnexe::findFirstBy(['code' => $data]))
- $this->_current_operation->setBibliotheque($annexe->getLibelle());
+ $this->endCheckoutLibraryId($data);
}
}
diff --git a/library/Class/WebService/SIGB/Dynix/Service.php b/library/Class/WebService/SIGB/Dynix/Service.php
index 30919822f984a8913f1fda372b11f90c9f9302af..a46fbe1aa98aa0cb5110b5a1361e65fa75a18707 100644
--- a/library/Class/WebService/SIGB/Dynix/Service.php
+++ b/library/Class/WebService/SIGB/Dynix/Service.php
@@ -130,11 +130,10 @@ class Class_Webservice_SIGB_Dynix_Service extends Class_WebService_SIGB_Abstract
protected function _reserverParMail($user, $exemplaire, $code_annexe) {
$mail = new ZendAfi_Mail();
try {
- $annexe = Class_CodifAnnexe::findFirstBy(['code' => $code_annexe]);
$mail->setFrom(Class_CosmoVar::get('mail_admin'))
->addTo($this->_mail_bib[$exemplaire->getAnnexe()])
->setSubject('Demande de Reservation')
- ->setBodyText($this->_buildMailBody($user, $exemplaire, $annexe))
+ ->setBodyText($this->_buildMailBody($user, $exemplaire, $code_annexe))
->send();
} catch (Exception $e) {
return ['statut' => false, 'erreur' => $e->getMessage()];
@@ -143,7 +142,7 @@ class Class_Webservice_SIGB_Dynix_Service extends Class_WebService_SIGB_Abstract
}
- protected function _buildMailBody($user, $exemplaire, $annexe) {
+ protected function _buildMailBody($user, $exemplaire, $code_annexe) {
$content = "Bonjour,\n\n";
$content .= sprintf("%s, %s (N° : %s) désire réserver le document suivant : \n",
$user->getNom(), $user->getPrenom(), $user->getIdabon());
@@ -154,7 +153,7 @@ class Class_Webservice_SIGB_Dynix_Service extends Class_WebService_SIGB_Abstract
$content .= "Auteur : ".$exemplaire->getAuteurPrincipal()."\n";
$content .= "Editeur : ".$exemplaire->getEditeur()."\n";
$content .= "Collection : ".$exemplaire->getCollectionPrincipale()."\n\n";
- $content .= "Lieu de retrait : ".$annexe->getLibelle()."\n";
+ $content .= "Lieu de retrait : ".Class_CodifAnnexe::findLibelleByCode($code_annexe)."\n";
$content .= "Adresse e-mail : ".$user->getMail();
return $content;
}
diff --git a/library/Class/WebService/SIGB/Emprunteur.php b/library/Class/WebService/SIGB/Emprunteur.php
index f47b55e7e1470f04013879c8bbcdc4c7601c5391..29497a33adabe3b335dba288ed57df25e232431d 100644
--- a/library/Class/WebService/SIGB/Emprunteur.php
+++ b/library/Class/WebService/SIGB/Emprunteur.php
@@ -597,7 +597,7 @@ class Class_WebService_SIGB_Emprunteur {
public function getLibrary() {
- return ($library = Class_CodifAnnexe::findFirstBy(['code' => $this->_library_code]))
+ return ($library = Class_CodifAnnexe::findFirstBy(['id_origine' => $this->_library_code]))
? $library
: Class_CodifAnnexe::newInstance();
}
diff --git a/library/Class/WebService/SIGB/Koha/PatronInfoReader.php b/library/Class/WebService/SIGB/Koha/PatronInfoReader.php
index a85b69b5fab211f6be9a5385e59ac4afbb12dab5..63d4de0b460bbd0580bc2263718e5bd2c1259510 100644
--- a/library/Class/WebService/SIGB/Koha/PatronInfoReader.php
+++ b/library/Class/WebService/SIGB/Koha/PatronInfoReader.php
@@ -106,7 +106,7 @@ class Class_WebService_SIGB_Koha_PatronInfoReader extends Class_WebService_SIGB_
protected function findSite($code) {
$code = trim($code);
- if (!$code || !($site = Class_CodifAnnexe::findFirstBy(['code' => $code])))
+ if (!$code || !($site = Class_CodifAnnexe::findFirstBy(['id_origine' => $code])))
return;
return $site;
}
diff --git a/library/Class/WebService/SIGB/Koha/SuggestionsReader.php b/library/Class/WebService/SIGB/Koha/SuggestionsReader.php
index fa8a43cea3a68b3ee37970654764c593709fa576..c04a74dd103c98eeb73559adb90a19b1fec88383 100644
--- a/library/Class/WebService/SIGB/Koha/SuggestionsReader.php
+++ b/library/Class/WebService/SIGB/Koha/SuggestionsReader.php
@@ -30,19 +30,15 @@ class Class_WebService_SIGB_Koha_SuggestionsReader {
protected function _parseOne($data) {
- $library = Class_CodifAnnexe::findFirstBy(['code' => $data->branchcodesuggestedby]);
- $suggestion = new Class_WebService_SIGB_Suggestion();
- $suggestion
+ return (new Class_WebService_SIGB_Suggestion())
->setTitle(trim($data->title))
->setAuthor(trim($data->author))
->setPublicationYear(in_array($data->publicationyear, ['', '0']) ?
'' : $data->publicationyear)
- ->setLibrary($library ? $library->getLibelle() : '')
+ ->setLibrary(Class_CodifAnnexe::findLibelleByCode($data->branchcodesuggestedby))
->setDate(trim($data->suggesteddate))
->setNote(trim($data->note))
->setStatus($this->_statusLabelFor($data));
-
- return $suggestion;
}
diff --git a/library/Class/WebService/SIGB/Nanook/GetRecordsResponseReader.php b/library/Class/WebService/SIGB/Nanook/GetRecordsResponseReader.php
index 6c9741bfec28e5d5e9f4225993258d8997aa5a63..46380ca7986c13cef307ebf29fa908fdb9bec307 100644
--- a/library/Class/WebService/SIGB/Nanook/GetRecordsResponseReader.php
+++ b/library/Class/WebService/SIGB/Nanook/GetRecordsResponseReader.php
@@ -16,7 +16,7 @@
*
* 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
class Class_WebService_SIGB_Nanook_GetRecordsResponseReader {
@@ -140,14 +140,14 @@ class Class_WebService_SIGB_Nanook_GetRecordsResponseReader {
* @param string $data
*/
public function endLocationId($data) {
- if ($annexe = Class_CodifAnnexe::getLoader()->findFirstBy(array('code' => $data)))
+ if ($annexe = Class_CodifAnnexe::findFirstBy(['id_origine' => $data]))
$this->_current_item->setCodeAnnexe($annexe->getIdBib());
- else
+ else
$this->_current_item->setCodeAnnexe((int)$data);
}
- /**
+ /**
* @param string $data
*/
public function endActivityMessage($data) {
diff --git a/library/Class/WebService/SIGB/Nanook/Service.php b/library/Class/WebService/SIGB/Nanook/Service.php
index c61bcdfe0b81d924cb2141d1350970c84ccfe9e9..8fe6ece3ecf8340873abb6bf5a3409ad848e38aa 100644
--- a/library/Class/WebService/SIGB/Nanook/Service.php
+++ b/library/Class/WebService/SIGB/Nanook/Service.php
@@ -128,13 +128,12 @@ class Class_Webservice_SIGB_Nanook_Service extends Class_WebService_SIGB_Abstrac
*/
public function reserverExemplaire($user, $exemplaire, $code_bib_or_annexe) {
$code_annexe = $code_bib_or_annexe;
- if ($annexe = Class_CodifAnnexe::getLoader()->findFirstBy(array('id_bib' => $code_bib_or_annexe)))
- $code_annexe = $annexe->getCode();
+ if ($annexe = Class_CodifAnnexe::findFirstBy(['id_bib' => $code_bib_or_annexe]))
+ $code_annexe = $annexe->getIdOrigine();
- return $this->ilsdiHoldTitle(
- array('bibId' => $exemplaire->getIdOrigine(),
- 'patronId' => $user->getIdSigb(),
- 'pickupLocation' => $code_annexe));
+ return $this->ilsdiHoldTitle(['bibId' => $exemplaire->getIdOrigine(),
+ 'patronId' => $user->getIdSigb(),
+ 'pickupLocation' => $code_annexe]);
}
diff --git a/library/Class/WebService/SIGB/Orphee/GetLstRsvResponseReader.php b/library/Class/WebService/SIGB/Orphee/GetLstRsvResponseReader.php
index c3deac44223f5153b5bc90bdb750220560a3d6c7..106e0f054cc97bcf9311d7152c29fa38237d542b 100644
--- a/library/Class/WebService/SIGB/Orphee/GetLstRsvResponseReader.php
+++ b/library/Class/WebService/SIGB/Orphee/GetLstRsvResponseReader.php
@@ -110,8 +110,7 @@ class Class_WebService_SIGB_Orphee_GetLstRsvResponseReader extends Class_WebServ
public function endAnx_Nxt($data) {
- if ($annexe = Class_CodifAnnexe::findFirstBy(['code' => $data]))
- $this->_current_reservation->setBibliotheque($annexe->getLibelle());
+ $this->_current_reservation->setBibliotheque(Class_CodifAnnexe::findLibelleByCode($data));
}
}
diff --git a/library/Class/WebService/SIGB/PMB/Service.php b/library/Class/WebService/SIGB/PMB/Service.php
index c0dbfd2e0f96481b5db6059fceaaaa3434d1d1cd..0bfdb5a5481d7f8fa87da8a689ac76d7db524f82 100644
--- a/library/Class/WebService/SIGB/PMB/Service.php
+++ b/library/Class/WebService/SIGB/PMB/Service.php
@@ -176,19 +176,10 @@ class Class_Webservice_SIGB_PMB_Service extends Class_WebService_SIGB_AbstractSe
$resa = Class_WebService_SIGB_Reservation::newInstanceWithEmptyExemplaire();
$resa_json = (array) $json_resa;
- $code_annexe = $resa_json['resa_retrait_location_id'];
- $library_label = '';
-
- if($library = Class_CodifAnnexe::findFirstBy(['code' => $code_annexe]))
- $library_label = $library->getLabel();
-
- $resa
+ return $resa
->setNoNotice($resa_json['notice_id'])
->setId($resa_json['resa_id'])
->setRang($resa_json['resa_rank']);
-
-
- return $resa;
}
diff --git a/library/Class/WebService/SIGB/Reservation.php b/library/Class/WebService/SIGB/Reservation.php
index 3f5349dd76d5487de503ecf2cdf070fb360b8e7c..5a36cc4ce3c3cd0982a9ef3d0227bd6e3d60dacf 100644
--- a/library/Class/WebService/SIGB/Reservation.php
+++ b/library/Class/WebService/SIGB/Reservation.php
@@ -69,8 +69,7 @@ class Class_WebService_SIGB_Reservation extends Class_WebService_SIGB_Exemplaire
if (!$code_annexe = $this->getAttribute('Lieu'))
return;
- if ($annexe = Class_CodifAnnexe::findFirstBy(['code' => $code_annexe]))
- $this->setBibliotheque($annexe->getLibelle());
+ $this->setBibliotheque(Class_CodifAnnexe::findLibelleByCode($code_annexe));
}
diff --git a/library/Class/WebService/SIGB/VSmart/BorrowerReader.php b/library/Class/WebService/SIGB/VSmart/BorrowerReader.php
index fdf2999cb5e24bd8611a5f3f6e94aaedb0b9dc16..21f92cd17b34eb7582bc886f15fd2dc5a06f1994 100644
--- a/library/Class/WebService/SIGB/VSmart/BorrowerReader.php
+++ b/library/Class/WebService/SIGB/VSmart/BorrowerReader.php
@@ -198,9 +198,9 @@ class Class_WebService_SIGB_VSmart_BorrowerReader {
public function _setExemplaireBib($data) {
- $code_bib = array_last(explode('/', $data));
- $bib = Class_CodifAnnexe::getLoader()->findFirstBy(array('code' => $code_bib));
- $libelle = $bib ? $bib->getLibelle() : $data;
+ if (!$libelle = Class_CodifAnnexe::findLibelleByCode(array_last(explode('/', $data))))
+ $libelle = $data;
+
$this->_current_exemplaire_operation->getExemplaire()->setBibliotheque($libelle);
}
}