[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.03-35-gc50b422
Git repo owner
gitmaster at git.koha-community.org
Thu Mar 21 01:21:47 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 c50b422a1935c60fca9760d609a0e00a8255ee62 (commit)
from a91b6eae24f79bca2bf256b59acef4512cb155e3 (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 c50b422a1935c60fca9760d609a0e00a8255ee62
Author: Magnus Enger <magnus at enger.priv.no>
Date: Tue Mar 5 16:51:51 2013 +0100
Bug 9256 - Fix search for the packages
See the bug for a description of the problem.
This patch tries to restore searching for marcflavour != MARC21 as well as
allowing instances with different marcflavors to co-exist on the same server.
To test:
- Do a package install with e.g. the official squeeze-dev packages and create at
least two instances, with different marcflavours, e.g.:
sudo koha-create --create-db --marcflavor marc21 test1
sudo koha-create --create-db --marcflavor normarc test2
- Run through the web installers for both instances and add a couple of
records to each. Wait for the records to be indexed or run indexing manually
with
sudo koha-rebuild-zebra -f test1
sudo koha-rebuild-zebra -f test2
- Try searching for the records you added. It should work in test1 but not in
test2.
- Apply the patch and build packages with the build-git-snapshot script
- Install the new koha-common package
- Create two instances (because of Bug 9754 it is probably best to give the
instances different names than the ones you created above, or to do this on
a fresh VM or similar) and add records, as described above. Searching should
now work equally well for both instances.
Please note: Because of Bug 9752 you will have to set marcflavour = NORMARC
by hand before you do the searching, if you choose NORMARC as the marc flavour
on one of the instances you create.
Please note too: I am not confident that this is the perfect solution, so
merciless and thorough testing is necessary! ;-)
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Works for me for GRS-1 (package installation out of the box). Could not figure out how to set up DOM indexing and eventually stopped caring about it.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Build packages with the patch and checked that creating
instances and search within them works for both MARC21 and NORMARC.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
Makefile.PL | 1 -
debian/templates/koha-conf-site.xml.in | 48 ++++++++++----------
.../templates/marc21-retrieval-info-auth-dom.xml | 22 +++++++++
.../templates/marc21-retrieval-info-auth-grs1.xml | 40 ++++++++++++++++
debian/templates/marc21-retrieval-info-bib-dom.xml | 22 +++++++++
.../templates/marc21-retrieval-info-bib-grs1.xml | 40 ++++++++++++++++
.../templates/normarc-retrieval-info-auth-dom.xml | 22 +++++++++
.../templates/normarc-retrieval-info-auth-grs1.xml | 40 ++++++++++++++++
.../templates/normarc-retrieval-info-bib-dom.xml | 22 +++++++++
.../templates/normarc-retrieval-info-bib-grs1.xml | 40 ++++++++++++++++
.../templates/unimarc-retrieval-info-auth-dom.xml | 22 +++++++++
.../templates/unimarc-retrieval-info-auth-grs1.xml | 40 ++++++++++++++++
.../templates/unimarc-retrieval-info-bib-dom.xml | 22 +++++++++
.../templates/unimarc-retrieval-info-bib-grs1.xml | 40 ++++++++++++++++
etc/zebradb/etc/marc21.mar | 2 +
etc/zebradb/etc/normarc.mar | 2 +
etc/zebradb/etc/unimarc.mar | 2 +
etc/zebradb/etc/usmarc.mar | 5 +-
.../marc_defs/marc21/authorities/record.abs | 2 +-
etc/zebradb/marc_defs/marc21/biblios/record.abs | 2 +-
etc/zebradb/marc_defs/normarc/biblios/record.abs | 2 +-
.../marc_defs/unimarc/authorities/record.abs | 2 +-
etc/zebradb/marc_defs/unimarc/biblios/record.abs | 2 +-
23 files changed, 409 insertions(+), 33 deletions(-)
create mode 100644 debian/templates/marc21-retrieval-info-auth-dom.xml
create mode 100644 debian/templates/marc21-retrieval-info-auth-grs1.xml
create mode 100644 debian/templates/marc21-retrieval-info-bib-dom.xml
create mode 100644 debian/templates/marc21-retrieval-info-bib-grs1.xml
create mode 100644 debian/templates/normarc-retrieval-info-auth-dom.xml
create mode 100644 debian/templates/normarc-retrieval-info-auth-grs1.xml
create mode 100644 debian/templates/normarc-retrieval-info-bib-dom.xml
create mode 100644 debian/templates/normarc-retrieval-info-bib-grs1.xml
create mode 100644 debian/templates/unimarc-retrieval-info-auth-dom.xml
create mode 100644 debian/templates/unimarc-retrieval-info-auth-grs1.xml
create mode 100644 debian/templates/unimarc-retrieval-info-bib-dom.xml
create mode 100644 debian/templates/unimarc-retrieval-info-bib-grs1.xml
create mode 100644 etc/zebradb/etc/marc21.mar
create mode 100644 etc/zebradb/etc/normarc.mar
create mode 100644 etc/zebradb/etc/unimarc.mar
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list