From 981749f2b642c18aefd6ecb9377e080174fc3831 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Wed, 7 May 2014 14:21:33 +0200 Subject: [PATCH] [SIGNED-OFF] Bug 9612: Follow-up for elementSetName in Context.pm Restore elementSetName to marcxml for dom indexing in Zconn (Context.pm). This prevents the need of rebuilding the index after restarting Zebra server. Removes the now incorrect reference to marcxml as 'superfluous' in four dom config files. Test plan: [1] Do not yet apply this patch. [2] Rebuild zebra index with the zebra config of commit 036f2a50e11dab97ef8509f2f585c4cc407ea728. [3] (Go back to master.) Restart your zebra server (no config change). You will have results without details. Apply this patch: you see details. Reset to master: no details again. [4] Install new zebra config from master. Search again: you still see no details. Restart zebra server. Search: you see details. Apply this patch. Search: still details. Restart zebra server. Search: still details. Signed-off-by: Marcel de Rooy Tested in a non-package environment (manual dev install). The package environment should work now too (results in step 4c might differ). Progress on bug 12012 would be appropriate to sync all changes. Tested the response of the SRU server too. Signed-off-by: Marc Veron I tested starting on a VM with Koha 3.15.00.019 installed. Did git pull -> Koha 3.15.00.051 Result: No details in search results. Applied patch. Result: Search results display fine. Signed-off-by: Kyle M Hall --- C4/Context.pm | 2 +- etc/zebradb/authorities/etc/dom-config-marc.xml | 1 - etc/zebradb/authorities/etc/dom-config.xml | 1 - etc/zebradb/biblios/etc/dom-config-marc.xml | 1 - etc/zebradb/biblios/etc/dom-config.xml | 1 - 5 files changed, 1 insertions(+), 5 deletions(-) diff --git a/C4/Context.pm b/C4/Context.pm index 9a09784..9a7b75d 100644 --- a/C4/Context.pm +++ b/C4/Context.pm @@ -748,8 +748,8 @@ sub _new_Zconn { : 'usmarc'; } else { # $index_mode eq 'dom' - #we do not need an elementSetName $syntax = 'xml'; + $elementSetName = 'marcxml'; } my $host = $context->{'listen'}->{$server}->{'content'}; diff --git a/etc/zebradb/authorities/etc/dom-config-marc.xml b/etc/zebradb/authorities/etc/dom-config-marc.xml index 3c2e267..fb2bf64 100644 --- a/etc/zebradb/authorities/etc/dom-config-marc.xml +++ b/etc/zebradb/authorities/etc/dom-config-marc.xml @@ -33,7 +33,6 @@ 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 3a2b886..a818810 100644 --- a/etc/zebradb/authorities/etc/dom-config.xml +++ b/etc/zebradb/authorities/etc/dom-config.xml @@ -33,7 +33,6 @@ 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 60d25e2..8878b4f 100644 --- a/etc/zebradb/biblios/etc/dom-config-marc.xml +++ b/etc/zebradb/biblios/etc/dom-config-marc.xml @@ -33,7 +33,6 @@ 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 d475159..e6eb89f 100644 --- a/etc/zebradb/biblios/etc/dom-config.xml +++ b/etc/zebradb/biblios/etc/dom-config.xml @@ -33,7 +33,6 @@ Bibliographic DOM config for MARC XML input - -- 1.7.2.5