Bugzilla – Attachment 34745 Details for
Bug 13404
More System information about GRS1 vs DOM settings
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 13404 - More »System information« about GRS1 vs DOM settings
Bug-13404---More-System-information-about-GRS1-vs-.patch (text/plain), 7.47 KB, created by
Chris Cormack
on 2014-12-28 05:35:23 UTC
(
hide
)
Description:
Bug 13404 - More »System information« about GRS1 vs DOM settings
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2014-12-28 05:35:23 UTC
Size:
7.47 KB
patch
obsolete
>From 7bb14fa1725cfbf304a8499f8125ab9ae22c2502 Mon Sep 17 00:00:00 2001 >From: Mirko Tietgen <mirko@abunchofthings.net> >Date: Sun, 7 Dec 2014 18:39:51 +0100 >Subject: [PATCH] =?UTF-8?q?Bug=2013404=20-=20More=20=C2=BBSystem=20informa?= > =?UTF-8?q?tion=C2=AB=20about=20GRS1=20vs=20DOM=20settings?= >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >System information indicates missing <zebra_bib_index_mode> and <zebra_auth_index_mode> entries in koha-conf.xml. > >This patch > >- adds warnings about a possible mismatch between these settings and the actual setup >- adds info about the actual setup/what values to use for <zebra_bib_index_mode> and <zebra_auth_index_mode> if they are not set. > >The assumption is that a path including 'zebra-*-dom.cfg' in the respective section indicates a DOM setup. > >Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> >--- > about.pl | 46 ++++++++++++++++++++++++ > koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 42 ++++++++++++++++++++++ > 2 files changed, 88 insertions(+) > >diff --git a/about.pl b/about.pl >index 4fbc7e8..cd55133 100755 >--- a/about.pl >+++ b/about.pl >@@ -80,24 +80,70 @@ my $warnIsRootUser = (! $loggedinuser); > my $warnNoActiveCurrency = (! defined C4::Budgets->GetCurrency()); > my @xml_config_warnings; > >+my $context = new C4::Context; >+ > if ( ! defined C4::Context->config('zebra_bib_index_mode') ) { > push @xml_config_warnings, { > error => 'zebra_bib_index_mode_warn' > }; >+ if ($context->{'server'}->{'biblioserver'}->{'config'} !=~ /zebra-biblios-dom.cfg/) { >+ push @xml_config_warnings, { >+ error => 'zebra_bib_mode_seems_grs1' >+ }; >+ } >+ else { >+ push @xml_config_warnings, { >+ error => 'zebra_bib_mode_seems_dom' >+ }; >+ } > } else { > push @xml_config_warnings, { error => 'zebra_bib_grs_warn' } > if C4::Context->config('zebra_bib_index_mode') eq 'grs1'; > } > >+if ( (C4::Context->config('zebra_bib_index_mode') eq 'dom') && ($context->{'server'}->{'biblioserver'}->{'config'} !=~ /zebra-biblios-dom.cfg/) ) { >+ push @xml_config_warnings, { >+ error => 'zebra_bib_index_mode_mismatch_warn' >+ }; >+} >+ >+if ( (C4::Context->config('zebra_auth_index_mode') eq 'grs1') && ($context->{'server'}->{'biblioserver'}->{'config'} =~ /zebra-biblios-dom.cfg/) ) { >+ push @xml_config_warnings, { >+ error => 'zebra_bib_index_mode_mismatch_warn' >+ }; >+} >+ > if ( ! defined C4::Context->config('zebra_auth_index_mode') ) { > push @xml_config_warnings, { > error => 'zebra_auth_index_mode_warn' > }; >+ if ($context->{'server'}->{'authorityserver'}->{'config'} !=~ /zebra-authorities-dom.cfg/) { >+ push @xml_config_warnings, { >+ error => 'zebra_auth_mode_seems_grs1' >+ }; >+ } >+ else { >+ push @xml_config_warnings, { >+ error => 'zebra_auth_mode_seems_dom' >+ }; >+ } > } else { > push @xml_config_warnings, { error => 'zebra_auth_grs_warn' } > if C4::Context->config('zebra_auth_index_mode') eq 'grs1'; > } > >+if ( (C4::Context->config('zebra_auth_index_mode') eq 'dom') && ($context->{'server'}->{'authorityserver'}->{'config'} !=~ /zebra-authorities-dom.cfg/) ) { >+ push @xml_config_warnings, { >+ error => 'zebra_auth_index_mode_mismatch_warn' >+ }; >+} >+ >+if ( (C4::Context->config('zebra_auth_index_mode') eq 'grs1') && ($context->{'server'}->{'authorityserver'}->{'config'} =~ /zebra-authorities-dom.cfg/) ) { >+ push @xml_config_warnings, { >+ error => 'zebra_auth_index_mode_mismatch_warn' >+ }; >+} >+ > # Test QueryParser configuration sanity > if ( C4::Context->preference( 'UseQueryParser' ) ) { > # Get the QueryParser configuration file name >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >index 1d62c9b..4387b9f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >@@ -152,6 +152,20 @@ > It will default to <strong>dom</strong>. > </td> > </tr> >+ [% ELSIF config_entry.error == 'zebra_bib_mode_seems_grs1' %] >+ <tr> >+ <th scope="row"><b>Info</b></th> >+ <td>Your configuration file indicates that <strong>grs1</strong> is the correct setting >+ for <zebra_bib_index_mode>. >+ </td> >+ </tr> >+ [% ELSIF config_entry.error == 'zebra_bib_mode_seems_dom' %] >+ <tr> >+ <th scope="row"><b>Info</b></th> >+ <td>Your configuration file indicates that <strong>dom</strong> is the correct setting >+ for <zebra_bib_index_mode>. >+ </td> >+ </tr> > [% ELSIF config_entry.error == 'zebra_auth_index_mode_warn' %] > <tr> > <th scope="row"><b>Warning</b></th> >@@ -160,6 +174,20 @@ > It will default to <strong>dom</strong>. > </td> > </tr> >+ [% ELSIF config_entry.error == 'zebra_auth_mode_seems_grs1' %] >+ <tr> >+ <th scope="row"><b>Info</b></th> >+ <td>Your configuration file indicates that <strong>grs1</strong> is the correct setting >+ for <zebra_auth_index_mode>. >+ </td> >+ </tr> >+ [% ELSIF config_entry.error == 'zebra_auth_mode_seems_dom' %] >+ <tr> >+ <th scope="row"><b>Info</b></th> >+ <td>Your configuration file indicates that <strong>dom</strong> is the correct setting >+ for <zebra_auth_index_mode>. >+ </td> >+ </tr> > [% ELSIF config_entry.error == 'zebra_bib_grs_warn' %] > <tr> > <th scope="row"><b>Warning</b></th> >@@ -169,6 +197,13 @@ > <strong>dom</strong> (full reindex required). > </td> > </tr> >+ [% ELSIF config_entry.error == 'zebra_bib_index_mode_mismatch_warn' %] >+ <tr> >+ <th scope="row"><b>Warning</b></th> >+ <td>The <zebra_bib_index_mode> entry is set to <strong>dom</strong>, but your system appears to be set up for <strong>grs1</strong> indexing. >+ It is safe to ignore this warning if biblio search is working. >+ </td> >+ </tr> > [% ELSIF config_entry.error == 'zebra_auth_grs_warn' %] > <tr> > <th scope="row"><b>Warning</b></th> >@@ -178,6 +213,13 @@ > <strong>dom</strong> (full reindex required). > </td> > </tr> >+ [% ELSIF config_entry.error == 'zebra_auth_index_mode_mismatch_warn' %] >+ <tr> >+ <th scope="row"><b>Warning</b></th> >+ <td>The <zebra_auth_index_mode> entry is set to <strong>dom</strong>, but your system appears to be set up for <strong>grs1</strong> indexing. >+ It is safe to ignore this warning if authority search is working. >+ </td> >+ </tr> > [% ELSIF config_entry.error == 'queryparser_entry_missing' %] > <tr> > <th scope="row"><b>Warning</b></th> >-- >2.1.0
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 13404
:
34165
|
34166
|
34745
|
34912
|
35743
|
35744
|
35745