[koha-commits] main Koha release repository branch master updated. v3.20.00-457-gca341f6
Git repo owner
gitmaster at git.koha-community.org
Wed Aug 26 16:06:54 CEST 2015
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 ca341f6840ad7eb9170ce49f1ed6869b3e468297 (commit)
via cc79ab3cdd42513fa46a7f78c03282625543d6f5 (commit)
via a3b7f059a1f95945bcb5bbc1123b8eead17433fc (commit)
via 55a52c1218a672dc770b9f0cf4e20501f73ba153 (commit)
via e09e7152b6af1f2cb3d2e78eff317cdf77cbf5f2 (commit)
via 34c11ee8eee5a547de3a83c2cba8e6eeedecfa01 (commit)
via 6f95acd1a6cf5113992d28173dece96e8afc6cef (commit)
via 3e1282b135cb642e8dac90f810edb5f29889e85e (commit)
via c9234cb92ddd9ec1ec19e399c185e1ba9b11a9d9 (commit)
via 1bf5fb920bc34f44706e837dd1b7441381146eb3 (commit)
via eaff67140c5607232b64f29cb3530b3c8655f024 (commit)
via 64fcab9e518c16613c98095bd6a08d76fda20e8f (commit)
via 092a7e1b531f4de5218fe7136d4e646a845aaad4 (commit)
via 031a3196a49dd5fba98aa6c7b7cea299a312005e (commit)
via b7119848850c8bb44cb933d7b07d8582a761a181 (commit)
via 71ce0d96c9d72571e45c568acb7aab321a42009b (commit)
via ad3239479db4e5542a6f29bfd1bb1af9187ac67b (commit)
via a3795250862da29d32b124bfe18ca37b53888c79 (commit)
via 76f16b1b42ded69fb9c9672bbeb7a92203783fe5 (commit)
via 4251d4f8822999d7b5d442d9e4ae86941ae67e06 (commit)
via d4edaaada01be2069829afabf63650d6e09b6c61 (commit)
via 9930b5bf1b0cce46b1c97a5c352542c085ba6320 (commit)
from 72372e389566442c5022959a567df24ea0a4034d (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 ca341f6840ad7eb9170ce49f1ed6869b3e468297
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Sun Nov 3 17:05:38 2013 +0100
Bug 11190: sitemap.pl -- Generate a Catalog sitemap
Add a script sitemap.pl to process all biblio records from a Koha
instance and generate Sitemap files complying with this protocol as
described on http://sitemaps.org. The goal of this script is to be able
to provide to search engines direct access to biblio records. It avoid
leaving search engine browsing Koha OPAC and so generating a lot of
traffic, and workload, for a bad result.
Thanks Magnus for testing, and helping to improve the script design.
[2015.04.16] Switch from Moose to Moo.
[2015.08.20] Add complete (more) UT.
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
All options to the script work as expected and the output looks
good. Nice enhancement!
Signed-off-by: Frederic Demians <f.demians at tamil.fr>
I signed-of my own patch after fixing various QA errors.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Amended patch: replace tabs with spaces.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit cc79ab3cdd42513fa46a7f78c03282625543d6f5
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Jul 17 07:37:33 2015 -0400
Bug 14557: Add holds count to holds tab
Some librarians have expressed that it would be helpful if the holds tab
displayed the count of holds for a record.
Test Plan:
1) Apply this patch
2) Note the Holds tab for a record now displays the number of holds for that record
Signed-off-by: Jason Robb <jrobb at sekls.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit a3b7f059a1f95945bcb5bbc1123b8eead17433fc
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Jul 17 07:35:28 2015 -0400
Bug 14557: Clean up biblio-view-menu.inc
Signed-off-by: Jason Robb <jrobb at sekls.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 55a52c1218a672dc770b9f0cf4e20501f73ba153
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Aug 24 15:44:22 2015 -0300
Bug 14714: Add tab-completion to koha-mysql command
This patch introduces tab-completion in bash to the koha-mysql
command. It completes using valid instance names. It stops completing
once an instance name is chosen (i.e. it respects the fact that
koha-mysql accepts only one instance name as parameter).
To test:
- Have a packages install (kohadevbox works)
- Run:
$ . debian/koha-common.bash-completion
- Type
koha-mysql <tab>
=> SUCCESS: You are prompted valid instance names for completion.
- Sign off :-D
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit e09e7152b6af1f2cb3d2e78eff317cdf77cbf5f2
Author: Benjamin Rokseth <benjamin.rokseth at kul.oslo.kommune.no>
Date: Mon Jun 8 11:12:03 2015 +0200
Bug 14361: koha-restart-zebra fails and probably breaks upgrade
This patch fixes the koha-restart-zebra and koha-stop-zebra scripts
by adding pidfiles folder to the test is_zebra_running.
It also adds pidfiles to the test is_indexer_running so that
koha-rebuild-zebra will work properly.
Test plan:
1) check if zebrasrv is running, get pid of zebrasrv
ps ax | grep zebrasrv
2) In my case, there was also a warning on the about.pl page on a fresh
install: Error message from Zebra: 1011 (bad credentials)
3) try to restart zebra
koha-restart-zebra instancename
You will get a msg :
Zebra does not appear to have been running for instancename
Starting Zebra server for instancename
4) check again if zebrasrv is running
ps ax | grep zebrasrv
and see that pid has not changed, thus it is not restarted
5) Apply patch
6) repeat 4) and watch now how pid has changed
If there was a warning on about.pl it should now be gone
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Good catch Benjamin! It works as expected with the patch.
commit 34c11ee8eee5a547de3a83c2cba8e6eeedecfa01
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Jan 14 11:42:29 2015 -0500
Bug 12632: (regression tests) Unit Tests
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 6f95acd1a6cf5113992d28173dece96e8afc6cef
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Aug 22 13:29:28 2014 -0400
Bug 12632: Hold limits ignored for record level holds with item level itemtypes
The crux of the issue is that if you are using item level itemtypes, but
are allowing biblio levels holds, those holds do not have items.
So, in CanItemBeReserved, when Koha counts the number of holds to
compare against the given rule, it will always give 0 ( except of course
for found holds, and the occasional item-level hold ).
So the query is saying "link each of these reserves to the reserved
item, and count the number of reserves this patron where the itemtype is
DVD". However, since these are all record level reserves, there are no
items to link to, and so when it looks for all reserves this and item
whose itemtype is DVD, it finds zero reserves!
This patch solves the problem by looking first at the item level
itemtype, and if it does not exist, then it looks at the record
level itemtype. For installations using record level itemtypes, the
behavior remains unchanged.
Test plan:
1) Enable item level itemtypes
2) Create two records with one item each of a given itemtype
3) Create a single issuing rule and limit the holds allowed for that
itemtype to 1
4) Place a record level hold on your first record
5) Attempt to place a record level hold for the same patron on your
second record. You should not be able to but you can!
6) Apply this patch
7) Repeat step 5, note you can no longer place the hold!
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 3e1282b135cb642e8dac90f810edb5f29889e85e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Aug 25 11:32:11 2015 -0300
Bug 7143: Add Benjamin Rokseth to the projects history file and about page
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
commit c9234cb92ddd9ec1ec19e399c185e1ba9b11a9d9
Author: Liz Rea <liz at catalyst.net.nz>
Date: Tue Aug 4 10:18:22 2015 +1200
Bug 7143: spaces in history.txt instead of tabs break display on website
This may be the only place in koha where a tab should be a tab and not 4 spaces.
I'll try to fix the script that does the conversion for the website to handle 4 spaces instead of tabs, but for now can we have this?
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
commit 1bf5fb920bc34f44706e837dd1b7441381146eb3
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Aug 26 10:37:17 2015 -0300
Bug 9809: DBRev 3.21.00.19
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit eaff67140c5607232b64f29cb3530b3c8655f024
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 25 12:31:09 2015 +0100
Bug 9809: Remove one more occurrence of reserveconstraints
This file is not updated, but no need to keep on occurrence of an
nonexistent table in it.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 64fcab9e518c16613c98095bd6a08d76fda20e8f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 25 12:28:09 2015 +0100
Bug 9809: Fix pod errors
FAIL C4/Reserves.pm
FAIL pod
in file C4/Reserves.pm
*** ERROR:
Spurious =cut command
Test plan:
perl -e "use Pod::Checker;podchecker('C4/Reserves.pm');"
Should not return any errors.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 092a7e1b531f4de5218fe7136d4e646a845aaad4
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Aug 24 13:50:08 2015 +0200
Bug 9809: [QA Follow-up] Still found some remains
In the staff client we had still some remains referring to the
constraint types.
Also touched one comment line from SIP.
Test plan:
Add a hold in the staff client.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 031a3196a49dd5fba98aa6c7b7cea299a312005e
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Aug 24 08:54:39 2015 +0200
Bug 9809: [QA Follow-up] Remove constrainttype from 14464 tests
Some additional unit tests of bug 14464 still included a constraint
in the AddReserve calls.
Test plan:
Run Reserves.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit b7119848850c8bb44cb933d7b07d8582a761a181
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Aug 21 10:47:19 2015 +0200
Bug 9809: [QA Follow-up] Remove an erroneous call to GetReserveFee
The call to GetReserveFee in opac-reserve.pl is useless in its current
form. The first parameter undef takes care of receiving 0.
But note that the user is warned correctly for the charge via param
variable RESERVE_CHARGE on the opac form.
When the hold is placed, AddReserve calls GetReserveFee. So if the routine
would work correctly, we would not need this extra call in opac-reserve
in the whole place. Unfortunately, the routine is not working correctly.
I will submit a fix for GetReserveFee under a new report (14702).
Test plan:
[1] Add a hold fee to some category.
[2] Check the warn for placing a hold on such a book in OPAC.
[3] Observe that the actual fee is not charged. This is a current bug and
it will be addressed on report 14702.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 71ce0d96c9d72571e45c568acb7aab321a42009b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Aug 21 09:23:53 2015 +0200
Bug 9809: [QA Follow-up] Remove warnings from Hold.pm
Resolves two warnings on a uninitialized found column:
holds: Use of uninitialized value in string eq at /home/koha/testclone/Koha/Hold.pm line 53., referer: http://test.rijkskoha.nl:28080/cgi-bin/koha/circ/circulation.pl?borrowernumber=152
holds: Use of uninitialized value in string eq at /home/koha/testclone/Koha/Hold.pm line 74., referer: http://test.rijkskoha.nl:28080/cgi-bin/koha/circ/circulation.pl?borrowernumber=152
Test plan:
Run t/db_dependent/Hold.t.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit ad3239479db4e5542a6f29bfd1bb1af9187ac67b
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jun 30 08:19:29 2015 -0400
Bug 9809: Update AddReserve prototype to remove constraint parameter
Test Plan:
1) Apply this patch set
2) prove t/db_dependent/Circulation.t
3) prove t/db_dependent/Holds.t
4) prove t/db_dependent/Holds/LocalHoldsPriority.t
5) prove t/db_dependent/Holds/RevertWaitingStatus.t
6) prove t/db_dependent/HoldsQueue.t
7) prove t/db_dependent/Reserves.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
AMENDED: An else branch in reserve/placerequest.pl was removed. This had
the effect of making it no longer possible to place an any hold in the
staff client.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Verified placing a biblio level and an item level hold.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit a3795250862da29d32b124bfe18ca37b53888c79
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jun 30 07:30:32 2015 -0400
Bug 9809: Remove reserveconstraints references from C4::Reserves
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 76f16b1b42ded69fb9c9672bbeb7a92203783fe5
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jun 30 08:25:29 2015 -0400
Bug 9809: Update unit tests
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 4251d4f8822999d7b5d442d9e4ae86941ae67e06
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jun 30 07:32:56 2015 -0400
Bug 9809: Remove DBIC module for reserveconstraints
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit d4edaaada01be2069829afabf63650d6e09b6c61
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jun 30 08:51:55 2015 -0400
Bug 9809: Update Schema files
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 9930b5bf1b0cce46b1c97a5c352542c085ba6320
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jun 30 07:34:35 2015 -0400
Bug 9809: DB Updates
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
-----------------------------------------------------------------------
Summary of changes:
C4/ILSDI/Services.pm | 4 +-
C4/Installer/PerlDependencies.pm | 10 +
C4/Reserves.pm | 142 ++++----------
C4/SIP/ILS/Item.pm | 1 -
C4/SIP/ILS/Transaction/Hold.pm | 60 +++---
INSTALL.fedora7 | 3 +-
Koha.pm | 2 +-
Koha/Hold.pm | 6 +-
Koha/Schema/Result/OldReserve.pm | 12 +-
Koha/Schema/Result/Reserve.pm | 12 +-
Koha/Schema/Result/Reserveconstraint.pm | 82 ---------
Koha/Sitemapper.pm | 89 +++++++++
Koha/Sitemapper/Writer.pm | 125 +++++++++++++
t/Message.t => Koha/Template/Plugin/Biblio.pm | 20 +-
debian/koha-common.bash-completion | 18 ++
debian/scripts/koha-functions.sh | 2 +
docs/history.txt | 57 +++---
installer/data/mysql/kohastructure.sql | 15 --
installer/data/mysql/updatedatabase.pl | 15 ++
.../prog/en/includes/biblio-view-menu.inc | 22 ++-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 1 +
.../prog/en/modules/reserve/request.tt | 6 -
misc/cronjobs/sitemap.pl | 127 +++++++++++++
opac/opac-reserve.pl | 9 +-
reserve/placerequest.pl | 18 +-
reserve/request.pl | 2 -
serials/routing-preview.pl | 3 +-
t/db_dependent/Circulation.t | 5 +-
t/db_dependent/Holds.t | 44 +++--
t/db_dependent/Holds/LocalHoldsPriority.t | 1 -
t/db_dependent/Holds/RevertWaitingStatus.t | 1 -
t/db_dependent/HoldsQueue.t | 3 +-
t/db_dependent/Reserves.t | 38 ++--
t/db_dependent/Sitemapper.t | 193 ++++++++++++++++++++
34 files changed, 770 insertions(+), 378 deletions(-)
delete mode 100644 Koha/Schema/Result/Reserveconstraint.pm
create mode 100644 Koha/Sitemapper.pm
create mode 100644 Koha/Sitemapper/Writer.pm
copy t/Message.t => Koha/Template/Plugin/Biblio.pm (68%)
mode change 100755 => 100644
create mode 100755 misc/cronjobs/sitemap.pl
create mode 100755 t/db_dependent/Sitemapper.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list