View | Details | Raw Unified | Return to bug 13404
Collapse All | Expand All

(-)a/about.pl (+46 lines)
Lines 80-103 my $warnIsRootUser = (! $loggedinuser); Link Here
80
my $warnNoActiveCurrency = (! defined C4::Budgets->GetCurrency());
80
my $warnNoActiveCurrency = (! defined C4::Budgets->GetCurrency());
81
my @xml_config_warnings;
81
my @xml_config_warnings;
82
82
83
my $context = new C4::Context;
84
83
if ( ! defined C4::Context->config('zebra_bib_index_mode') ) {
85
if ( ! defined C4::Context->config('zebra_bib_index_mode') ) {
84
    push @xml_config_warnings, {
86
    push @xml_config_warnings, {
85
        error => 'zebra_bib_index_mode_warn'
87
        error => 'zebra_bib_index_mode_warn'
86
    };
88
    };
89
    if ($context->{'server'}->{'biblioserver'}->{'config'} !=~ /zebra-biblios-dom.cfg/) {
90
        push @xml_config_warnings, {
91
            error => 'zebra_bib_mode_seems_grs1'
92
        };
93
    }
94
    else {
95
        push @xml_config_warnings, {
96
            error => 'zebra_bib_mode_seems_dom'
97
        };
98
    }
87
} else {
99
} else {
88
    push @xml_config_warnings, { error => 'zebra_bib_grs_warn' }
100
    push @xml_config_warnings, { error => 'zebra_bib_grs_warn' }
89
        if C4::Context->config('zebra_bib_index_mode') eq 'grs1';
101
        if C4::Context->config('zebra_bib_index_mode') eq 'grs1';
90
}
102
}
91
103
104
if ( (C4::Context->config('zebra_bib_index_mode') eq 'dom') && ($context->{'server'}->{'biblioserver'}->{'config'} !=~ /zebra-biblios-dom.cfg/) ) {
105
    push @xml_config_warnings, {
106
        error => 'zebra_bib_index_mode_mismatch_warn'
107
    };
108
}
109
110
if ( (C4::Context->config('zebra_auth_index_mode') eq 'grs1') && ($context->{'server'}->{'biblioserver'}->{'config'} =~ /zebra-biblios-dom.cfg/) ) {
111
    push @xml_config_warnings, {
112
        error => 'zebra_bib_index_mode_mismatch_warn'
113
    };
114
}
115
92
if ( ! defined C4::Context->config('zebra_auth_index_mode') ) {
116
if ( ! defined C4::Context->config('zebra_auth_index_mode') ) {
93
    push @xml_config_warnings, {
117
    push @xml_config_warnings, {
94
        error => 'zebra_auth_index_mode_warn'
118
        error => 'zebra_auth_index_mode_warn'
95
    };
119
    };
120
    if ($context->{'server'}->{'authorityserver'}->{'config'} !=~ /zebra-authorities-dom.cfg/) {
121
        push @xml_config_warnings, {
122
            error => 'zebra_auth_mode_seems_grs1'
123
        };
124
    }
125
    else {
126
        push @xml_config_warnings, {
127
            error => 'zebra_auth_mode_seems_dom'
128
        };
129
    }
96
} else {
130
} else {
97
    push @xml_config_warnings, { error => 'zebra_auth_grs_warn' }
131
    push @xml_config_warnings, { error => 'zebra_auth_grs_warn' }
98
        if C4::Context->config('zebra_auth_index_mode') eq 'grs1';
132
        if C4::Context->config('zebra_auth_index_mode') eq 'grs1';
99
}
133
}
100
134
135
if ( (C4::Context->config('zebra_auth_index_mode') eq 'dom') && ($context->{'server'}->{'authorityserver'}->{'config'} !=~ /zebra-authorities-dom.cfg/) ) {
136
    push @xml_config_warnings, {
137
        error => 'zebra_auth_index_mode_mismatch_warn'
138
    };
139
}
140
141
if ( (C4::Context->config('zebra_auth_index_mode') eq 'grs1') && ($context->{'server'}->{'authorityserver'}->{'config'} =~ /zebra-authorities-dom.cfg/) ) {
142
    push @xml_config_warnings, {
143
        error => 'zebra_auth_index_mode_mismatch_warn'
144
    };
145
}
146
101
# Test QueryParser configuration sanity
147
# Test QueryParser configuration sanity
102
if ( C4::Context->preference( 'UseQueryParser' ) ) {
148
if ( C4::Context->preference( 'UseQueryParser' ) ) {
103
    # Get the QueryParser configuration file name
149
    # Get the QueryParser configuration file name
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt (-1 / +42 lines)
Lines 152-157 Link Here
152
                        It will default to <strong>dom</strong>.
152
                        It will default to <strong>dom</strong>.
153
                    </td>
153
                    </td>
154
                </tr>
154
                </tr>
155
                [% ELSIF config_entry.error == 'zebra_bib_mode_seems_grs1' %]
156
                <tr>
157
                    <th scope="row"><b>Info</b></th>
158
                    <td>Your configuration file indicates that <strong>grs1</strong> is the correct setting
159
                    for &lt;zebra_bib_index_mode&gt;.
160
                    </td>
161
                </tr>
162
                [% ELSIF config_entry.error == 'zebra_bib_mode_seems_dom' %]
163
                <tr>
164
                    <th scope="row"><b>Info</b></th>
165
                    <td>Your configuration file indicates that <strong>dom</strong> is the correct setting
166
                    for &lt;zebra_bib_index_mode&gt;.
167
                    </td>
168
                </tr>
155
                [% ELSIF config_entry.error == 'zebra_auth_index_mode_warn' %]
169
                [% ELSIF config_entry.error == 'zebra_auth_index_mode_warn' %]
156
                <tr>
170
                <tr>
157
                    <th scope="row"><b>Warning</b></th>
171
                    <th scope="row"><b>Warning</b></th>
Lines 160-165 Link Here
160
                        It will default to <strong>dom</strong>.
174
                        It will default to <strong>dom</strong>.
161
                    </td>
175
                    </td>
162
                </tr>
176
                </tr>
177
                [% ELSIF config_entry.error == 'zebra_auth_mode_seems_grs1' %]
178
                <tr>
179
                    <th scope="row"><b>Info</b></th>
180
                    <td>Your configuration file indicates that <strong>grs1</strong> is the correct setting
181
                    for &lt;zebra_auth_index_mode&gt;.
182
                    </td>
183
                </tr>
184
                [% ELSIF config_entry.error == 'zebra_auth_mode_seems_dom' %]
185
                <tr>
186
                    <th scope="row"><b>Info</b></th>
187
                    <td>Your configuration file indicates that <strong>dom</strong> is the correct setting
188
                    for &lt;zebra_auth_index_mode&gt;.
189
                    </td>
190
                </tr>
163
                [% ELSIF config_entry.error == 'zebra_bib_grs_warn' %]
191
                [% ELSIF config_entry.error == 'zebra_bib_grs_warn' %]
164
                <tr>
192
                <tr>
165
                    <th scope="row"><b>Warning</b></th>
193
                    <th scope="row"><b>Warning</b></th>
Lines 169-174 Link Here
169
                        <strong>dom</strong> (full reindex required).
197
                        <strong>dom</strong> (full reindex required).
170
                    </td>
198
                    </td>
171
                </tr>
199
                </tr>
200
                [% ELSIF config_entry.error == 'zebra_bib_index_mode_mismatch_warn' %]
201
                <tr>
202
                    <th scope="row"><b>Warning</b></th>
203
                    <td>The &lt;zebra_bib_index_mode&gt; entry is set to <strong>dom</strong>, but your system appears to be set up for <strong>grs1</strong> indexing.
204
                    It is safe to ignore this warning if biblio search is working.
205
                    </td>
206
                </tr>
172
                [% ELSIF config_entry.error == 'zebra_auth_grs_warn' %]
207
                [% ELSIF config_entry.error == 'zebra_auth_grs_warn' %]
173
                <tr>
208
                <tr>
174
                    <th scope="row"><b>Warning</b></th>
209
                    <th scope="row"><b>Warning</b></th>
Lines 178-183 Link Here
178
                        <strong>dom</strong> (full reindex required).
213
                        <strong>dom</strong> (full reindex required).
179
                    </td>
214
                    </td>
180
                </tr>
215
                </tr>
216
                [% ELSIF config_entry.error == 'zebra_auth_index_mode_mismatch_warn' %]
217
                <tr>
218
                    <th scope="row"><b>Warning</b></th>
219
                    <td>The &lt;zebra_auth_index_mode&gt; entry is set to <strong>dom</strong>, but your system appears to be set up for <strong>grs1</strong> indexing.
220
                    It is safe to ignore this warning if authority search is working.
221
                    </td>
222
                </tr>
181
                [% ELSIF config_entry.error == 'queryparser_entry_missing' %]
223
                [% ELSIF config_entry.error == 'queryparser_entry_missing' %]
182
                <tr>
224
                <tr>
183
                    <th scope="row"><b>Warning</b></th>
225
                    <th scope="row"><b>Warning</b></th>
184
- 

Return to bug 13404