#
# This file is part of Koha.
#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
use strict;
use warnings;
-use CGI;
+use CGI qw ( -utf8 );
use LWP::Simple;
use XML::Simple;
use Config;
use C4::Context;
use C4::Installer;
+use Koha;
+
#use Smart::Comments '####';
my $query = new CGI;
}
);
-my $kohaVersion = C4::Context::KOHAVERSION;
+my $kohaVersion = Koha::version();
my $osVersion = `uname -a`;
my $perl_path = $^X;
if ($^O ne 'VMS') {
}
my $perlVersion = $];
my $mysqlVersion = `mysql -V`;
-my $apacheVersion = `httpd -v 2> /dev/null`;
-$apacheVersion = `httpd2 -v 2> /dev/null` unless $apacheVersion;
-$apacheVersion = (`/usr/sbin/apache2 -V`)[0] unless $apacheVersion;
+# Get Apache version
+my $apacheVersion = (`apache2ctl -v`)[0];
+$apacheVersion = `httpd2 -v 2> /dev/null` unless $apacheVersion;
+$apacheVersion = `httpd -v 2> /dev/null` unless $apacheVersion;
my $zebraVersion = `zebraidx -V`;
# Additional system information for warnings
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_bib_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
$docdir = C4::Context->config('intranetdir') . '/docs';
}
-if ( open( my $file, "<", "$docdir" . "/history.txt" ) ) {
+if ( open( my $file, "<:encoding(UTF-8)", "$docdir" . "/history.txt" ) ) {
my $i = 0;