Bugzilla – Attachment 27500 Details for
Bug 9612
SRU Response is different when DOM indexing is enabled
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PUSHED] Bug 9612: SRU response for DOM indexing
SIGNED-OFF-Bug-9612-SRU-response-for-DOM-indexing.patch (text/plain), 16.62 KB, created by
Martin Renvoize
on 2014-04-23 16:48:46 UTC
(
hide
)
Description:
[PUSHED] Bug 9612: SRU response for DOM indexing
Filename:
MIME Type:
Creator:
Martin Renvoize
Created:
2014-04-23 16:48:46 UTC
Size:
16.62 KB
patch
obsolete
>From 0c4f9425d4dba6d269a1eab1614f098351656eb9 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Thu, 20 Mar 2014 13:24:11 +0100 >Subject: [PATCH] [SIGNED OFF] Bug 9612: 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 <martin.renvoize@ptfs-europe.com> >--- > etc/koha-conf.xml | 198 +---------------------- > etc/zebradb/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 72da2de..26f53b7 100644 >--- a/etc/koha-conf.xml >+++ b/etc/koha-conf.xml >@@ -37,74 +37,8 @@ __PAZPAR2_TOGGLE_XML_POST__ > <directory>__ZEBRA_DATA_DIR__/biblios</directory> > <config>__ZEBRA_CONF_DIR__/__ZEBRA_BIB_CFG__</config> > <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn> >- <!-- <docpath>xsl</docpath> --> >- <!-- <stylesheet>xsl/default.xsl</stylesheet> --> >- <!-- <maximumrecordsize>2000000</maximumrecordsize> --> >- <xi:include href="__KOHA_CONF_DIR__/zebradb/__BIB_RETRIEVAL_CFG__" >- xmlns:xi="http://www.w3.org/2001/XInclude"> >- <xi:fallback> >- <retrievalinfo> >- <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/> >- <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/> >- <retrieval syntax="xml" name="F"/> >- <retrieval syntax="xml" name="B"/> >- <retrieval syntax="xml" name="marcxml" >- identifier="info:srw/schema/1/marcxml-v1.1"> >- <backend syntax="__ZEBRA_MARC_FORMAT__" name="F"> >- <marc inputformat="marc" outputformat="marcxml" >- inputcharset="utf-8"/> >- </backend> >- </retrieval> >- <retrieval syntax="xml" name="dc"> >- <backend syntax="__ZEBRA_MARC_FORMAT__" name="F"> >- <marc inputformat="marc" outputformat="marcxml" >- inputcharset="utf-8"/> >- <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/> >- </backend> >- </retrieval> >- <retrieval syntax="xml" name="mods"> >- <backend syntax="__ZEBRA_MARC_FORMAT__" name="F"> >- <marc inputformat="marc" outputformat="marcxml" >- inputcharset="utf-8"/> >- <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/> >- </backend> >- </retrieval> >- <retrieval syntax="xml" name="rdfdc"> >- <backend syntax="__ZEBRA_MARC_FORMAT__" name="F"> >- <marc inputformat="marc" outputformat="marcxml" >- inputcharset="utf-8"/> >- <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/> >- </backend> >- </retrieval> >- <retrieval syntax="xml" name="rss2"> >- <backend syntax="__ZEBRA_MARC_FORMAT__" name="F"> >- <marc inputformat="marc" outputformat="marcxml" >- inputcharset="utf-8"/> >- <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RSS2.xsl"/> >- </backend> >- </retrieval> >- <retrieval syntax="xml" name="utils"> >- <backend syntax="__ZEBRA_MARC_FORMAT__" name="F"> >- <marc inputformat="marc" outputformat="marcxml" >- inputcharset="utf-8"/> >- <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/> >- </backend> >- </retrieval> >- </retrievalinfo> >- </xi:fallback> >- </xi:include> >- <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-biblios.xml" >- xmlns:xi="http://www.w3.org/2001/XInclude"> >- <xi:fallback> >- <explain xmlns="http://explain.z3950.org/dtd/2.0/"> >- <serverInfo> >- <host>__ZEBRA_SRU_HOST__</host> >- <port>__ZEBRA_SRU_BIBLIOS_PORT__</port> >- <database>biblios</database> >- </serverInfo> >- </explain> >- </xi:fallback> >- </xi:include> >+ <xi:include href="__KOHA_CONF_DIR__/zebradb/__BIB_RETRIEVAL_CFG__" xmlns:xi="http://www.w3.org/2001/XInclude"/> >+ <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-biblios.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> > </server> > <serverinfo id="biblioserver"> > <ccl2rpn>__ZEBRA_CONF_DIR__/ccl.properties</ccl2rpn> >@@ -117,65 +51,8 @@ __PAZPAR2_TOGGLE_XML_POST__ > <directory>__ZEBRA_DATA_DIR__/authorities</directory> > <config>__ZEBRA_CONF_DIR__/__ZEBRA_AUTH_CFG__</config> > <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn> >- <!-- <docpath>xsl</docpath> --> >- <!-- <stylesheet>xsl/default.xsl</stylesheet> --> >- <!-- <maximumrecordsize>2000000</maximumrecordsize> --> >- <xi:include href="__KOHA_CONF_DIR__/zebradb/__AUTH_RETRIEVAL_CFG__" >- xmlns:xi="http://www.w3.org/2001/XInclude"> >- <xi:fallback> >- <retrievalinfo> >- <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/> >- <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/> >- <retrieval syntax="xml" name="marcxml" >- identifier="info:srw/schema/1/marcxml-v1.1"> >- <backend syntax="__ZEBRA_MARC_FORMAT__" name="F"> >- <marc inputformat="marc" outputformat="marcxml" >- inputcharset="utf-8"/> >- </backend> >- </retrieval> >- <retrieval syntax="xml" name="dc"> >- <backend syntax="__ZEBRA_MARC_FORMAT__" name="F"> >- <marc inputformat="marc" outputformat="marcxml" >- inputcharset="utf-8"/> >- <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/> >- </backend> >- </retrieval> >- <retrieval syntax="xml" name="mods"> >- <backend syntax="__ZEBRA_MARC_FORMAT__" name="F"> >- <marc inputformat="marc" outputformat="marcxml" >- inputcharset="utf-8"/> >- <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/> >- </backend> >- </retrieval> >- <retrieval syntax="xml" name="rdfdc"> >- <backend syntax="__ZEBRA_MARC_FORMAT__" name="F"> >- <marc inputformat="marc" outputformat="marcxml" >- inputcharset="utf-8"/> >- <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/> >- </backend> >- </retrieval> >- <retrieval syntax="xml" name="utils"> >- <backend syntax="__ZEBRA_MARC_FORMAT__" name="F"> >- <marc inputformat="marc" outputformat="marcxml" >- inputcharset="utf-8"/> >- <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/> >- </backend> >- </retrieval> >- </retrievalinfo> >- </xi:fallback> >- </xi:include> >- <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-authorities.xml" >- xmlns:xi="http://www.w3.org/2001/XInclude"> >- <xi:fallback> >- <explain xmlns="http://explain.z3950.org/dtd/2.0/"> >- <serverInfo> >- <host>__ZEBRA_SRU_HOST__</host> >- <port>__ZEBRA_SRU_AUTHORITIES_PORT__</port> >- <database>authorities</database> >- </serverInfo> >- </explain> >- </xi:fallback> >- </xi:include> >+ <xi:include href="__KOHA_CONF_DIR__/zebradb/__AUTH_RETRIEVAL_CFG__" xmlns:xi="http://www.w3.org/2001/XInclude"/> >+ <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-authorities.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> > </server> > <serverinfo id="authorityserver"> > <ccl2rpn>__ZEBRA_CONF_DIR__/ccl.properties</ccl2rpn> >@@ -189,71 +66,8 @@ __PAZPAR2_TOGGLE_XML_POST__ > <directory>__ZEBRA_DATA_DIR__/biblios</directory> > <config>__ZEBRA_CONF_DIR__/__ZEBRA_BIB_CFG__</config> > <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn> >- <xi:include href="__KOHA_CONF_DIR__/zebradb/__BIB_RETRIEVAL_CFG__" >- xmlns:xi="http://www.w3.org/2001/XInclude"> >- <xi:fallback> >- <retrievalinfo> >- <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/> >- <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/> >- <retrieval syntax="xml" name="F"/> >- <retrieval syntax="xml" name="B"/> >- <retrieval syntax="xml" name="marcxml" >- identifier="info:srw/schema/1/marcxml-v1.1"> >- <backend syntax="__ZEBRA_MARC_FORMAT__" name="F"> >- <marc inputformat="marc" outputformat="marcxml" >- inputcharset="utf-8"/> >- </backend> >- </retrieval> >- <retrieval syntax="xml" name="dc"> >- <backend syntax="__ZEBRA_MARC_FORMAT__" name="F"> >- <marc inputformat="marc" outputformat="marcxml" >- inputcharset="utf-8"/> >- <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/> >- </backend> >- </retrieval> >- <retrieval syntax="xml" name="mods"> >- <backend syntax="__ZEBRA_MARC_FORMAT__" name="F"> >- <marc inputformat="marc" outputformat="marcxml" >- inputcharset="utf-8"/> >- <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/> >- </backend> >- </retrieval> >- <retrieval syntax="xml" name="rdfdc"> >- <backend syntax="__ZEBRA_MARC_FORMAT__" name="F"> >- <marc inputformat="marc" outputformat="marcxml" >- inputcharset="utf-8"/> >- <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/> >- </backend> >- </retrieval> >- <retrieval syntax="xml" name="rss2"> >- <backend syntax="__ZEBRA_MARC_FORMAT__" name="F"> >- <marc inputformat="marc" outputformat="marcxml" >- inputcharset="utf-8"/> >- <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RSS2.xsl"/> >- </backend> >- </retrieval> >- <retrieval syntax="xml" name="utils"> >- <backend syntax="__ZEBRA_MARC_FORMAT__" name="F"> >- <marc inputformat="marc" outputformat="marcxml" >- inputcharset="utf-8"/> >- <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/> >- </backend> >- </retrieval> >- </retrievalinfo> >- </xi:fallback> >- </xi:include> >- <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-biblios.xml" >- xmlns:xi="http://www.w3.org/2001/XInclude"> >- <xi:fallback> >- <explain xmlns="http://explain.z3950.org/dtd/2.0/"> >- <serverInfo> >- <host>__ZEBRA_SRU_HOST__</host> >- <port>__ZEBRA_SRU_BIBLIOS_PORT__</port> >- <database>biblios</database> >- </serverInfo> >- </explain> >- </xi:fallback> >- </xi:include> >+ <xi:include href="__KOHA_CONF_DIR__/zebradb/__BIB_RETRIEVAL_CFG__" xmlns:xi="http://www.w3.org/2001/XInclude"/> >+ <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-biblios.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> > </server> > <serverinfo id="publicserver"> > <ccl2rpn>__ZEBRA_CONF_DIR__/ccl.properties</ccl2rpn> >diff --git a/etc/zebradb/authorities/etc/dom-config-marc.xml b/etc/zebradb/authorities/etc/dom-config-marc.xml >index 4e2e57e..3c2e267 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 > <extract name="index"> > <xslt stylesheet="authority-zebra-indexdefs.xsl"/> > </extract> >- <retrieve name="F"> >- <xslt stylesheet="identity.xsl" /> >- </retrieve> >- <retrieve name="usmarc"> >- <xslt stylesheet="identity.xsl" /> >- </retrieve> > <retrieve name="marc"> > <xslt stylesheet="identity.xsl" /> > </retrieve> >+ <!-- marcxml here maybe somewhat superfluous --> > <retrieve name="marcxml"> > <xslt stylesheet="identity.xsl" /> > </retrieve> >diff --git a/etc/zebradb/authorities/etc/dom-config.xml b/etc/zebradb/authorities/etc/dom-config.xml >index da59247..3a2b886 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 > <extract name="index"> > <xslt stylesheet="authority-zebra-indexdefs.xsl"/> > </extract> >- <retrieve name="F"> >- <xslt stylesheet="identity.xsl" /> >- </retrieve> >- <retrieve name="usmarc"> >- <xslt stylesheet="identity.xsl" /> >- </retrieve> > <retrieve name="marc"> > <xslt stylesheet="identity.xsl" /> > </retrieve> >+ <!-- marcxml here maybe somewhat superfluous --> > <retrieve name="marcxml"> > <xslt stylesheet="identity.xsl" /> > </retrieve> >diff --git a/etc/zebradb/biblios/etc/dom-config-marc.xml b/etc/zebradb/biblios/etc/dom-config-marc.xml >index b47cbb4..60d25e2 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 > <extract name="index"> > <xslt stylesheet="biblio-zebra-indexdefs.xsl"/> > </extract> >- <retrieve name="F"> >- <xslt stylesheet="identity.xsl" /> >- </retrieve> >- <retrieve name="usmarc"> >- <xslt stylesheet="identity.xsl" /> >- </retrieve> > <retrieve name="marc"> > <xslt stylesheet="identity.xsl" /> > </retrieve> >+ <!-- marcxml here maybe somewhat superfluous --> > <retrieve name="marcxml"> > <xslt stylesheet="identity.xsl" /> > </retrieve> >diff --git a/etc/zebradb/biblios/etc/dom-config.xml b/etc/zebradb/biblios/etc/dom-config.xml >index ac261c0..d475159 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 > <extract name="index"> > <xslt stylesheet="biblio-zebra-indexdefs.xsl"/> > </extract> >- <retrieve name="F"> >- <xslt stylesheet="identity.xsl" /> >- </retrieve> >- <retrieve name="usmarc"> >- <xslt stylesheet="identity.xsl" /> >- </retrieve> > <retrieve name="marc"> > <xslt stylesheet="identity.xsl" /> > </retrieve> >+ <!-- marcxml here maybe somewhat superfluous --> > <retrieve name="marcxml"> > <xslt stylesheet="identity.xsl" /> > </retrieve> >diff --git a/etc/zebradb/retrieval-info-auth-dom.xml b/etc/zebradb/retrieval-info-auth-dom.xml >index f848012..c966937 100644 >--- a/etc/zebradb/retrieval-info-auth-dom.xml >+++ b/etc/zebradb/retrieval-info-auth-dom.xml >@@ -14,9 +14,5 @@ > outputcharset="utf-8"/> > </backend> > </retrieval> >- <retrieval syntax="xml" name="index"/> <!-- allow viewing index entries --> >- <retrieval syntax="xml" name="marc" >- identifier="info:srw/schema/1/marcxml-v1.1"/> >- <retrieval syntax="xml" name="marcxml" >- identifier="info:srw/schema/1/marcxml-v1.1"/> >+ <retrieval syntax="xml"/> > </retrievalinfo> >diff --git a/etc/zebradb/retrieval-info-bib-dom.xml b/etc/zebradb/retrieval-info-bib-dom.xml >index f848012..c966937 100644 >--- a/etc/zebradb/retrieval-info-bib-dom.xml >+++ b/etc/zebradb/retrieval-info-bib-dom.xml >@@ -14,9 +14,5 @@ > outputcharset="utf-8"/> > </backend> > </retrieval> >- <retrieval syntax="xml" name="index"/> <!-- allow viewing index entries --> >- <retrieval syntax="xml" name="marc" >- identifier="info:srw/schema/1/marcxml-v1.1"/> >- <retrieval syntax="xml" name="marcxml" >- identifier="info:srw/schema/1/marcxml-v1.1"/> >+ <retrieval syntax="xml"/> > </retrievalinfo> >-- >1.7.10.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 9612
:
26625
|
26626
| 27500 |
27501
|
28016
|
28017
|
28018
|
28019
|
28138
|
28261
|
28323