[koha-commits] main Koha release repository branch master updated. v3.16.00-515-g738f100
Git repo owner
gitmaster at git.koha-community.org
Mon Sep 1 15:46:34 CEST 2014
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 738f1001af6239a8893c3050ca21ea99854805b8 (commit)
via b23d5d84b07ce7011169c692ddc7569c9763c00e (commit)
via f5b26fd0ce2978d06813cfe0814f587d9ca15085 (commit)
via 1de8a7d8997d6a8a3dc1885c79f4b36f94adf759 (commit)
via 88521dda625feb108a1f6734a700e3325abd0890 (commit)
via eb4cb953ec3e4e48cec23c362ad29e6596854586 (commit)
via b4cc38344004348268f168ec8400a3e24c7c1012 (commit)
via db1929094fd06e835fb6a1f46cda7ce018a1f852 (commit)
via 168871403c3bc8df91d6be65caba4bdd49745085 (commit)
via aedb3e3df8fbe1b4731e2fbfc7453c84bd9925e5 (commit)
via 91d5a8384939b6a6a6082ccaef69645ef31f91e2 (commit)
via a06b1ac7285a6922e35141deeeada099be4962d5 (commit)
via 8c7377d21d8ff3460d920b555c801d4bff322840 (commit)
via fb0834e8f582e9e268ecef6de891ba5dc25c6fd9 (commit)
via 5b0d410d2deb10777058c262f4f353b5bbafce7d (commit)
via 7748facfa5e2e9f149ba85af8d988a113ced6177 (commit)
via b124020968f978cd17a3b0784867ec2f0e1d2489 (commit)
via 2e0671a1eda2099355e5e958d05f3a18953de987 (commit)
via 88f26fa90742dbd422995d19e8f26e8d81638b65 (commit)
from 4e1aaa4d589f1974ac9ec51e74367ac413a35699 (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 738f1001af6239a8893c3050ca21ea99854805b8
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Wed May 22 14:38:08 2013 +1200
Bug 10308 - local subjects can use authorities too
This adds entries for 690-699 to the authorities linker, so they get
linked up like everything else.
To Test:
* make sure your framework doesn't have 690 set up to link to
authorities (or it'll get linked as part of cataloguing.)
* add a subject with some term to the 690$a field.
* add an authority for TOPIC_TERM with the matching term.
* make sure zebra is up to date.
* run link_bibs_to_authorities.pl over your system.
* check that the authority is now linked to your record.
* repeat with the other 69x fields if you like.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Tested using 696a (PERSO_NAME). Works as described, no errors
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
This works as described, but linked authorities won't search
correctly when clicking on the link on the detail page,
as the 69x $9 is not indexed.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit b23d5d84b07ce7011169c692ddc7569c9763c00e
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Tue Jul 29 16:12:52 2014 -0300
Bug 12674: GetMarcISSN should not return empty ISSN
This patch makes GetMarcISSN test for empty subfield before pushing to the
result array.
To test:
- Run the regression test
=> FAILS for all MARC flavours
- Apply the patch
- Run the regression test
=> SUCCESS: tests pass
- Sign off
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit f5b26fd0ce2978d06813cfe0814f587d9ca15085
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Tue Jul 29 16:09:18 2014 -0300
Bug 12674: (regression tests) GetMarcISSN should not return empty ISSN
Proves GetMarcISSN returns empty ISSNs in the results array.
To reproduce:
- Run $ prove -v t/db_dependent/Biblio.t
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 1de8a7d8997d6a8a3dc1885c79f4b36f94adf759
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Sep 1 10:25:25 2014 -0300
Bug 6536: (RM followup) make DBIx::Class::Schema::Loader happy
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 88521dda625feb108a1f6734a700e3325abd0890
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Sep 1 10:11:34 2014 -0300
Bug 6536: DBRev 3.17.00.017
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit eb4cb953ec3e4e48cec23c362ad29e6596854586
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Aug 28 15:17:34 2014 +0200
Bug 6536: Follow-up: Updating installer sql files for z3950servers (Part 2)
This patch renames name to servername and type to servertype.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Tested all sql files by script.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit b4cc38344004348268f168ec8400a3e24c7c1012
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Aug 28 14:59:56 2014 +0200
Bug 6536: Follow-up: Updating web installer sql files for z3950servers
Removing icon, description and position from installer sql files.
Not all files contained them.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
I have run all sql files on an empty table by script.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit db1929094fd06e835fb6a1f46cda7ce018a1f852
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Wed Aug 27 13:24:18 2014 -0300
Bug 6536: QA Follow-up for fixing a unit test under Perl 5.18
The last test on the first series, fails randomly on Perl 5.18:
not ok 12 - Third query makes no difference
# Failed test 'Third query makes no difference'
# at t/db_dependent/Breeding.t line 104.
# got: ''
# expected: '1'
# Looks like you failed 1 test of 12.
not ok 1 - _build_query
This change makes tests pass. Please consider if this needs to be fixed
(i.e. sort order matters) or the test needs to be rewritten.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
I agree with adding the sort. (The need for doing this in Perl 5.18 is another
topic.)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 168871403c3bc8df91d6be65caba4bdd49745085
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Aug 27 16:56:11 2014 +0200
Bug 6536: QA Follow-up for removing warnings from QA tools
Resolved:
[1] FAIL C4/Breeding.pm
FAIL critic ControlStructures::ProhibitMutatingListFunctions
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
No warnings anymore.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit aedb3e3df8fbe1b4731e2fbfc7453c84bd9925e5
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Aug 27 16:45:56 2014 +0200
Bug 6536: QA Follow-up: Add some unit tests for Z3950Search in Breeding.pm
This patch may serve as a starting point for more unit tests in this part
of the code.
In this patch most internal subroutines of Z3950Search are covered.
In the XSLT part we reuse a XSL template from the XSLT_Handler.t test.
It needed a little tweaking for namespaces. And added the indicators on
the 990 field.
Test plan:
Run both Breeding.t and XSLT_Handler.t.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 91d5a8384939b6a6a6082ccaef69645ef31f91e2
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Aug 25 14:52:58 2014 +0200
Bug 6536: QA Follow-up for string changes referring to Z39.50
Z39.50 search now includes SRU targets.
This patch only touches strings referring to it.
No changes in behavior.
It replaces Z39.50 with Z39.50/SRU or external.
Deletes obsolete template z3950/searchresult.tt: not in use for some time.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit a06b1ac7285a6922e35141deeeada099be4962d5
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Aug 21 14:47:06 2014 +0200
Bug 6536: [QA Follow-up] Remove surrounding spaces in sru_fields
This patch only removes surrouding spaces at comma and equals-sign while
passing the options in sru_fields to the ZOOM object.
Test plan:
If you add spaces between options in sru_fields, searching should still work.
E.g. sru_fields= sru = get , sru_version = 1.1
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 8c7377d21d8ff3460d920b555c801d4bff322840
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jul 10 17:21:21 2014 +0200
Bug 6536: Add XSLT transformation on Z3950 search results
Use the stylesheets listed in field add_xslt of z3950servers to transform
search results of Z3950/SRU search.
Additionally, the template has been changed to make more error messages (or
warnings) visible when displaying results. Until now, error message were
shown in the results table and when connection errors occurred, no results
were displayed at all.
Test plan:
Create some stylesheets (or see the sample patch on bug 6536).
Add these stylesheets to some Z3950/SRU servers.
Do Z3950 search and verify the transformations.
Do a search with 2 targets; make one target fail (by manipulating its server
data). Do you see the connection error and the results for the other target?
Generate a XSLT error by modifying one stylesheet. Check search results. You
should see warnings.
Signed-off-by: Giuseppe Angilella <giuseppe.angilella at ct.infn.it>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit fb0834e8f582e9e268ecef6de891ba5dc25c6fd9
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jun 5 14:20:37 2014 +0200
Bug 6536: Include SRU searching in Breeding.pm
This patch makes it possible to include SRU servers in Z3950 search.
It adjusts the Z3950Search routine in Breeding module.
It also replaces SQL code with DBIx statements in Breeding.pm/Z3950Search
and the associated scripts z3950search.pl in cataloguing and acqui.
Test plan:
Verify if a normal Z3950 search still works in cataloging/acqui.
Add a SRU target. (You could just use Koha's port 9998.)
Define sru_options like sru=get.
Use that target in a Z3950 search in cataloging and acqui. (Import.)
Test sru_fields translation by comparing search results between various
settings for some of the fields. For instance, leave title empty and
after that set it to the title field of your SRU target.
Signed-off-by: Giuseppe Angilella <giuseppe.angilella at ct.infn.it>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 5b0d410d2deb10777058c262f4f353b5bbafce7d
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jun 5 08:55:09 2014 +0200
Bug 6536: Adjustments for servername and servertype
Replaces name by servername, type by servertype for running Z3950 search.
Limit search scripts to zed (z3950) servers until sru is supported.
Test plan:
Perform a Z3950 search in Cataloguing and Acquisition.
Verify that it still works as it did.
Signed-off-by: Giuseppe Angilella <giuseppe.angilella at ct.infn.it>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 7748facfa5e2e9f149ba85af8d988a113ced6177
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jul 16 16:38:57 2014 +0200
Bug 6536: SRU servers administration
This patch makes adjustments in admin/z3950servers in order to insert,
edit and delete SRU server records.
Test plan:
Add, edit, copy and delete SRU server.
Check if adding, editing, copying and deleting Z3950 servers still works.
Signed-off-by: Giuseppe Angilella <giuseppe.angilella at ct.infn.it>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit b124020968f978cd17a3b0784867ec2f0e1d2489
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu May 22 10:08:42 2014 +0200
Bug 6536: Update DBIx schema of z3950servers for testing
This patch adjusts the DBIx schema file for z3950servers table.
This can be used for testing this set of patches.
When the report is pushed, the RM should update the DBIx schema.
Signed-off-by: Giuseppe Angilella <giuseppe.angilella at ct.infn.it>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 2e0671a1eda2099355e5e958d05f3a18953de987
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu May 1 15:07:12 2014 +0200
Bug 6536: Dbrev for Z3950 search improvements
Adjusts table z3950servers:
Drops unused columns icon, description and position.
Moves id column to first position.
Renames name to servername, and type to servertype. (This is not only more
clear but may eliminate some problems too with DBIx.)
Changes recordtype from varchar(45) to enumeration with two members. [The
upgrade replaces unknown record types with biblio, although it is very
unlikely to find such records.]
Adds SRU as servertype enumeration member. Removes opensearch, since it is
not used/supported. [The upgrade replaces unknown server types with zed
(z3950) (in exceptional cases).]
Adds new columns: sru_options, sru_fields, add_xslt.
Test plan:
Run database update via webinstaller.
Check your z3950servers table.
Signed-off-by: Giuseppe Angilella <giuseppe.angilella at ct.infn.it>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 88f26fa90742dbd422995d19e8f26e8d81638b65
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu May 22 15:37:29 2014 +0200
Bug 6536: Add a form for SRU Field mapping
This form allows you to enter the match between the standard names of
the Z3950 search fields and the field names for a specific SRU server.
This patch only adds the form; it will be used in a subsequent patch.
Test plan:
Not needed, but you can call the form by constructing a URL like:
cgi-bin/koha/admin/sru_modmapping.pl?mapping=title=1,author=2
You should see the form with title and author filled.
Note that you cannot save the information yet.
Signed-off-by: Giuseppe Angilella <giuseppe.angilella at ct.infn.it>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Biblio.pm | 3 +-
C4/Breeding.pm | 268 ++++++++++++--------
C4/Heading/MARC21.pm | 6 +
Koha/Schema/Result/Z3950server.pm | 92 ++++---
acqui/z3950_search.pl | 14 +-
patron_lists/lists.pl => admin/sru_modmapping.pl | 36 +--
admin/z3950servers.pl | 16 +-
cataloguing/z3950_auth_search.pl | 2 +-
cataloguing/z3950_search.pl | 14 +-
.../mysql/de-DE/optional/sample_z3950_servers.sql | 2 +-
.../mysql/en/optional/sample_z3950_servers.sql | 2 +-
.../mysql/es-ES/optional/sample_z3950_servers.sql | 2 +-
.../data/mysql/fr-FR/2-Optionel/z3950_BNF.sql | 2 +-
installer/data/mysql/kohastructure.sql | 14 +-
.../data/mysql/nb-NO/2-Valgfritt/z3950servers.sql | 12 +-
.../mysql/pl-PL/optional/sample_z3950_servers.sql | 2 +-
.../ru-RU/optional/z39-50servers_collection.sql | 18 +-
.../uk-UA/optional/z39-50servers_collection.sql | 18 +-
installer/data/mysql/updatedatabase.pl | 29 ++-
.../intranet-tmpl/prog/en/includes/admin-menu.inc | 2 +-
.../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 4 +-
.../prog/en/includes/z3950-admin-search.inc | 4 +-
.../prog/en/modules/acqui/z3950_search.tt | 4 +-
.../prog/en/modules/admin/admin-home.tt | 4 +-
.../prog/en/modules/admin/sru_modmapping.tt | 91 +++++++
.../prog/en/modules/admin/z3950servers.tt | 77 ++++--
.../prog/en/modules/catalogue/results.tt | 2 +-
.../prog/en/modules/cataloguing/addbiblio.tt | 4 +-
.../prog/en/modules/cataloguing/addbooks.tt | 2 +-
.../en/modules/cataloguing/z3950_auth_search.tt | 2 +-
.../prog/en/modules/cataloguing/z3950_search.tt | 38 +--
.../prog/en/modules/z3950/searchresult.tt | 45 ----
kohaversion.pl | 2 +-
t/db_dependent/Biblio.t | 12 +-
t/db_dependent/Breeding.t | 181 +++++++++++++
t/db_dependent/XSLT_Handler/test01.xsl | 4 +-
36 files changed, 702 insertions(+), 328 deletions(-)
copy patron_lists/lists.pl => admin/sru_modmapping.pl (57%)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/z3950/searchresult.tt
create mode 100644 t/db_dependent/Breeding.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list