diff --git a/VERSIONS b/VERSIONS index 91cb8c9324a2d7076cdf2dce6496483f2f7dcb8f..580f157871c2078d80836ff543ae33ee504a8c58 100644 --- a/VERSIONS +++ b/VERSIONS @@ -1,3 +1,12 @@ +27/11/2015 - v7.3.32 + + - ticket #33756 : Cosmogramme : correction de la prise en charge de webservices en https + + - ticket #33429 : Cosmogramme : correction de la génération de vignettes des pseudo-notices dans le contexte de l'intégration automatique + + - ticket #33773 : VSmart: correction de l'impossibilité de se connecter au compte lecteur lorsqu'une consultation est reservée + + 26/11/2015 - v7.3.31 - ticket #33501 : Cosmogramme: amélioration des intégrations automatiques diff --git a/VERSIONS_HOTLINE/33429 b/VERSIONS_HOTLINE/33429 deleted file mode 100644 index 0882c326044cb1614e64598e7a14dc65ac0b4dbd..0000000000000000000000000000000000000000 --- a/VERSIONS_HOTLINE/33429 +++ /dev/null @@ -1 +0,0 @@ - - ticket #33429 : Cosmogramme : correction de la génération de vignettes des pseudo-notices dans le contexte de l'intégration automatique \ No newline at end of file diff --git a/VERSIONS_HOTLINE/33756 b/VERSIONS_HOTLINE/33756 deleted file mode 100644 index ba1a2540b5c103aa5bcc8149562b43de6ac7eed5..0000000000000000000000000000000000000000 --- a/VERSIONS_HOTLINE/33756 +++ /dev/null @@ -1 +0,0 @@ - - ticket #33756 : Cosmogramme : correction de la prise en charge de webservices en https \ No newline at end of file diff --git a/library/Class/WebService/SIGB/VSmart/BorrowerReader.php b/library/Class/WebService/SIGB/VSmart/BorrowerReader.php index fe701a3c069281472a3d4c2207347cceedcd2c9d..77d0a507194ae430cdec729224a9ef99006a7c93 100644 --- a/library/Class/WebService/SIGB/VSmart/BorrowerReader.php +++ b/library/Class/WebService/SIGB/VSmart/BorrowerReader.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_VSmart_BorrowerReader { @@ -27,7 +27,7 @@ class Class_WebService_SIGB_VSmart_BorrowerReader { protected $_sigb_service; protected $_xml_parser; - + protected $_current_exemplaire_operation; /** * @@ -110,11 +110,17 @@ class Class_WebService_SIGB_VSmart_BorrowerReader { } + public function endReservation() { + $this->_current_exemplaire_operation = null; + } + + /** * @param string $data */ public function endLoan($data) { $this->_emprunteur->empruntsAdd($this->_current_exemplaire_operation); + $this->_current_exemplaire_operation = null; } @@ -130,7 +136,8 @@ class Class_WebService_SIGB_VSmart_BorrowerReader { * @param string $data */ public function endTitle($data) { - $this->_current_exemplaire_operation->getExemplaire()->setTitre($data); + if ($this->_current_exemplaire_operation) + $this->_current_exemplaire_operation->getExemplaire()->setTitre($data); } @@ -138,7 +145,8 @@ class Class_WebService_SIGB_VSmart_BorrowerReader { * @param string $data */ public function endDueDate($data) { - $this->_current_exemplaire_operation->setDateRetour($data); + if ($this->_current_exemplaire_operation) + $this->_current_exemplaire_operation->setDateRetour($data); } @@ -146,10 +154,11 @@ class Class_WebService_SIGB_VSmart_BorrowerReader { * @param string $data */ public function endItemBarcode($data) { - $this->_current_exemplaire_operation->setId($data) - ->getExemplaire() - ->setId($data) - ->setCodeBarre($data); + if ($this->_current_exemplaire_operation) + $this->_current_exemplaire_operation->setId($data) + ->getExemplaire() + ->setId($data) + ->setCodeBarre($data); } @@ -157,7 +166,8 @@ class Class_WebService_SIGB_VSmart_BorrowerReader { * @param string $data */ public function endPlaceInQueue($data) { - $this->_current_exemplaire_operation->setRang($data); + if ($this->_current_exemplaire_operation) + $this->_current_exemplaire_operation->setRang($data); } @@ -165,7 +175,8 @@ class Class_WebService_SIGB_VSmart_BorrowerReader { * @param string $data */ public function endReservationNumber($data) { - $this->_current_exemplaire_operation->setId($data); + if ($this->_current_exemplaire_operation) + $this->_current_exemplaire_operation->setId($data); } diff --git a/library/startup.php b/library/startup.php index 16e300713d578f990c6b871638ec210caf437159..4c441d2789b529950563319cc9fb4348a77a097f 100644 --- a/library/startup.php +++ b/library/startup.php @@ -64,7 +64,7 @@ function defineConstant($name, $value) { function setupConstants() { defineConstant('BOKEH_MAJOR_VERSION','7.3'); - defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.31'); + defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.32'); defineConstant('BOKEH_REMOTE_FILES', 'http://git.afi-sa.fr/afi/opacce/'); diff --git a/tests/library/Class/WebService/SIGB/VSmartFixtures.php b/tests/library/Class/WebService/SIGB/VSmartFixtures.php index 5dce65080cb2eddc909fb42b9375baf294bfb790..81f395920a77246aadbcc306acfb1cd14d00df66 100644 --- a/tests/library/Class/WebService/SIGB/VSmartFixtures.php +++ b/tests/library/Class/WebService/SIGB/VSmartFixtures.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 VSmartFixtures { @@ -178,7 +178,20 @@ class VSmartFixtures { </Items> </Reservation> </Reservations> - <StackRequests /> + <StackRequests> + <StackRequest> + <RequestNumber>DC00001093</RequestNumber> + <Status>Active</Status> + <RequestDateTime>26/11/2015 12:14:27</RequestDateTime> + <ExpiryDateTime>24/02/2016 23:59:00</ExpiryDateTime> + <Delivery>Liv</Delivery> + <HeldItem>RES_MCP271095</HeldItem> + <RecordId>1.179920</RecordId> + <Title>A Moulins...le marché cou</Title> + <MaterialType>LDA</MaterialType> + <MaterialType>LDA</MaterialType> + </StackRequest> + </StackRequests> </Borrower> </VubisSmart>'; }