This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository".
The branch, 3.22.x has been updated via 03bfe6286900ebc2f2ce6691b3dda43244ed4c64 (commit) via 82795f8b91fa2e802aa6c31eac970984d2a545c9 (commit) from e259b3d3e032ff3a70f0117b7f60c380060862f9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 03bfe6286900ebc2f2ce6691b3dda43244ed4c64 Author: Kyle M Hall <k...@bywatersolutions.com> Date: Mon Sep 12 08:58:02 2016 +0000 Bug 6852 [QA Followup] - Tidy AddItem Signed-off-by: Kyle M Hall <k...@bywatersolutions.com> (cherry picked from commit 989904c7ab0a24ddbe29264671fc8b5ebb175af2) Signed-off-by: Frédéric Demians <f.demi...@tamil.fr> (cherry picked from commit 8f165d2357ff8c1b2c364cca1224c04eee324006) Signed-off-by: Julian Maurice <julian.maur...@biblibre.com> commit 82795f8b91fa2e802aa6c31eac970984d2a545c9 Author: Marcel de Rooy <m.de.r...@rijksmuseum.nl> Date: Thu Sep 8 12:06:05 2016 +0200 Bug 6852: Staged import reports wrong success for items If we import items that have a wrong branch code, the items will not be imported but manage-marc-import reports them as imported. (A wrong branch code probably occurs most, but other causes are possible too.) The underlying cause is that AddItem does not look at the error returned from _koha_new_item in Items.pm. This patch deals with that omission in the most economical way. It adjusts AddItem so that it returns undef if no item was added. In ImportBatch.pm I check if an item was added and adjust the totals accordingly instead of just always counting them. Note: Several scripts like additem.pl use AddItemFromMarc to call AddItem. They do not report an error, but fail silently. With this patch, these scripts get undef and will still fail silently. (No change.) Adding error checks around calls of AddItemFromMarc is outside the scope of this report. Here we are taking care of correct imported item numbers. Test plan: [1] Verify that additem.pl still works by adding a new item. [2] Run t/db_dependent/Items.t [3] Add a new branchcode, say XXX. [4] Pick a biblio record with a few items (n) and set one item to branch XXX. [5] Export this biblio with items to a MARC file. [6] Change the XXX item to the original branch and remove branch XXX. [7] Import the MARC file. Verify that one item was not imported and that the number of imported items reflects that (equals n-1). Signed-off-by: Owen Leonard <oleon...@myacpl.org> Signed-off-by: Katrin Fischer <katrin.fisc...@bsz-bw.de> Signed-off-by: Kyle M Hall <k...@bywatersolutions.com> (cherry picked from commit 48aba1533c7c55ed0f4b9e528ceccc9e0dd3d795) Signed-off-by: Frédéric Demians <f.demi...@tamil.fr> (cherry picked from commit 9aee97978e3edc949d1827d7aeaf75df58e4f9e9) Signed-off-by: Julian Maurice <julian.maur...@biblibre.com> ----------------------------------------------------------------------- Summary of changes: C4/ImportBatch.pm | 14 ++++++++------ C4/Items.pm | 28 ++++++++++++++++------------ 2 files changed, 24 insertions(+), 18 deletions(-) hooks/post-receive -- main Koha release repository _______________________________________________ koha-commits mailing list koha-commits@lists.koha-community.org http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-commits