X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=about.pl;h=4fbc7e89d41621092cae472d3f49afe427957602;hb=372816e8ef5cc940caaab1d57d63ac0416e644c6;hp=8b9c1e75b545b39d797fafe6b1b5dfb98979e4c3;hpb=afd2418d7387dc2a50835128e24840686600ef4b;p=koha-ffzg.git

diff --git a/about.pl b/about.pl
index 8b9c1e75b5..4fbc7e89d4 100755
--- a/about.pl
+++ b/about.pl
@@ -84,12 +84,60 @@ if ( ! defined C4::Context->config('zebra_bib_index_mode') ) {
     push @xml_config_warnings, {
         error => 'zebra_bib_index_mode_warn'
     };
+} else {
+    push @xml_config_warnings, { error => 'zebra_bib_grs_warn' }
+        if C4::Context->config('zebra_bib_index_mode') eq 'grs1';
 }
 
 if ( ! defined C4::Context->config('zebra_auth_index_mode') ) {
     push @xml_config_warnings, {
         error => 'zebra_auth_index_mode_warn'
     };
+} else {
+    push @xml_config_warnings, { error => 'zebra_auth_grs_warn' }
+        if C4::Context->config('zebra_auth_index_mode') eq 'grs1';
+}
+
+# Test QueryParser configuration sanity
+if ( C4::Context->preference( 'UseQueryParser' ) ) {
+    # Get the QueryParser configuration file name
+    my $queryparser_file          = C4::Context->config( 'queryparser_config' );
+    my $queryparser_fallback_file = '/etc/koha/searchengine/queryparser.yaml';
+    # Check QueryParser is functional
+    my $QParser = C4::Context->queryparser();
+    my $queryparser_error = {};
+    if ( ! defined $QParser || ref($QParser) ne 'Koha::QueryParser::Driver::PQF' ) {
+        # Error initializing the QueryParser object
+        # Get the used queryparser.yaml file path to report the user
+        $queryparser_error->{ fallback } = ( defined $queryparser_file ) ? 0 : 1;
+        $queryparser_error->{ file }     = ( defined $queryparser_file )
+                                                ? $queryparser_file
+                                                : $queryparser_fallback_file;
+        # Report error data to the template
+        $template->param( QueryParserError => $queryparser_error );
+    } else {
+        # Check for an absent queryparser_config entry in koha-conf.xml
+        if ( ! defined $queryparser_file ) {
+            # Not an error but a warning for the missing entry in koha-conf-xml
+            push @xml_config_warnings, {
+                    error => 'queryparser_entry_missing',
+                    file  => $queryparser_fallback_file
+            };
+        }
+    }
+}
+
+# Test Zebra facets configuration
+if ( !defined C4::Context->config('use_zebra_facets') ) {
+    push @xml_config_warnings, { error => 'use_zebra_facets_entry_missing' };
+} else {
+    if ( C4::Context->config('use_zebra_facets') &&
+         C4::Context->config('zebra_bib_index_mode') ) {
+        # use_zebra_facets works with DOM
+        push @xml_config_warnings, {
+            error => 'use_zebra_facets_needs_dom'
+        } if C4::Context->config('zebra_bib_index_mode') ne 'dom' ;
+    }
 }
 
 $template->param(
@@ -132,6 +180,7 @@ foreach my $pm_type(@pm_types) {
                 upgrade => ($pm_type eq 'upgrade_pm' ? 1 : 0),
                 current => ($pm_type eq 'current_pm' ? 1 : 0),
                 require => $stats->{'required'},
+                reqversion => $stats->{'min_ver'},
             }
         );
     }