[koha-commits] main Koha release repository branch master updated. v3.16.00-673-gca17512
Git repo owner
gitmaster at git.koha-community.org
Wed Oct 15 17:55:09 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 ca17512a8ed6af2a9503a366c99d5349611d7775 (commit)
via ccf7ae56f6ba3a4af6d3b65764449194fe657e50 (commit)
via 1d28da41fb8c1e81cb2825b513eb2344a995f335 (commit)
via e95cd1b126ed7485e5d13a696f9074202a087f1a (commit)
via 4c1a9fbd392d428e593aae36a0c57a590dacc2ae (commit)
via c1e384f250266a26b1638dc3077cc054c55cf602 (commit)
via eafeb3409765da4bb6b7ef2c1b56c94e0e5b9adc (commit)
via 2cc293ecd6f868de7d115176fb90d6b94dc29711 (commit)
via ca074c9253cc1fc15165fd836e4a032ce171cd99 (commit)
via a6d3e31860bc7ae26c393ff2fe3b0bdde848ddee (commit)
via 842913dfb82c95bfc0100e24ab177863cf959e15 (commit)
from c3c473b1b93be689bcf2b2285bd6a198406cd227 (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 ca17512a8ed6af2a9503a366c99d5349611d7775
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Wed Oct 15 12:15:26 2014 -0300
Bug 11232: (qa followup) empty ID due to namespace mistake
Note: NORMARC is missing the id field.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
This patch makes t/db_dependent/Search.t pass again.
NORMARC is currently not tested.
I checked the results before and after applying the patch
and the facets are now looking the same as before.
Passes all tests and QA script.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit ccf7ae56f6ba3a4af6d3b65764449194fe657e50
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Tue Oct 14 19:13:00 2014 -0300
Bug 11232: (qa followup) Add missing fields/subfields to the item types faceta
The itype facet was missing 952$y for both MARC21 and NORMARC.
This patch adds that. And also modifies the zebra-biblios-dom.cfg file
(also the debian/ version) so facetNumRecs is set to 1000 for zebra.
It is the amount of records that are taken into account. The more record,
the more exact the facets for the result set. 1000 was chosen as it changed
the time to reindex 1000 records from 18s to 19s.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 1d28da41fb8c1e81cb2825b513eb2344a995f335
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Wed Oct 15 10:28:44 2014 -0300
Bug 11232: (followup) Configuration variable for enabling Zebra facets
This patch adds a variable to koha-conf.xml controlling the use of Zebra facets.
Usage:
- use_zebra_facets = 1 | 0
Zebra facets work only on DOM.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit e95cd1b126ed7485e5d13a696f9074202a087f1a
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Sep 8 10:28:09 2014 -0300
Bug 11232: (followup) remove unnecesary namespace definition from all XML elements
The previous patches for facet extraction from Zebra indexes set a default
namespace on the following files:
etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml
etc/zebradb/marc_defs/normarc/biblios/biblio-koha-indexdefs.xml
etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml
and hence the XML file index_subfields can be cleaned by removing the namespace.
To test:
- Apply this patch
- Run
$ for i in marc21 normarc unimarc
do xsltproc etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl \
etc/zebradb/marc_defs/$i/biblios/biblio-koha-indexdefs.xml \
> etc/zebradb/marc_defs/$i/biblios/biblio-zebra-indexdefs.xsl
done
=> SUCCESS: no errors reported
- Run
$ git diff
=> SUCCESS: no differences on the xsl files
- Sign off :-D
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: David Cook <dcook at prosentient.com.au>
Seems to work with DOM and MARC21.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 4c1a9fbd392d428e593aae36a0c57a590dacc2ae
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Fri Sep 5 16:05:54 2014 -0300
Bug 11232: retrieve facets from Zebra's indexes in DOM
This patch adds the following routines to C4::Search
- GetFacets
This is a wrapper routine, that given a ZOOM::ResultSet, extracts
the relevant facets. To do the job, it uses the internal functions:
_get_facets_from_records and _get_facets_from_zebra. The choice is done
on querying the indexing mode: grs1 will use records, and dom zebra's facets.
- _get_facets_from_records
Just refactoring the already existent main loop from getRecords into a function.
- _get_facets_from_zebra
Given a result set, loop through all defined facets in C4::Koha::getFacets
and call _get_facet_from_result_set for each, to build the facets
information. It retrieves the facets from Zebra's facets.
- _get_facet_from_result_set
Given a result set and a facet index name, retrieve the facets
for the given index, and build the result for rendering.
To test this preliminay work:
- Apply the patches, install on DOM, using MARC21, NORMARC and UNIMARC.
- Reindex some DB with lots of records.
- Check facets work.
Note: UNIMARC is the only dialect that has more than one subfield (concatenated)
for facets values, so it is better to test on uNIMARC. The approach leaves room
for re-thinking facets in MARC21/NORMARC, but it is outside of the scope of the bug
(e.g. we could have more author facets)
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: David Cook <dcook at prosentient.com.au>
Seems to work with DOM and MARC21.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit c1e384f250266a26b1638dc3077cc054c55cf602
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Thu Sep 4 13:24:13 2014 -0300
Bug 11232: NORMARC facet definition and updated XSL file for DOM
This patch adds the facets definitions to the biblio-koha-indexdefs.xml, based
on what is hardcoded on C4::Koha::getFacets().
The biblio-zebra-indexdefs.xsl file for NORMARC is generated using the usual:
xsltproc ...koha-indexdefs-to-zebra.xsl ...normarc/biblios/biblio-koha-indexdefs.xml > \
...normarc/biblios/biblio-zebra-indexdefs.xsl
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: David Cook <dcook at prosentient.com.au>
Seems to work with DOM and MARC21.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit eafeb3409765da4bb6b7ef2c1b56c94e0e5b9adc
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Thu Sep 4 13:12:52 2014 -0300
Bug 11232: UNIMARC facet definition and updated XSL file for DOM
This patch adds the facets definitions to the biblio-koha-indexdefs.xml, based
on what is hardcoded on C4::Koha::getFacets().
The biblio-zebra-indexdefs.xsl file for UNIMARC is generated using the usual:
xsltproc ...koha-indexdefs-to-zebra.xsl ...unimarc/biblios/biblio-koha-indexdefs.xml > \
...unimarc/biblios/biblio-zebra-indexdefs.xsl
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: David Cook <dcook at prosentient.com.au>
Seems to work with DOM and MARC21.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 2cc293ecd6f868de7d115176fb90d6b94dc29711
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Thu Sep 4 13:12:09 2014 -0300
Bug 11232: MARC21 facet definition and updated XSL file for DOM
This patch adds the facets definitions to the biblio-koha-indexdefs.xml, based
on what is hardcoded on C4::Koha::getFacets().
The biblio-zebra-indexdefs.xsl file for MARC21 is generated using the usual:
xsltproc ...koha-indexdefs-to-zebra.xsl ...marc21/biblios/biblio-koha-indexdefs.xml > \
...marc21/biblios/biblio-zebra-indexdefs.xsl
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: David Cook <dcook at prosentient.com.au>
Seems to work with DOM and MARC21.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit ca074c9253cc1fc15165fd836e4a032ce171cd99
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Thu Sep 4 13:11:07 2014 -0300
Bug 11232: Add new syntax for facets definition on koha-indexdefs-to-zebra.xsl
This patch changes koha-indexdefs-to-zebra.xsl to correctly process a new syntax
for defining facet indexes on the XML files.
It also changes the retrieval file to allow access to Zebra's internal data from
Zoom (i.e. access to zebra::facet:*).
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: David Cook <dcook at prosentient.com.au>
Seems to work with DOM and MARC21.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit a6d3e31860bc7ae26c393ff2fe3b0bdde848ddee
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Sep 18 12:56:50 2014 +0200
Bug 12957: Get rid of warnings in aqbudgets.pl
There are a lot of warnings on navigating into the fund views (list,
editing, etc.)
"Use of uninitialized value in string eq..."
"Use of uninitialized value in hash element"
"Use of uninitialized value in concatenation..."
Test plan:
Verify the warnings don't appear anymore in logs on going on the fund
list view, editing a fund, saving a fund.
QA note: the budget_owner_name, budget_borrowernumber and branchname are
never used on the fund list view. A call to GetMember has been removed.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
This seems to work nicely reducing the amount of noise in the log
considerably.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 842913dfb82c95bfc0100e24ab177863cf959e15
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Oct 9 09:40:26 2014 -0400
Bug 13052 - OPAC Cart JavaScript is included twice in the footer
The external JavaScript file which powers the OPAC Cart should not be
included twice. The correct instance is the one which comes after the
definition of MSG strings.
To test you must have the opacbookbag system preference turned on. In
Bootstrap OPAC, test adding some items to the Cart and confirm that Cart
operations work correctly.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Cart is still working as expected, passes tests and QA script.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Search.pm | 170 +++++-
admin/aqbudgets.pl | 16 +-
debian/templates/koha-conf-site.xml.in | 1 +
debian/templates/marc21-retrieval-info-bib-dom.xml | 2 +
.../templates/normarc-retrieval-info-bib-dom.xml | 2 +
.../templates/unimarc-retrieval-info-bib-dom.xml | 2 +
debian/templates/zebra-biblios-dom-site.cfg.in | 1 +
etc/koha-conf.xml | 1 +
.../marc21/biblios/biblio-koha-indexdefs.xml | 564 +++++++++---------
.../marc21/biblios/biblio-zebra-indexdefs.xsl | 81 +++
.../normarc/biblios/biblio-koha-indexdefs.xml | 446 +++++++-------
.../normarc/biblios/biblio-zebra-indexdefs.xsl | 81 +++
.../unimarc/biblios/biblio-koha-indexdefs.xml | 607 +++++++++++---------
.../unimarc/biblios/biblio-zebra-indexdefs.xsl | 150 ++++-
etc/zebradb/retrieval-info-bib-dom.xml | 7 +
etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl | 102 +++-
etc/zebradb/zebra-biblios-dom.cfg | 1 +
.../bootstrap/en/includes/opac-bottom.inc | 7 +-
18 files changed, 1454 insertions(+), 787 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list