[koha-commits] main Koha release repository branch master updated. v19.11.00-1244-g77c66abf7a
Git repo owner
gitmaster at git.koha-community.org
Fri Mar 20 17:10:26 CET 2020
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 77c66abf7a3712573920a1aa17a602a4bb4e8712 (commit)
via 3944f20beb6850f576cb9f68cd5ee9ac4493efb5 (commit)
via 4c66b9c874f81f9c73648da5da6b7c8732a62221 (commit)
via 64035301fcde844c899253c6e21174397c34acbf (commit)
via 5dcb02ec88d589512e18022ad36d7753381b88f6 (commit)
via 56195db216d3dd55549a166fdd9e61987b0e9f45 (commit)
via 29243a3c829842d305a00ff8b1ce24086d308662 (commit)
via 65f7a7190b20051ed29dedb5ab2cf2efe84698c3 (commit)
via 8d8198ad48844a8e99079073879bf0a38d7e296a (commit)
via 4ffe70dfaff9c552cce1e40bec4a0d86a4dc819e (commit)
via 6d61b6e03363a098537e7e33e1c4c839e992e3cf (commit)
via 20b38829ce0d483335f5c258f5e563778f0ad2f1 (commit)
via 9abe037f290dc451d9ba1716401fa3cdc36fe896 (commit)
via 14637559b4c5f83ef10256c9fa50925ccb573b39 (commit)
via 6fc82e008c6a1f2bc835b06a9c88558226de6048 (commit)
via 87acc552d598b94daa9066c5532c34562a712450 (commit)
via 32424eac2af05a1313f15e2821c5a5840780f949 (commit)
via 99dbf72b72ab9b47b78ea1531def40f269106ea2 (commit)
via 569f7266b976299702d17416bf83dabc9052ecca (commit)
via 424b08cff9542606bce4b5fda08467d90e957399 (commit)
via 743eead9fdce5516f85cb38ad00248907971756c (commit)
via 50f0ba0a3a7f7281f6d91a5b7371996e6e199fc3 (commit)
via 7bbb19e3bc66aa011980dc2bf98ca22f6943bd42 (commit)
via 07ff532d01d0c550ecb0180be7487a6bf61fc4e6 (commit)
from e3d3ef705c963b7db79ebf0ca6c6966b2ee41c4a (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 77c66abf7a3712573920a1aa17a602a4bb4e8712
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Thu Feb 20 01:36:32 2020 +0000
Bug 24688: Check the priority of the fulfilled hold when fixing priorities
Currently when fixing priorities of existing holds, priorities aren't
fixed when checking out a middle priority hold because the hold has been
fulfilled and deleted. This patch adds a check for, if the hold can't be
found, an old hold with the required reserve_id.
To test:
1. Place at least four holds on a biblio for different borrowers
2. Check out an item to the 3rd priority borrower
3. Check the existing holds table for the biblio. The priorities might be
out of order, or try clicking the dropdowns and there might be an empty
dropdown option, or open the browser developer tools and notice the option
values in the select are missing value=3.
4. Apply patch and restart memcached
5. Check out an item to the 2nd priority borrower
6. Check the existing holds table for the biblio. Confirm the priorities
have been fixed and are now consecutive with no gaps.
Sponsored-by: Chartered Accountants Australia and New Zealand
Signed-off-by: Emmi Takkinen <emmi.takkinen at outlook.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 3944f20beb6850f576cb9f68cd5ee9ac4493efb5
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Mar 18 13:54:52 2020 +0000
Bug 24892: Resolve uninitialized warns from opac-memberentry
Especially line 500 (current master).
Use of uninitialized value $new_data{"sort2"} in string eq at /usr/share/koha/opac/opac-memberentry.pl line 500.
Use of uninitialized value in string eq at /usr/share/koha/opac/opac-memberentry.pl line 500.
Simple fix, not completely trivial due to adding xor ;)
Test plan:
Do not apply, update from opac memberentry. Check warns in log.
Apply patch, update again. Less warns?
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4c66b9c874f81f9c73648da5da6b7c8732a62221
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Fri Mar 13 17:40:38 2020 +0000
Bug 24848: Improve manual links for the label creator
Some of the manual links in the label creator tool were
not working correctly or pointing to the wrong pages.
A problem is the label-manage.pl file. This can show
different data depending on an added parameter. Example:
/cgi-bin/koha/labels/label-manage.pl?label_element=template
But it appears that parameters will be ignored when creating
links to the manual. So this patch links to the beginning
of the label creator section in the manual for now.
To test:
- Go to the lable creator
- Try the various pages of the tool
- Note: All 'New ...' links should point to the
correct section in the manual (batches, templates, ...)
Except: Barcode range. This feature is new and not
yet documented in the manual. Link goes to label creator section.
- Note: All 'Manage ...' links should point to the
beginning of the 'label creator' section in the manual
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 64035301fcde844c899253c6e21174397c34acbf
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Feb 25 14:42:29 2020 +0000
Bug 24553: Use 'barcode' not 'item_id' when removing hold from SIP patron
The drop_hold routine was using the wrong parameter for item info in the patron's
array of holds. We store it as 'barcode' not 'item_id'. This is true for both waiting and unavailable
holds
To test:
1 - Apply unit tests patch
2 - prove -v t/db_dependent/SIP/ILS.t
3 - It fails
4 - Apply second patch
5 - prove -v t/db_dependent/SIP/ILS.t
6 - It passes!
You can also see bug 24175 - you cna hack sip_cli_emulator to allow cancelling a hold
and check the messages, test coverage is improved by this patch and should be sufficient
for testing
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5dcb02ec88d589512e18022ad36d7753381b88f6
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Feb 25 14:42:17 2020 +0000
Bug 24553: Unit tests
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 56195db216d3dd55549a166fdd9e61987b0e9f45
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Mar 16 15:43:49 2020 +0100
Bug 22025: Remove warnings when importing patrons
The following warning is raised when importing patrons
Argument "" isn't numeric in numeric eq (==) at /usr/share/perl5/DBIx/Class/Row.pm line 1018
if one of the following headers is passed but does not have a value:
* privacy
* privacy_guarantor_fines
* privacy_guarantor_checkouts
* anonymized
Test plan:
- Do not apply the patch
- Generated a csv file with at least one those headers
- Import it using the import_patrons.pl script (or using the GUI)
- Notice the warnings without the patch
- Apply the patch
- Confirm that the warnings do not longer appear
Signed-off-by: Magnus Enger <magnus at libriotech.no>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 29243a3c829842d305a00ff8b1ce24086d308662
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Mar 16 15:43:38 2020 +0100
Bug 22025: Add a regression test
Signed-off-by: Magnus Enger <magnus at libriotech.no>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 65f7a7190b20051ed29dedb5ab2cf2efe84698c3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Dec 12 10:12:41 2019 +0100
Bug 13775: Set main headings to mandatory in authority frameworks (UNIMARC)
Same as previously, for UNNIMARC
For unimarc_complet:
CLASS => 245
CO => 210
CO_UNI_TI => 235
EXP => 232
FAM => 220
GENRE/FORM => 280
NAME_COL => 245
NP => 200
NTEXP => 242
NTWORK => 241
PA => 260
PERS => 223
PUB => 217
SAUTTIT => 240
SNC => 250
SNG => 215
TM => 216
TU => 230
WORK => 231
For unimarc_lecture_pub:
CO => 210
NP => 200
SAUT => 200
SAUTTIT => 240
SCO => 210
SNC => 250
SNG => 215
STU => 230
TU => 230
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 8d8198ad48844a8e99079073879bf0a38d7e296a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Dec 12 10:10:23 2019 +0100
Bug 13775: Set main headings to mandatory in authority frameworks
For MARC21 we need to set the following tags as mandatory:
CHRON_TERM => 148
CORPO_NAME => 110
GENRE/FORM => 155
GEOGR_NAME => 151
MEETI_NAME => 111
PERSO_NAME => 100
TOPIC_TERM => 150
UNIF_TITLE => 130
Note that it also fixes an error on the UI, which was initially reported
on bug 13775.
Test plan:
- Create a fresh install in the language of your choice.
- Confirm that when you create a new authority you cannot save without
entering a value for the main heading
- Edit marc record's field 648 -> chronological term
- Try to add there one by clicking a link on the left side of the field.
From there it opens me to a new window, click "Create a new authority"
Click on the authority creating fields randomly, save.
=> Without this patch an error occurred "Can't call method "subfields"
on an undefined value at authorities/blinddetail-biblio-search.pl line 88."
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4ffe70dfaff9c552cce1e40bec4a0d86a4dc819e
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Tue Feb 25 02:02:22 2020 +0000
Bug 8595: (follow-up) Changing other occurrences of 'host item' to 'host record'
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 6d61b6e03363a098537e7e33e1c4c839e992e3cf
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Thu Feb 13 21:23:58 2020 +0000
Bug 8595: Rename 'host item' to 'host record'
To test:
1) Enable the syspref EasyAnalyticalRecords
2) Find a biblio record, go to the detail page
3) Click the Edit dropdown and notice the option "Link to host item"
4) Apply patch and refresh page
5) Click the Edit dropdown and confirm the renamed "Link to host record"
button
Sponsored-by: Catalyst IT
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 20b38829ce0d483335f5c258f5e563778f0ad2f1
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Mar 20 08:58:29 2020 -0400
Bug 23808: (follow-up) Object methods can be used directly, no need for unblessed
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9abe037f290dc451d9ba1716401fa3cdc36fe896
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date: Tue Mar 17 23:59:03 2020 +0000
Bug 23808: (follow-up) Pre-fill guarantee's contact details from guarantor patron in memberentry.pl
Pre-fill guarantee contact details (email, phone) from guarantor record
when adding a gurantee to a guarantor's record
Test plan:
1. Apply first two patches and follow test plans
2. On an adult's patron record (which has an primary phone number, secondary
phone, other phone, primary email, secondary email and fax set) select
'Add a guarantee' and observe the guarantee's 'Contact' section is not
pre-filled with that information from the guarantor
3. Apply this patch
4. On the same adult's record select 'Add a guarantee' and observe that the
'Primary phone', 'Secondary phone', 'Other phone', 'Primary email',
'Secondary email', 'Fax' have been pre-filled from the guarantor's record
5. Fill out the rest of the memberentry.pl and 'Save' and observe that those
contact details are successfully saved
6. Repeat step 4 and alter the 'Primary phone' and 'Primary email'
fields and save and observe that those altered values are saved
7. Run tests and confirm they pass:
sudo koha-shell <instancename>
prove xt
prove t
Sponsored-by: South Taranaki District Council, NZ
Signed-off-by: Andreas Roussos <a.roussos at dataly.gr>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 14637559b4c5f83ef10256c9fa50925ccb573b39
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date: Tue Mar 17 20:43:59 2020 +0000
Bug 23808: (follow-up) Display card number in 'Guarantor information' in memberentry.pl
Instead of displaying 'Patron #' and displaying the guarantor's borrowernumber
in 'Guarantor information' we should display 'Patron card number:' with
the cardnumber displayed as that value is more meaningful to librarians.
The hyperlink containing the borrowernumber should stay the same so that
librarians can easily visit the patron record of existing guarantor
patrons.
Test plan:
1. Apply first patch and follow it's test plan
2. On an Adult patrons record select 'Add guarantee'
3. In 'Guarantor information' section of memberentry.pl observe in the
pre-filled guarantor information there is a line 'Patron #:' with a
link displaying a borrowernumber (not card number) and when you click
on the link it takes you to the adult/guarantors patron account
4. Select 'Search to add' and search and add another guarantor
5. Observe in the added guarantor 'Patron #:' is displayed along with the
borrowernumber (not card number). The borrowernumber displayed in not
a link.
6. Apply this patch
7. On a adults patron select 'Add guarantee'
8. Observe in 'Guarantor information' section the pre-filled guarantor now
has 'Patron card number:' displayed (instead of 'Patron #:', and it's
link now displays the guarantors cardnumber.
Clicking on the link still takes you to the guarantors patron account
9. Repeat step 4
10. Observe in the added guarantor they also have 'Patron card number:'
(instead of 'Patron #:'). A cardnumber rather than borrowernumber is
displayed. The cardnumber is not a link.
11. Confirm tests still pass:
sudo koha-shell <instancename>
prove xt
prove t
Sponsored-by: South Taranaki District Council, NZ
Signed-off-by: Andreas Roussos <a.roussos at dataly.gr>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 6fc82e008c6a1f2bc835b06a9c88558226de6048
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date: Tue Mar 17 04:50:32 2020 +0000
Bug 23808: Pre-fill guarantor fields when adding guarantee to guarantor
Bug 14570 removed the guarantor pre-fill functionality when selecting
'Add guarantee' to an Adult patron. This is because guarantor
information would now only display if (1) the patron record exists
(which it won't when first adding guarantee to guarantor record) and (2)
if there is already a guarantor added to a guarantee
This patchfix will pre-fill guarantor fields and address fields (so the guarantee
has the same address as the guarantor) if no relationship (existing
guarantor data exists) and a guarantor_id is handed to memberenty.pl in
URL when clicking 'Add guarantee' button on Adults patron record.
Test plan:
1. Add adult patron make sure to fill in their 'Main address' details
2. Select 'Add guarantee'
3. Observe no details of the adult patron are displaying in the
'Guarantor information' section or 'Main address' sections of memberentry.pl
4. Select 'Search to add', search for your adult patron and choose
'Select' to add them as guarantor
5. Fill out rest of memberentry.pl and 'Save'
6. Observe adult is showing as the guarantor
7. Apply patch
8. Run tests:
sudo koha-shell <instancename>
prove xt
prove t
9. Confirm tests pass
10. Return to your adult patron
11. Select 'Add guarantee'
12. Observe in 'Guarantor information' and 'Main address' sections of
memberentry.pl are pre-filled with the 'patron #' (borrowernumber),
surname, firstname and street number, address, address2 (if you
filled that in on adults account), city
13. Fill out the rest of memberenty.pl and save and confirm your adult
patron is showing as the guarantor and the pre-filled address details
have been saved and are showing
14. Repeat steps 10,11 and 12 and in the 'Guarantor information' select
'Search to add' and add another adult as guarantor
15. Fill out the rest of memberentry.pl and 'Save' and notice with this
patch applied you can still add multiple guarantors successfully
Sponsored-by: South Taranaki District Council, NZ
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: George Veranis <gveranis at dataly.gr>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 87acc552d598b94daa9066c5532c34562a712450
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Aug 1 14:57:29 2019 +0000
Bug 23411: Do not fall back to 'email' for SMS messages
To test:
1 - Have a patron wiht an sms number, but no email
2 - Enable sms by setting SMSDriver syspref to Email
3 - Set Notice triggers to send an overdue via sms and email
4 - Ensure the selected notice is defined only for 'email'
5 - Checkout an overdue to the patron above
You can set a specify a due date in the past
6 - perl misc/cronjobs/overdue_notices.pl -t
7 - Check the patron notices tab, they have a print notice and an SMS notice pending
8 - The SMS notice used the 'email' template
9 - Apply patch
10 - sudo koha-mysql kohadev
11 - DELETE * FROM message_queue WHERE borrowernumber={borrower as above};
12 - Run the cron again
13 - Patron should have a print notice queued, no sms
14 - Define an SMS notice
15 - delete the message queue
16 - Run again
17 - The patron should have a print and an SMS
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 32424eac2af05a1313f15e2821c5a5840780f949
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Mon Mar 9 12:05:03 2020 -0300
Bug 24830: Fix parse_prefetch recursion and +count cases
When a child of a prefetched element wasn't found on element's
prefetch_whitelist, no prefetch element was returned.. including element
it self. Now we return element's name if no child was found.
Also, embeded keys that ended with +count where taken literaly. Now we
search the correct key by stripping _count of embedded element if it was
declared as "is_count"
To test:
1. Apply test patch but not this one
2. prove t/Koha/REST/Plugin/Query.t
CHECK => tests shoul fail
3. Apply this patch
4. prove t/Koha/REST/Plugin/Query.t
SUCCESS => tests pass
5. Sign off
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 99dbf72b72ab9b47b78ea1531def40f269106ea2
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Thu Mar 12 18:47:40 2020 -0300
Bug 24830: Add tests
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 569f7266b976299702d17416bf83dabc9052ecca
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Dec 17 11:31:40 2019 +0100
Bug 24250: Do not duplicate debarred comment in patron screen message AF field
Caused by
commit bddfed75913a2302c19c00b00a6fe86538af6f9f
Bug 19933: Remove patronflags - tricky ones
Test plan:
1 - Setup SIP in your testing environment
https://wiki.koha-community.org/wiki/Koha_SIP2_server_setup
2 - Set a patron to have a restriction
3 - Send a patron status request or patron information command via
the SIP cli emulator (see link above)
4 - Note the comment on the restriction is sent only once
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 424b08cff9542606bce4b5fda08467d90e957399
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Feb 26 12:51:06 2020 +0100
Bug 23900: Add tests
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 743eead9fdce5516f85cb38ad00248907971756c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Nov 11 17:54:56 2019 +0100
Bug 23900: Teach label maker to concat database fields
Test plan:
- define a label layout with this field list: "100a 245s","enumchron copynumber"
- find or create a record with values for all of those fields
- generate a label for that record
- the 100a and 245s successfully display on one line
- the enumchron and copynumber are displayed and separated by a space
Try other combinations
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 50f0ba0a3a7f7281f6d91a5b7371996e6e199fc3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Mar 19 11:57:16 2020 +0100
Bug 24904: Speed up installer process - 1 query per table
Since bug 13897 we are using YAML file to store the installer data.
We are generating/executing 1 query per row, which is much more slower than before.
We should generate 1 query per table to get back to the previous execution time.
With this patch we are going to generate a single one big SQL query per
table.
Test plan:
1/ Checkout a commit before bug 13897:
git checkout -b before_13897 0706922221dcdf9fa8ed7fcf86245c5622f33a3c
2/ Execute the following commands (several times, to get a median!):
mysql -h db -u koha_kohadev -ppassword -e"DROP DATABASE koha_kohadev";
mysql -h db -u koha_kohadev -ppassword -e"CREATE DATABASE koha_kohadev";
koha-shell -p -c "perl benchmark_installer.pl sql" kohadev;
Note the different times displayed in the output, especially the first 2
installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.yml
installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.yml
They are the number of seconds took to insert them
3/ checkout master
git checkout -B master origin/master # Will reset your master branch!
4/ Execute the previous commands but without the 'sql' parameter passed
to the benchmark script
mysql -h db -u koha_kohadev -ppassword -e"DROP DATABASE koha_kohadev";
mysql -h db -u koha_kohadev -ppassword -e"CREATE DATABASE koha_kohadev";
koha-shell -p -c "perl benchmark_installer.pl" kohadev;
Note the different times.
5/ Apply this patch and retry 4
Please post the execution times when you signoff on this patch.
Spoiler: total time goes from 21s to 4s.
marc21_framework_DEFAULT.yml from 12s to .5s
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
My numbers, 99.99% confidence
3.906 ±0.252 SQL files
15.516 ±0.772 YAML wo/patch
3.324 ±0.193 YAML w/patch
Very good!
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 7bbb19e3bc66aa011980dc2bf98ca22f6943bd42
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Mar 20 10:12:24 2020 +0000
Bug 24809: (QA follow-up) Add prefix to prevent disambiguity
This seems not to be needed. Just at the safe side.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 07ff532d01d0c550ecb0180be7487a6bf61fc4e6
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Mar 5 10:59:22 2020 +0000
Bug 24809: Get only timestamp of deleted items attached to existing bibs when check if bib deleted
To test:
1 - Edit/create a file in the koha home dir '/var/lib/koha/{instance}/OAI.yaml' with content like below:
format:
marcxml:
metadataPrefix: marcxml
metadataNamespace: http://www.loc.gov/MARC21/slim http://www.loc.gov/standards/marcxml/schema/MARC21slim
schema: http://www.loc.gov/MARC21/slim http://www.loc.gov/standards/marcxml/schema/MARC21slim.xsd
include_items: 1
2 - Set the systempreferences below to indicated values:
OAI-PMH => Enable
OAI-PMH:ConfFile => /var/lib/koha/{instace}/OAI.yaml
3 - View a record with items and confirm the items show:
http://localhost:8080/cgi-bin/koha/oai.pl?verb=GetRecord&metadataPrefix=marcxml&identifier=KOHA-OAI-TEST:4
4 - Delete the items, then delete the record
5 - Reload the URL from step 3
6 - Internal Server Error:
Empty String at /kohadevbox/koha/Koha/OAI/Server/Record.pm line 58.
at /usr/share/perl/5.24/Carp.pm line 167
7 - Apply patch
8 - restart_all
9 - Repeat
10 - Reload URL from step 3
11 - Success
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Installer.pm | 12 ++--
C4/Labels/Label.pm | 13 ++--
C4/Reserves.pm | 4 ++
C4/SIP/ILS/Patron.pm | 4 +-
Koha/Manual.pm | 16 +++--
Koha/OAI/Server/GetRecord.pm | 5 +-
Koha/Patrons/Import.pm | 9 +++
Koha/REST/Plugin/Query.pm | 22 ++++---
.../marc21/mandatory/authorities_normal_marc21.yml | 16 ++---
.../marc21/mandatory/authorities_normal_marc21.sql | 16 ++---
.../obligatoire/authorities_normal_marc21.sql | 16 ++---
.../Obligatoire/authorities_normal_marc21.sql | 16 ++---
.../Obligatoire/autorites_norme_unimarc.sql | 36 +++++------
.../Obligatoire/autorites_norme_unimarc.sql | 16 ++---
.../marc21/mandatory/authorities_normal_marc21.sql | 16 ++---
.../marc21/mandatory/authorities_normal_marc21.sql | 16 ++---
.../marc21/mandatory/authorities_normal_marc21.sql | 16 ++---
.../marc21_authorities_DEFAULT_general.sql | 28 ++++-----
.../marc21_authorities_CHRON_TERM_general.sql | 4 +-
.../marc21_authorities_DEFAULT_general.sql | 28 ++++-----
.../marc21_authorities_CHRON_TERM_general.sql | 4 +-
.../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 2 +-
.../prog/en/modules/cataloguing/linkitem.tt | 6 +-
.../prog/en/modules/members/memberentrygen.tt | 57 ++++++++++++++----
koha-tmpl/intranet-tmpl/prog/js/members.js | 2 +-
members/memberentry.pl | 13 ++++
misc/cronjobs/overdue_notices.pl | 4 +-
opac/opac-memberentry.pl | 3 +-
t/Koha/REST/Plugin/Query.t | 63 +++++++++++++++++++-
t/db_dependent/Koha/Patrons/Import.t | 7 ++-
t/db_dependent/Labels/t_Label.t | 37 +++++++-----
t/db_dependent/SIP/ILS.t | 69 +++++++++++++++++++++-
32 files changed, 391 insertions(+), 185 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list