X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=about.pl;h=dc6380099b1159853f020e06d99a214957c89ef5;hb=23bddb729dc2655958b6860c8f2d9f9872754ccf;hp=70900dd2c4c0d6cf3e7ad62daa29f5efdc7fd69d;hpb=71eba3a74a65b49aeb5c24ddd5118df882cef14b;p=koha-ffzg.git diff --git a/about.pl b/about.pl index 70900dd2c4..dc6380099b 100755 --- a/about.pl +++ b/about.pl @@ -32,6 +32,7 @@ use XML::Simple; use Config; use Search::Elasticsearch; use Try::Tiny; +use YAML qw/LoadFile/; use C4::Output; use C4::Auth; @@ -47,7 +48,6 @@ use Koha::Caches; use Koha::Config::SysPrefs; use Koha::Illrequest::Config; use Koha::SearchEngine::Elasticsearch; -use Koha::UploadedFiles; use C4::Members::Statistics; @@ -177,58 +177,16 @@ 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 ( C4::Context->config('zebra_bib_index_mode') + and C4::Context->config('zebra_bib_index_mode') eq 'grs1' ) +{ + push @xml_config_warnings, { error => 'zebra_bib_index_mode_is_grs1' }; } -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') + and C4::Context->config('zebra_auth_index_mode') eq 'grs1' ) +{ + push @xml_config_warnings, { error => 'zebra_auth_index_mode_is_grs1' }; } if ( (C4::Context->config('zebra_auth_index_mode') eq 'dom') && ($context->{'server'}->{'authorityserver'}->{'config'} !~ /zebra-authorities-dom.cfg/) ) { @@ -237,12 +195,6 @@ if ( (C4::Context->config('zebra_auth_index_mode') eq 'dom') && ($context->{'ser }; } -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' - }; -} - if ( ! defined C4::Context->config('log4perl_conf') ) { push @xml_config_warnings, { error => 'log4perl_entry_missing' @@ -263,7 +215,7 @@ if ( ! defined C4::Context->config('upload_path') ) { } if ( ! C4::Context->config('tmp_path') ) { - my $temporary_directory = Koha::UploadedFile->temporary_directory; + my $temporary_directory = C4::Context::temporary_directory; push @xml_config_warnings, { error => 'tmp_path_missing', effective_tmp_dir => $temporary_directory, @@ -302,14 +254,6 @@ if ( C4::Context->preference( 'UseQueryParser' ) ) { # 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' ; - } } # ILL module checks @@ -339,6 +283,13 @@ if ( C4::Context->preference('ILLModule') ) { $warnILLConfiguration = 1; } + + if ( !$ill_config_from_file->{branch} ) { + # branch not defined + $template->param( ill_branch_not_defined => 1 ); + $warnILLConfiguration = 1; + } + $template->param( warnILLConfiguration => $warnILLConfiguration ); } @@ -435,6 +386,31 @@ if ( C4::Context->preference('WebBasedSelfCheck') ); } +# Test YAML system preferences +# FIXME: This is list of current YAML formatted prefs, should by type of preference +my @yaml_prefs = ( + "UpdateNotForLoanStatusOnCheckin", + "OpacHiddenItems", + "BibtexExportAdditionalFields", + "RisExportAdditionalFields", + "UpdateItemWhenLostFromHoldList", + "MarcFieldsToOrder", + "MarcItemFieldsToOrder", + "UpdateitemLocationOnCheckin", + "ItemsDeniedRenewal" +); +my @bad_yaml_prefs; +foreach my $syspref (@yaml_prefs) { + my $yaml = C4::Context->preference( $syspref ); + if ( $yaml ) { + eval { YAML::Load( "$yaml\n\n" ); }; + if ($@) { + push @bad_yaml_prefs, $syspref; + } + } +} +$template->param( 'bad_yaml_prefs' => \@bad_yaml_prefs ) if @bad_yaml_prefs; + { my $dbh = C4::Context->dbh; my $patrons = $dbh->selectall_arrayref( @@ -468,6 +444,67 @@ if ( C4::Context->preference('WebBasedSelfCheck') ); } } + +# Circ rule warnings +{ + my $dbh = C4::Context->dbh; + my $units = $dbh->selectall_arrayref( + q|SELECT branchcode, categorycode, itemtype, lengthunit FROM issuingrules WHERE lengthunit NOT IN ( 'days', 'hours' ); |, + { Slice => {} } + ); + + if (@$units) { + $template->param( + warnIssuingRules => 1, + ir_units => $units, + ); + } +} + +# Guarantor relationships warnings +{ + my $dbh = C4::Context->dbh; + my ($bad_relationships_count) = $dbh->selectall_arrayref(q{ + SELECT COUNT(*) + FROM ( + SELECT relationship FROM borrower_relationships WHERE relationship='_bad_data' + UNION ALL + SELECT relationship FROM borrowers WHERE relationship='_bad_data') a + }); + + $bad_relationships_count = $bad_relationships_count->[0]->[0]; + + my $existing_relationships = $dbh->selectall_arrayref(q{ + SELECT DISTINCT(relationship) + FROM ( + SELECT relationship FROM borrower_relationships WHERE relationship IS NOT NULL + UNION ALL + SELECT relationship FROM borrowers WHERE relationship IS NOT NULL) a + }); + + my %valid_relationships = map { $_ => 1 } split( /,|\|/, C4::Context->preference('borrowerRelationship') ); + $valid_relationships{ _bad_data } = 1; # we handle this case in another way + + my $wrong_relationships = [ grep { !$valid_relationships{ $_->[0] } } @{$existing_relationships} ]; + if ( @$wrong_relationships or $bad_relationships_count ) { + + $template->param( + warnRelationships => 1, + ); + + if ( $wrong_relationships ) { + $template->param( + wrong_relationships => $wrong_relationships + ); + } + if ($bad_relationships_count) { + $template->param( + bad_relationships_count => $bad_relationships_count, + ); + } + } +} + my %versions = C4::Context::get_versions(); $template->param( @@ -544,9 +581,7 @@ $template->param( table => $table ); ## ------------------------------------------ -## Koha time line code - -#get file location +## Koha contributions my $docdir; if ( defined C4::Context->config('docdir') ) { $docdir = C4::Context->config('docdir'); @@ -556,6 +591,70 @@ if ( defined C4::Context->config('docdir') ) { $docdir = C4::Context->config('intranetdir') . '/docs'; } +## Release teams +my $teams = + -e "$docdir" . "/teams.yaml" + ? LoadFile( "$docdir" . "/teams.yaml" ) + : {}; +my $dev_team = (sort {$b <=> $a} (keys %{$teams->{team}}))[0]; +my $short_version = substr($versions{'kohaVersion'},0,5); +my $minor = substr($versions{'kohaVersion'},3,2); +my $development_version = ( $minor eq '05' || $minor eq '11' ) ? 0 : 1; +$template->param( short_version => $short_version ); +$template->param( development_version => $development_version ); + +## Contributors +my $contributors = + -e "$docdir" . "/contributors.yaml" + ? LoadFile( "$docdir" . "/contributors.yaml" ) + : {}; +for my $version ( sort { $a <=> $b } keys %{$teams->{team}} ) { + for my $role ( keys %{ $teams->{team}->{$version} } ) { + my $normalized_role = "$role"; + $normalized_role =~ s/s$//; + if ( ref( $teams->{team}->{$version}->{$role} ) eq 'ARRAY' ) { + for my $contributor ( @{ $teams->{team}->{$version}->{$role} } ) { + my $name = $contributor->{name}; + # Add role to contributors + push @{ $contributors->{$name}->{roles}->{$normalized_role} }, + $version; + # Add openhub to teams + if ( exists( $contributors->{$name}->{openhub} ) ) { + $contributor->{openhub} = $contributors->{$name}->{openhub}; + } + } + } + elsif ( $role ne 'release_date' ) { + my $name = $teams->{team}->{$version}->{$role}->{name}; + # Add role to contributors + push @{ $contributors->{$name}->{roles}->{$normalized_role} }, + $version; + # Add openhub to teams + if ( exists( $contributors->{$name}->{openhub} ) ) { + $teams->{team}->{$version}->{$role}->{openhub} = + $contributors->{$name}->{openhub}; + } + } + else { + $teams->{team}->{$version}->{$role} = DateTime->from_epoch( epoch => $teams->{team}->{$version}->{$role}); + } + } +} + +## Create last name ordered array of people from contributors +my @people = map { + { name => $_, ( $contributors->{$_} ? %{ $contributors->{$_} } : () ) } +} sort { + my ($alast) = ( split( /\s/, $a ) )[-1]; + my ($blast) = ( split( /\s/, $b ) )[-1]; + lc($alast) cmp lc($blast) +} keys %{$contributors}; + +$template->param( contributors => \@people ); +$template->param( maintenance_team => $teams->{team}->{$dev_team} ); +$template->param( release_team => $teams->{team}->{$short_version} ); + +## Timeline if ( open( my $file, "<:encoding(UTF-8)", "$docdir" . "/history.txt" ) ) { my $i = 0;