[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.04-18-g9cf40a7
Git repo owner
gitmaster at git.koha-community.org
Fri Mar 29 08:23:46 CET 2013
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.10.x has been updated
via 9cf40a72ba2f8b206717e19e703506970cedfef2 (commit)
via 595687e213587e690d4bc66752e582fdac787043 (commit)
via c7d753ce9636f4f3997b538e124baca2d3c20c13 (commit)
via ea2538458121651c45bdfdac04f0391d1cd2d668 (commit)
via a1bdb919aa191b91d1eae07b6e1ebdffd9a311ba (commit)
via 44e1e12e965c562ce63f061ab52653f49d8ca44b (commit)
via 20eb27a44a886f3061e2e8fdc4658c929a80d708 (commit)
via a03759f01d34e7b7ab5c5b70d5da0c1fc6f2a997 (commit)
from 4ab7ba31dacfaebed4cf3e57ec6fc28d2ddcdc74 (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 9cf40a72ba2f8b206717e19e703506970cedfef2
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon Jan 7 19:12:57 2013 -0500
bug 9496: improve error checking in rebuild_zebra.pl
When using rebuild_zebra to index all records, skip over
bibliographic or authority records that don't come out
as valid XML. Also, strip extraneous XML declarations when
using --nosanitize.
Test plans
----------
Note that both plans assume that DOM indexing is turned on.
Test plan #1
============
[1] Run rebuild_zebra.pl with the -x -nosanitize options. Without
the patch, zebraidx should terminate early and complain
about invalid XML.
[2] With the patch, the rebuild_zebra.pl should work without
error.
Test plan #2
============
[1] Intentionally make a MARCXML record invalid, e.g, by running
the following SQL:
UPDATE bilbioitems SET marcxml = CONCATENATE(marcxml, 'junk')
WHERE biblionumber = 123;
[2] Run rebuild_zebra.pl -b -x -r
[3] Without the patch, only part of the database will be indexed.
[4] With the patch, rebuild_zebra.pl will not export the bad
record and will give an error message saying so, but will
successfully index the rest of the records.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Larry Baerveldt <larry at bywatersolutions.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 595687e213587e690d4bc66752e582fdac787043
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date: Fri Mar 29 20:12:07 2013 +1300
Bumping db version
commit c7d753ce9636f4f3997b538e124baca2d3c20c13
Author: Dobrica Pavlinusic <dpavlin at rot13.org>
Date: Wed Mar 20 14:46:07 2013 +0100
Bug 8378 - followup - update notices to use <<items.fine>>
Didn't break on well-formed notices, and fixed those with problems
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Conflicts:
installer/data/mysql/updatedatabase.pl
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit ea2538458121651c45bdfdac04f0391d1cd2d668
Author: Dobrica Pavlinusic <dpavlin at rot13.org>
Date: Wed Mar 20 14:13:16 2013 +0100
Bug 8378 - followup - sample_notices.sql updated to <<items.fine>>
Trivial string substitution.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit a1bdb919aa191b91d1eae07b6e1ebdffd9a311ba
Author: Dobrica Pavlinusic <dpavlin at rot13.org>
Date: Tue Mar 19 14:36:14 2013 +0100
Bug 8378 - show all items columns and new items.fine
This allows users to select any columns from items and adds new
items.fine field introduced by previous patch to user interface.
Note: This works as expected. items.fine appears as an option and gets inserted in the notice template as expected.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 44e1e12e965c562ce63f061ab52653f49d8ca44b
Author: Dobrica Pavlinusic <dpavlin at rot13.org>
Date: Tue Mar 19 13:40:50 2013 +0100
Bug 8378 - <fine> in overdues changed to <<items.fine>>
This patch reintroduces fines in overdue_notices.pl with minimal
changes to exsiting code.
It DOES changes template syntax, it used to be <fine>USD</fine> but
currency was not recalculated and used only to select format, so
now we are using active system currency because values are in it
anyway.
Example notify template:
<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>,
Barcode: <<items.barcode>> Fine: <<items.fine>> </item>
If your active currency doesn't have valid ISO code this code will
fallback to sprintf with two decimal digits, and you can insert
currency symbol in template itself (currency field is not editable
through web interface, so this fallback might be useful for existing
installations).
Test scenario:
1. configure fine amount under "Circulation and fines rules"
for patron category and item type
2. checkout item with correct type to partron in correct
category with due date set to yesterday
3. verify that overdue notice uses new <<items.fine>> tag
4. run ./misc/cronjobs/fines.pl to calculate fines
5. run ./misc/cronjobs/overdue_notices.pl -n
and verify that fine amount is included
Notes: Tested using the default ODUE notice, changing:
<fines>USD</fines>
for
<<items.fine>>
Everything worked as expected with finesmode=production set.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 20eb27a44a886f3061e2e8fdc4658c929a80d708
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Wed Mar 13 15:51:37 2013 +1300
Bug 9802 - add test case to ensure man pages have correct XML
To test:
* run xt/verify-debian-docbook.t and make sure it's all OK
* modify an xml file in debian/docs, try again, make sure it fails
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
- Running "prove -v xt/verify-debian-docbook.t" loops through all the
XML files in debian/docs and reports them as being ok.
- Removing a "<" from one of the files makes the test report it as
an error
- I did not verify that the test actually trips up a package build
if there is invalid XML.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit a03759f01d34e7b7ab5c5b70d5da0c1fc6f2a997
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Mar 5 14:08:12 2013 -0500
Bug 9748: don't link items in SCO checkout list back to main OPAC
It appears that the conversion from HTML::Template to TT
changed noitemlinks to ISSUE.noitemlinks, hence it is being ignored.
This is a problem for SCO kiosks where all the navigation controls
are hidden. Clicking the link means leaving the SCO module and
not being able to get back.
Test plan:
1) Run SCO module, check for item links
2) Apply patch
3) Run SCO module, note that the items no longer have links
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
-----------------------------------------------------------------------
Summary of changes:
debian/control | 3 +-
debian/control.in | 3 +-
debian/rules | 1 +
.../data/mysql/de-DE/mandatory/sample_notices.sql | 2 +-
.../data/mysql/en/mandatory/sample_notices.sql | 2 +-
.../data/mysql/es-ES/mandatory/sample_notices.sql | 2 +-
.../mysql/fr-FR/1-Obligatoire/sample_notices.sql | 2 +-
installer/data/mysql/it-IT/necessari/notices.sql | 4 +-
.../mysql/nb-NO/1-Obligatorisk/sample_notices.sql | 2 +-
.../data/mysql/pl-PL/mandatory/sample_notices.sql | 2 +-
.../data/mysql/ru-RU/mandatory/sample_notices.sql | 2 +-
.../data/mysql/uk-UA/mandatory/sample_notices.sql | 2 +-
installer/data/mysql/updatedatabase.pl | 17 ++++++++++++++
.../opac-tmpl/prog/en/modules/sco/sco-main.tt | 2 +-
kohaversion.pl | 2 +-
misc/cronjobs/overdue_notices.pl | 14 ++++-------
misc/migration_tools/rebuild_zebra.pl | 24 ++++++++++++++++++-
tools/letter.pl | 3 +-
.../verify-debian-docbook.t | 22 +++++++++---------
19 files changed, 74 insertions(+), 37 deletions(-)
copy misc/cronjobs/holds/auto_unsuspend_holds.pl => xt/verify-debian-docbook.t (65%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list