[koha-commits] main Koha release repository branch master updated. v17.05.00-394-g1262962

Sun Aug 20 13:35:24 CEST 2017

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, master has been updated
       via  1262962a7d22b9c9b712025c5220033356c857e0 (commit)
       via  37d07b28ce4089f691631bde3f6e9a2fe7b81b10 (commit)
       via  2490401be149d825108fc9c9f8bf556e64e2323d (commit)
       via  66a7565995c00495fe670c809d9c7cf0c900fc7f (commit)
       via  97ec4ae98c8792835717bf1de19f8782b7cb1994 (commit)
      from  7b5457cd0f17173ae9ebca2e71696cc09709a910 (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 1262962a7d22b9c9b712025c5220033356c857e0
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Aug 18 04:45:41 2017 +0000

    Bug 18996 [QA Followup] - Fix some minor whitespace issues

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 37d07b28ce4089f691631bde3f6e9a2fe7b81b10
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Aug 2 13:01:47 2017 +0200

    Bug 18996: [QA Follow-up] Remove global variables from Message.t

    As per request of Colin in comment18, this patch makes the use of global
    variables in Message.t no longer needed.
    The three subtests are now completely independent and could well be moved
    to separate test scripts.

    Note: Strictly speaking, the use of global (package) variables could
    potentially introduce new bugs (e.g. if the value is modified outside the
    script). This seems not to be the case here, but we are safe now.

    Test plan:
    Run the test again.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 2490401be149d825108fc9c9f8bf556e64e2323d
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Sat Jul 29 13:38:31 2017 +0200

    Bug 18996: Add checkin subtest in SIP/Message.t

    Variable $branch was not used.
    Promoted some global vars to our.
    Shared the branchcode between all three subtests now.
    The third subtest contains all six cases mentioned in the first patch.

    Test plan:
    Run t/db_dependent/SIP/Message.t

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 66a7565995c00495fe670c809d9c7cf0c900fc7f
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Aug 1 14:10:56 2017 +0200

    Bug 18996: Resolve an uninitialized warning from ILS/Item.pm

    From the syslog call on line 107/108. The field $item->{title} has not
    been initialized. When catching the warns in a test script with Test::Warn,
    I got:
        Use of uninitialized value $args[1] in sprintf at /usr/lib/x86_64-linux-gnu/perl/5.20/Sys/Syslog.pm line 423.

    This simply resolves the warning. We might have a closer look to this title
    field on another report though.

    Test plan:
    Run Message.t from the next patch without this fix. It will fail since the
    additional warning makes warnings_like return false.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 97ec4ae98c8792835717bf1de19f8782b7cb1994
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jul 28 10:29:51 2017 +0200

    Bug 18996: Handle data corruption from old_issues at SIP checkin

    As per bug 18966 AddReturn returns false with a DataCorrupted message
    when the issue_id at hand already occurs in the old_issues table.
    This should be handled when returning an item via SIP too. SIP should
    not pretend that the checkin was successful, since this item needs
    special care.

    The following six different situations are handled:

    [1] An attempt to checkin an invalid barcode is handled as before. The
    ok flag is false; the screen message shows 'Invalid Item'.
    [2] We receive a DataCorrupted message: the alert type is set to the
    unused 98 code to indicate this new error condition. The ok flag
    is false; the screen message shows 'Checkin failed: data problem'.
    [3] The item checked in was not checked out AND the option checked_in_ok
    is active. The ok flag is set to true; no screen message.
    [4] The item checked in was not checked out AND the option checked_in_ok
    is not active. The ok flag is not changed (normally false); the screen
    message shows 'Item not checked out'.
    [5] (The regular checkin) The item was checked out and AddReturn returned
    true. The ok flag is true; no screen message.
    [6] ("Otherwise") The item was checked out, but AddReturn returned false.
    The ok flag is false; the screen message shows 'Checkin failed'.
    Note: Currently this case only refers to the Wrongbranch and withdrawn
    messages from AddReturn (where doreturn==0).

    Note: Situation 1 and 5 are unchanged. Behavior is slightly changed for
    situation 3 and 4; the option is only used when the item was not checked
    out. Situation 2 and situation 6 are changed. After bug 18966 SIP
    returned OK in case of data corruption (while checkin failed). In the
    remaining cases under [6] SIP also returned OK while checkin failed.

    Test plan:
    [1] Test all six cases listed above. In order to simulate data corruption
    insert the issue_id at hand in old_issues before you check in.
    In cases 3 and 4 you need to toggle the option in your SIPconfig.xml and
    restart the SIP server.
    Case 6 can be tested by checking out at branch A, adjusting the value
    of pref AllowReturnToBranch and checking in at branch B.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

-----------------------------------------------------------------------

Summary of changes:
 C4/SIP/ILS.pm                     |   37 +++----
 C4/SIP/ILS/Item.pm                |   18 ++--
 C4/SIP/ILS/Transaction/Checkin.pm |    4 +-
 t/db_dependent/SIP/Message.t      |  204 ++++++++++++++++++++++++++++++++-----
 4 files changed, 208 insertions(+), 55 deletions(-)

hooks/post-receive
-- 
main Koha release repository