From 67abcc64433ba945416c7c8e8bf8aecc8c932f14 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Thu, 20 Mar 2014 13:24:11 +0100 Subject: [PATCH] Bug 9612: fix SRU response for DOM indexing This patch makes changes to koha-conf.xml by removing the fallback section from biblioserver and authserver. The information is in a include file on the same server (no need to fall back) and moreover, some information is not up-to-date and should be moved elsewhere. The patch also simplifies the DOM retrieval-info files for auth and bib. And eliminates superfluous F and usmarc from the dom-config files. (I felt the urge to remove marcxml too, but left it for now; see also the second patch.) For reference, look at the marcxml example files of Zebra. NOTE: This patch does not deal with the Debian package installs. In the same way koha-conf-site.xml.in, and *-retrieval-info-* could be adjusted. Test plan: [1] Run at least a dev install in order to copy the new files to your Zebra folders. Choose for DOM indexing. Enable the SRU server on port 9998 (small edit in koha-conf.xml). [2] Restart Zebra and reindex -a -b -x. [3] Verify if a search from Koha still functions as expected. Check the SRU output on port 9998. NOTE: If you do not pass recordSchema, you should get back a marc response now (instead of index schema). Bonus: Add your server as a Z3950 target to another Koha install. And perform a Z3950 search from the other server to your new install. Bonus: Check response from the auth and biblio socket via yaz-client. [4] Reindex again with -a -b but without -x. [5] Repeat Koha search, SRU response (Z3950, yaz-client). Signed-off-by: Martin Renvoize Signed-off-by: Galen Charlton --- etc/koha-conf.xml | 198 +----------------- .../authorities/etc/dom-config-marc.xml | 7 +- etc/zebradb/authorities/etc/dom-config.xml | 7 +- etc/zebradb/biblios/etc/dom-config-marc.xml | 7 +- etc/zebradb/biblios/etc/dom-config.xml | 7 +- etc/zebradb/retrieval-info-auth-dom.xml | 6 +- etc/zebradb/retrieval-info-bib-dom.xml | 6 +- 7 files changed, 12 insertions(+), 226 deletions(-) diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml index 72da2de9f8..26f53b729d 100644 --- a/etc/koha-conf.xml +++ b/etc/koha-conf.xml @@ -37,74 +37,8 @@ __PAZPAR2_TOGGLE_XML_POST__ __ZEBRA_DATA_DIR__/biblios __ZEBRA_CONF_DIR__/__ZEBRA_BIB_CFG__ __ZEBRA_CONF_DIR__/pqf.properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - __ZEBRA_SRU_HOST__ - __ZEBRA_SRU_BIBLIOS_PORT__ - biblios - - - - + + __ZEBRA_CONF_DIR__/ccl.properties @@ -117,65 +51,8 @@ __PAZPAR2_TOGGLE_XML_POST__ __ZEBRA_DATA_DIR__/authorities __ZEBRA_CONF_DIR__/__ZEBRA_AUTH_CFG__ __ZEBRA_CONF_DIR__/pqf.properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - __ZEBRA_SRU_HOST__ - __ZEBRA_SRU_AUTHORITIES_PORT__ - authorities - - - - + + __ZEBRA_CONF_DIR__/ccl.properties @@ -189,71 +66,8 @@ __PAZPAR2_TOGGLE_XML_POST__ __ZEBRA_DATA_DIR__/biblios __ZEBRA_CONF_DIR__/__ZEBRA_BIB_CFG__ __ZEBRA_CONF_DIR__/pqf.properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - __ZEBRA_SRU_HOST__ - __ZEBRA_SRU_BIBLIOS_PORT__ - biblios - - - - + + __ZEBRA_CONF_DIR__/ccl.properties diff --git a/etc/zebradb/authorities/etc/dom-config-marc.xml b/etc/zebradb/authorities/etc/dom-config-marc.xml index 4e2e57eeab..3c2e267511 100644 --- a/etc/zebradb/authorities/etc/dom-config-marc.xml +++ b/etc/zebradb/authorities/etc/dom-config-marc.xml @@ -30,15 +30,10 @@ Authorities DOM config for MARC ISO2709 input - - - - - - + diff --git a/etc/zebradb/authorities/etc/dom-config.xml b/etc/zebradb/authorities/etc/dom-config.xml index da59247f2f..3a2b886710 100644 --- a/etc/zebradb/authorities/etc/dom-config.xml +++ b/etc/zebradb/authorities/etc/dom-config.xml @@ -30,15 +30,10 @@ Authorities DOM config for MARC XML input - - - - - - + diff --git a/etc/zebradb/biblios/etc/dom-config-marc.xml b/etc/zebradb/biblios/etc/dom-config-marc.xml index b47cbb4e9b..60d25e23d0 100644 --- a/etc/zebradb/biblios/etc/dom-config-marc.xml +++ b/etc/zebradb/biblios/etc/dom-config-marc.xml @@ -30,15 +30,10 @@ Bibliographic DOM config for MARC ISO2709 input - - - - - - + diff --git a/etc/zebradb/biblios/etc/dom-config.xml b/etc/zebradb/biblios/etc/dom-config.xml index ac261c0534..d47515992c 100644 --- a/etc/zebradb/biblios/etc/dom-config.xml +++ b/etc/zebradb/biblios/etc/dom-config.xml @@ -30,15 +30,10 @@ Bibliographic DOM config for MARC XML input - - - - - - + diff --git a/etc/zebradb/retrieval-info-auth-dom.xml b/etc/zebradb/retrieval-info-auth-dom.xml index f8480126ed..c9669371dd 100644 --- a/etc/zebradb/retrieval-info-auth-dom.xml +++ b/etc/zebradb/retrieval-info-auth-dom.xml @@ -14,9 +14,5 @@ outputcharset="utf-8"/> - - - + diff --git a/etc/zebradb/retrieval-info-bib-dom.xml b/etc/zebradb/retrieval-info-bib-dom.xml index f8480126ed..c9669371dd 100644 --- a/etc/zebradb/retrieval-info-bib-dom.xml +++ b/etc/zebradb/retrieval-info-bib-dom.xml @@ -14,9 +14,5 @@ outputcharset="utf-8"/> - - - + -- 2.39.5