Attachment #136292 for bug #30920

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

Lines 97-102 use C4::Charset qw( Link Here

(-)a/C4/Biblio.pm (-10 / +57 lines)
97	SetUTF8Flag	97	SetUTF8Flag
98	StripNonXmlChars	98	StripNonXmlChars
99	);	99	);
		100	use C4::Languages;
100	use C4::Linker;	101	use C4::Linker;
101	use C4::OAI::Sets;	102	use C4::OAI::Sets;
102	use C4::Items qw( GetHiddenItemnumbers GetMarcItem );	103	use C4::Items qw( GetHiddenItemnumbers GetMarcItem );
Lines 1461-1485 descriptions rather than normal ones when they exist. Link Here
1461	sub GetAuthorisedValueDesc {	1462	sub GetAuthorisedValueDesc {
1462	my ( $tag, $subfield, $value, $framework, $tagslib, $category, $opac ) = @_;	1463	my ( $tag, $subfield, $value, $framework, $tagslib, $category, $opac ) = @_;
1463		1464
		1465	my $cache = Koha::Caches->get_instance();
		1466	my $cache_key;
1464	if ( !$category ) {	1467	if ( !$category ) {
1465		1468
1466	return $value unless defined $tagslib->{$tag}->{$subfield}->{'authorised_value'};	1469	return $value unless defined $tagslib->{$tag}->{$subfield}->{'authorised_value'};
1467		1470
1468	#---- branch	1471	#---- branch
1469	if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {	1472	if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
1470	my $branch = Koha::Libraries->find($value);	1473	$cache_key = "LibraryNames";
1471	return $branch? $branch->branchname: q{};	1474	my $libraries = $cache->get_from_cache( $cache_key, { unsafe => 1 } );
		1475	if ( !$libraries ) {
		1476	$libraries = {
		1477	map { $_->branchcode => $_->branchname }
		1478	Koha::Libraries->search( {},
		1479	{ columns => [ 'branchcode', 'branchname' ] } )
		1480	->as_list
		1481	};
		1482	$cache->set_in_cache($cache_key, $libraries);
		1483	}
		1484	return $libraries->{$value};
1472	}	1485	}
1473		1486
1474	#---- itemtypes	1487	#---- itemtypes
1475	if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {	1488	if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
1476	my $itemtype = Koha::ItemTypes->find( $value );	1489	my $lang = C4::Languages::getlanguage;
1477	return $itemtype ? $itemtype->translated_description : q\|\|;	1490	$lang //= 'en';
		1491	$cache_key = $lang . 'ItemTypeDescriptions';
		1492	my $itypes = $cache->get_from_cache( $cache_key, { unsafe => 1 } );
		1493	if ( !$itypes ) {
		1494	$itypes =
		1495	{ map { $_->itemtype => $_->translated_description }
		1496	Koha::ItemTypes->search()->as_list };
		1497	$cache->set_in_cache( $cache_key, $itypes );
		1498	}
		1499	return $itypes->{$value};
1478	}	1500	}
1479		1501
1480	if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "cn_source" ) {	1502	if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "cn_source" ) {
1481	my $source = GetClassSource($value);	1503	$cache_key = "ClassSources";
1482	return $source ? $source->{description} : q\|\|;	1504	my $cn_sources = $cache->get_from_cache( $cache_key, { unsafe => 1 } );
		1505	if ( !$cn_sources ) {
		1506	$cn_sources = {
		1507	map { $_->cn_source => $_->description }
		1508	Koha::ClassSources->search( {},
		1509	{ columns => [ 'cn_source', 'description' ] } )
		1510	->as_list
		1511	};
		1512	$cache->set_in_cache($cache_key, $cn_sources);
		1513	}
		1514	return $cn_sources->{$value};
1483	}	1515	}
1484		1516
1485	#---- "true" authorized value	1517	#---- "true" authorized value
Lines 1488-1497 sub GetAuthorisedValueDesc { Link Here
1488		1520
1489	my $dbh = C4::Context->dbh;	1521	my $dbh = C4::Context->dbh;
1490	if ( $category ne "" ) {	1522	if ( $category ne "" ) {
1491	my $sth = $dbh->prepare( "SELECT lib, lib_opac FROM authorised_values WHERE category = ? AND authorised_value = ?" );	1523	$cache_key = "AVDescriptions-" . $category;
1492	$sth->execute( $category, $value );	1524	my $av_descriptions = $cache->get_from_cache( $cache_key, { unsafe => 1 } );
1493	my $data = $sth->fetchrow_hashref;	1525	if ( !$av_descriptions ) {
1494	return ( $opac && $data->{'lib_opac'} ) ? $data->{'lib_opac'} : $data->{'lib'};	1526	$av_descriptions = {
		1527	map {
		1528	$_->authorised_value =>
		1529	{ lib => $_->lib, lib_opac => $_->lib_opac }
		1530	} Koha::AuthorisedValues->search(
		1531	{ category => $category },
		1532	{
		1533	columns => [ 'authorised_value', 'lib_opac', 'lib' ]
		1534	}
		1535	)->as_list
		1536	};
		1537	$cache->set_in_cache($cache_key, $av_descriptions);
		1538	}
		1539	return ( $opac && $av_descriptions->{$value}->{'lib_opac'} )
		1540	? $av_descriptions->{$value}->{'lib_opac'}
		1541	: $av_descriptions->{$value}->{'lib'};
1495	} else {	1542	} else {
1496	return $value; # if nothing is found return the original value	1543	return $value; # if nothing is found return the original value
1497	}	1544	}





use Modern::Perl;

use Koha::Caches;
use Koha::Database;

use base qw(Koha::Object Koha::Object::Limit::Library);


=cut

=head3 store

AuthorisedValue specific store to ensure relevant caches are flushed on change

=cut

sub store {
    my ($self) = @_;

    my $flush = 0;

    if ( !$self->in_storage ) {
        $flush = 1;
    }
    else {
        my $self_from_storage = $self->get_from_storage;
        $flush = 1 if ( $self_from_storage->lib ne $self->lib );
        $flush = 1 if ( $self_from_storage->lib_opac ne $self->lib_opac );
    }

    $self = $self->SUPER::store;

    if ($flush) {
        my $cache = Koha::Caches->get_instance();
        my $key = "AVDescriptions-".$self->category;
        $cache->clear_from_cache($key);
    }

    return $self;
}

=head3 opac_description

my $description = $av->opac_description();

Lines 17-23 package Koha::ClassSource; Link Here

(-)a/Koha/ClassSource.pm (-1 / +28 lines)
17		17
18	use Modern::Perl;	18	use Modern::Perl;
19		19
20		20	use Koha::Caches;
21	use Koha::Database;	21	use Koha::Database;
22		22
23	use base qw(Koha::Object);	23	use base qw(Koha::Object);
Lines 30-37 Koha::ClassSource - Koha Classfication Source Object class Link Here
30		30
31	=head2 Class Methods	31	=head2 Class Methods
32		32
		33	=head3 store
		34
		35	ClassSource specific store to ensure relevant caches are flushed on change
		36
33	=cut	37	=cut
34		38
		39	sub store {
		40	my ($self) = @_;
		41
		42	my $flush = 0;
		43
		44	if ( !$self->in_storage ) {
		45	$flush = 1;
		46	}
		47	else {
		48	my $self_from_storage = $self->get_from_storage;
		49	$flush = 1 if ( $self_from_storage->description ne $self->description );
		50	}
		51
		52	$self = $self->SUPER::store;
		53
		54	if ($flush) {
		55	my $cache = Koha::Caches->get_instance();
		56	$cache->clear_from_cache('ClassSources');
		57	}
		58
		59	return $self;
		60	}
		61
35	=head3 _type	62	=head3 _type
36		63
37	Returns name of corresponding DBIC resultset	64	Returns name of corresponding DBIC resultset





use C4::Koha qw( getitemtypeimagelocation );
use C4::Languages;
use Koha::Caches;
use Koha::Database;
use Koha::CirculationRules;
use Koha::Localizations;


=cut

=head3 store

ItemType specific store to ensure relevant caches are flushed on change

=cut

sub store {
    my ($self) = @_;

    my $flush = 0;

    if ( !$self->in_storage ) {
        $flush = 1;
    }
    else {
        my $self_from_storage = $self->get_from_storage;
        $flush = 1 if ( $self_from_storage->description ne $self->description );
    }

    $self = $self->SUPER::store;

    if ($flush) {
        my $cache = Koha::Caches->get_instance();
        my $key = "enItemTypeDescriptions";
        $cache->clear_from_cache($key);
    }

    return $self;
}

=head3 image_location

=cut





use C4::Context;

use Koha::Caches;
use Koha::Database;
use Koha::StockRotationStages;
use Koha::SMTP::Servers;


=head2 Class methods

=head3 store

Library specific store to ensure relevant caches are flushed on change

=cut

sub store {
    my ($self) = @_;

    my $flush = 0;

    if ( !$self->in_storage ) {
        $flush = 1;
    }
    else {
        my $self_from_storage = $self->get_from_storage;
        $flush = 1 if ( $self_from_storage->branchname ne $self->branchname );
    }

    $self = $self->SUPER::store;

    if ($flush) {
        my $cache = Koha::Caches->get_instance();
        $cache->clear_from_cache('LibraryNames');
    }

    return $self;
}

=head3 stockrotationstages

  my $stages = Koha::Library->stockrotationstages;





use base qw(Koha::Object);

=head1 NAME

Koha::Localization - Koha Localization type Object class

=head1 API

=head2 Class methods

=cut

=head3 store

Localization specific store to ensure relevant caches are flushed on change

=cut

sub store {
    my ($self) = @_;
    $self = $self->SUPER::store;

    if ($self->entity eq 'itemtypes') {
        my $cache = Koha::Caches->get_instance();
        my $key = $self->lang."ItemTypeDescriptions";
        $cache->clear_from_cache($key);
    }

    return $self;
}

sub _type {
    return 'Localization';
}
- 

Return to bug 30920

Lines 19-25 package Koha::AuthorisedValue; Link Here

(-)a/Koha/AuthorisedValue.pm (-1 / +32 lines)
19		19
20	use Modern::Perl;	20	use Modern::Perl;
21		21
22		22	use Koha::Caches;
23	use Koha::Database;	23	use Koha::Database;
24		24
25	use base qw(Koha::Object Koha::Object::Limit::Library);	25	use base qw(Koha::Object Koha::Object::Limit::Library);
Lines 34-39 Koha::AuthorisedValue - Koha Authorised value Object class Link Here
34		34
35	=cut	35	=cut
36		36
		37	=head3 store
		38
		39	AuthorisedValue specific store to ensure relevant caches are flushed on change
		40
		41	=cut
		42
		43	sub store {
		44	my ($self) = @_;
		45
		46	my $flush = 0;
		47
		48	if ( !$self->in_storage ) {
		49	$flush = 1;
		50	}
		51	else {
		52	my $self_from_storage = $self->get_from_storage;
		53	$flush = 1 if ( $self_from_storage->lib ne $self->lib );
		54	$flush = 1 if ( $self_from_storage->lib_opac ne $self->lib_opac );
		55	}
		56
		57	$self = $self->SUPER::store;
		58
		59	if ($flush) {
		60	my $cache = Koha::Caches->get_instance();
		61	my $key = "AVDescriptions-".$self->category;
		62	$cache->clear_from_cache($key);
		63	}
		64
		65	return $self;
		66	}
		67
37	=head3 opac_description	68	=head3 opac_description
38		69
39	my $description = $av->opac_description();	70	my $description = $av->opac_description();

Lines 20-25 use Modern::Perl; Link Here

(-)a/Koha/ItemType.pm (+31 lines)
20		20
21	use C4::Koha qw( getitemtypeimagelocation );	21	use C4::Koha qw( getitemtypeimagelocation );
22	use C4::Languages;	22	use C4::Languages;
		23	use Koha::Caches;
23	use Koha::Database;	24	use Koha::Database;
24	use Koha::CirculationRules;	25	use Koha::CirculationRules;
25	use Koha::Localizations;	26	use Koha::Localizations;
Lines 36-41 Koha::ItemType - Koha Item type Object class Link Here
36		37
37	=cut	38	=cut
38		39
		40	=head3 store
		41
		42	ItemType specific store to ensure relevant caches are flushed on change
		43
		44	=cut
		45
		46	sub store {
		47	my ($self) = @_;
		48
		49	my $flush = 0;
		50
		51	if ( !$self->in_storage ) {
		52	$flush = 1;
		53	}
		54	else {
		55	my $self_from_storage = $self->get_from_storage;
		56	$flush = 1 if ( $self_from_storage->description ne $self->description );
		57	}
		58
		59	$self = $self->SUPER::store;
		60
		61	if ($flush) {
		62	my $cache = Koha::Caches->get_instance();
		63	my $key = "enItemTypeDescriptions";
		64	$cache->clear_from_cache($key);
		65	}
		66
		67	return $self;
		68	}
		69
39	=head3 image_location	70	=head3 image_location
40		71
41	=cut	72	=cut

Lines 22-27 use Modern::Perl; Link Here

(-)a/Koha/Library.pm (+30 lines)
22		22
23	use C4::Context;	23	use C4::Context;
24		24
		25	use Koha::Caches;
25	use Koha::Database;	26	use Koha::Database;
26	use Koha::StockRotationStages;	27	use Koha::StockRotationStages;
27	use Koha::SMTP::Servers;	28	use Koha::SMTP::Servers;
Lines 36-41 Koha::Library - Koha Library Object class Link Here
36		37
37	=head2 Class methods	38	=head2 Class methods
38		39
		40	=head3 store
		41
		42	Library specific store to ensure relevant caches are flushed on change
		43
		44	=cut
		45
		46	sub store {
		47	my ($self) = @_;
		48
		49	my $flush = 0;
		50
		51	if ( !$self->in_storage ) {
		52	$flush = 1;
		53	}
		54	else {
		55	my $self_from_storage = $self->get_from_storage;
		56	$flush = 1 if ( $self_from_storage->branchname ne $self->branchname );
		57	}
		58
		59	$self = $self->SUPER::store;
		60
		61	if ($flush) {
		62	my $cache = Koha::Caches->get_instance();
		63	$cache->clear_from_cache('LibraryNames');
		64	}
		65
		66	return $self;
		67	}
		68
39	=head3 stockrotationstages	69	=head3 stockrotationstages
40		70
41	my $stages = Koha::Library->stockrotationstages;	71	my $stages = Koha::Library->stockrotationstages;

Lines 21-26 use Koha::Database; Link Here

(-)a/Koha/Localization.pm (-1 / +29 lines)
21		21
22	use base qw(Koha::Object);	22	use base qw(Koha::Object);
23		23
		24	=head1 NAME
		25
		26	Koha::Localization - Koha Localization type Object class
		27
		28	=head1 API
		29
		30	=head2 Class methods
		31
		32	=cut
		33
		34	=head3 store
		35
		36	Localization specific store to ensure relevant caches are flushed on change
		37
		38	=cut
		39
		40	sub store {
		41	my ($self) = @_;
		42	$self = $self->SUPER::store;
		43
		44	if ($self->entity eq 'itemtypes') {
		45	my $cache = Koha::Caches->get_instance();
		46	my $key = $self->lang."ItemTypeDescriptions";
		47	$cache->clear_from_cache($key);
		48	}
		49
		50	return $self;
		51	}
		52
24	sub _type {	53	sub _type {
25	return 'Localization';	54	return 'Localization';
26	}	55	}
27	-