@@ -, +, @@
- 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.
---
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
--- a/Makefile.PL
+++ a/Makefile.PL
@@ -508,7 +508,6 @@ my $pl_files = {
if ($config{'INSTALL_ZEBRA'} eq "yes") {
push @{ $pl_files->{'rewrite-config.PL'} }, (
'blib/ZEBRA_CONF_DIR/etc/passwd',
- 'blib/ZEBRA_CONF_DIR/etc/usmarc.mar',
'blib/ZEBRA_CONF_DIR/zebra-biblios.cfg',
'blib/ZEBRA_CONF_DIR/zebra-biblios-dom.cfg',
'blib/ZEBRA_CONF_DIR/zebra-authorities.cfg',
--- a/debian/templates/koha-conf-site.xml.in
+++ a/debian/templates/koha-conf-site.xml.in
@@ -29,47 +29,47 @@
/etc/koha/sites/__KOHASITE__/zebra-biblios.cfg
/etc/koha/zebradb/pqf.properties
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -104,42 +104,42 @@
/var/lib/koha/__KOHASITE__/authorities
/etc/koha/sites/__KOHASITE__/zebra-authorities-dom.cfg
/etc/koha/zebradb/pqf.properties
-
-
-
+
+
-
+
-
+
-
+
-
+
-
+
@@ -179,47 +179,47 @@
/etc/koha/sites/__KOHASITE__/zebra-biblios.cfg
/etc/koha/zebradb/pqf.properties
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
--- a/debian/templates/marc21-retrieval-info-auth-dom.xml
+++ a/debian/templates/marc21-retrieval-info-auth-dom.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- a/debian/templates/marc21-retrieval-info-auth-grs1.xml
+++ a/debian/templates/marc21-retrieval-info-auth-grs1.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- a/debian/templates/marc21-retrieval-info-bib-dom.xml
+++ a/debian/templates/marc21-retrieval-info-bib-dom.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- a/debian/templates/marc21-retrieval-info-bib-grs1.xml
+++ a/debian/templates/marc21-retrieval-info-bib-grs1.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- a/debian/templates/normarc-retrieval-info-auth-dom.xml
+++ a/debian/templates/normarc-retrieval-info-auth-dom.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- a/debian/templates/normarc-retrieval-info-auth-grs1.xml
+++ a/debian/templates/normarc-retrieval-info-auth-grs1.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- a/debian/templates/normarc-retrieval-info-bib-dom.xml
+++ a/debian/templates/normarc-retrieval-info-bib-dom.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- a/debian/templates/normarc-retrieval-info-bib-grs1.xml
+++ a/debian/templates/normarc-retrieval-info-bib-grs1.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- a/debian/templates/unimarc-retrieval-info-auth-dom.xml
+++ a/debian/templates/unimarc-retrieval-info-auth-dom.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- a/debian/templates/unimarc-retrieval-info-auth-grs1.xml
+++ a/debian/templates/unimarc-retrieval-info-auth-grs1.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- a/debian/templates/unimarc-retrieval-info-bib-dom.xml
+++ a/debian/templates/unimarc-retrieval-info-bib-dom.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- a/debian/templates/unimarc-retrieval-info-bib-grs1.xml
+++ a/debian/templates/unimarc-retrieval-info-bib-grs1.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/zebradb/etc/marc21.mar
+++ a/etc/zebradb/etc/marc21.mar
@@ -0,0 +1,2 @@
+name marc21
+reference marc21
--- a/etc/zebradb/etc/normarc.mar
+++ a/etc/zebradb/etc/normarc.mar
@@ -0,0 +1,2 @@
+name normarc
+reference normarc
--- a/etc/zebradb/etc/unimarc.mar
+++ a/etc/zebradb/etc/unimarc.mar
@@ -0,0 +1,2 @@
+name unimarc
+reference unimarc
--- a/etc/zebradb/etc/usmarc.mar
+++ a/etc/zebradb/etc/usmarc.mar
@@ -1,3 +1,2 @@
-# $Id: usmarc.mar,v 1.1 2002/10/22 12:51:09 adam Exp $
-name __ZEBRA_MARC_FORMAT__
-reference __ZEBRA_MARC_FORMAT__
+name usmarc
+reference USmarc
--- a/etc/zebradb/marc_defs/marc21/authorities/record.abs
+++ a/etc/zebradb/marc_defs/marc21/authorities/record.abs
@@ -14,7 +14,7 @@ attset gils.att
esetname F @
esetname B @
-marc usmarc.mar
+marc marc21.mar
systag sysno rank
xpath enable
--- a/etc/zebradb/marc_defs/marc21/biblios/record.abs
+++ a/etc/zebradb/marc_defs/marc21/biblios/record.abs
@@ -21,7 +21,7 @@ attset gils.att
esetname F @
esetname B @
-marc usmarc.mar
+marc marc21.mar
systag sysno rank
xpath enable
# Some notes:
--- a/etc/zebradb/marc_defs/normarc/biblios/record.abs
+++ a/etc/zebradb/marc_defs/normarc/biblios/record.abs
@@ -35,7 +35,7 @@ attset gils.att
esetname F @
esetname B @
-marc usmarc.mar
+marc normarc.mar
systag sysno rank
xpath enable
# Some notes:
--- a/etc/zebradb/marc_defs/unimarc/authorities/record.abs
+++ a/etc/zebradb/marc_defs/unimarc/authorities/record.abs
@@ -6,7 +6,7 @@ attset gils.att
esetname F @
esetname B @
-marc usmarc.mar
+marc unimarc.mar
systag sysno rank
xpath enable
--- a/etc/zebradb/marc_defs/unimarc/biblios/record.abs
+++ a/etc/zebradb/marc_defs/unimarc/biblios/record.abs
@@ -16,7 +16,7 @@ attset gils.att
esetname F @
esetname B @
-marc usmarc.mar
+marc unimarc.mar
systag sysno rank
xpath disable
--