projects
/
koha_gimpoz
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'koha_gimpoz' of /srv/koha/ into koha_gimpoz
[koha_gimpoz]
/
C4
/
Koha.pm
diff --git
a/C4/Koha.pm
b/C4/Koha.pm
index
06b2ec5
..
0192989
100644
(file)
--- a/
C4/Koha.pm
+++ b/
C4/Koha.pm
@@
-23,10
+23,7
@@
package C4::Koha;
use strict;
#use warnings; FIXME - Bug 2505
use C4::Context;
use strict;
#use warnings; FIXME - Bug 2505
use C4::Context;
-use C4::Output;
-use URI::Split qw(uri_split);
use Memoize;
use Memoize;
-use Business::ISBN;
use vars qw($VERSION @ISA @EXPORT $DEBUG);
use vars qw($VERSION @ISA @EXPORT $DEBUG);
@@
-455,7
+452,7
@@
sub getitemtypeimagedir {
if ($src eq 'intranet') {
return C4::Context->config('intrahtdocs') . '/' .C4::Context->preference('template') . '/img/itemtypeimg';
} else {
if ($src eq 'intranet') {
return C4::Context->config('intrahtdocs') . '/' .C4::Context->preference('template') . '/img/itemtypeimg';
} else {
- return C4::Context->config('opachtdocs') . '/' . C4::Context->preference('
template
') . '/itemtypeimg';
+ return C4::Context->config('opachtdocs') . '/' . C4::Context->preference('
opacthemes
') . '/itemtypeimg';
}
}
}
}
@@
-464,7
+461,7
@@
sub getitemtypeimagesrc {
if ($src eq 'intranet') {
return '/intranet-tmpl' . '/' . C4::Context->preference('template') . '/img/itemtypeimg';
} else {
if ($src eq 'intranet') {
return '/intranet-tmpl' . '/' . C4::Context->preference('template') . '/img/itemtypeimg';
} else {
- return '/opac-tmpl' . '/' . C4::Context->preference('
template
') . '/itemtypeimg';
+ return '/opac-tmpl' . '/' . C4::Context->preference('
opacthemes
') . '/itemtypeimg';
}
}
}
}
@@
-472,8
+469,9
@@
sub getitemtypeimagelocation($$) {
my ( $src, $image ) = @_;
return '' if ( !$image );
my ( $src, $image ) = @_;
return '' if ( !$image );
+ require URI::Split;
- my $scheme = ( uri_split( $image ) )[0];
+ my $scheme = (
URI::Split::
uri_split( $image ) )[0];
return $image if ( $scheme );
return $image if ( $scheme );
@@
-573,9
+571,8
@@
sub getImageSets {
my @imagesets = (); # list of hasrefs of image set data to pass to template
my @subdirectories = _getSubdirectoryNames( $paths->{'staff'}{'filesystem'} );
my @imagesets = (); # list of hasrefs of image set data to pass to template
my @subdirectories = _getSubdirectoryNames( $paths->{'staff'}{'filesystem'} );
-warn $paths->{'staff'}{'filesystem'};
foreach my $imagesubdir ( @subdirectories ) {
foreach my $imagesubdir ( @subdirectories ) {
-
warn $imagesubdir
;
+
warn $imagesubdir if $DEBUG
;
my @imagelist = (); # hashrefs of image info
my @imagenames = _getImagesFromDirectory( File::Spec->catfile( $paths->{'staff'}{'filesystem'}, $imagesubdir ) );
my $imagesetactive = 0;
my @imagelist = (); # hashrefs of image info
my @imagenames = _getImagesFromDirectory( File::Spec->catfile( $paths->{'staff'}{'filesystem'}, $imagesubdir ) );
my $imagesetactive = 0;
@@
-681,95
+678,89
@@
sub getFacets {
if ( C4::Context->preference("marcflavour") eq "UNIMARC" ) {
$facets = [
{
if ( C4::Context->preference("marcflavour") eq "UNIMARC" ) {
$facets = [
{
- link_value => 'su-to',
- label_value => 'Topics',
- tags =>
- [ '600', '601', '602', '603', '604', '605', '606', '610' ],
- subfield => 'a',
+ idx => 'su-to',
+ label => 'Topics',
+ tags => [ qw/ 600a 601a 602a 603a 604a 605a 606ax 610a/ ],
+ sep => ' - ',
},
{
},
{
-
link_value
=> 'su-geo',
- label
_value
=> 'Places',
- tags
=> ['651'
],
- s
ubfield => 'a
',
+
idx
=> 'su-geo',
+ label => 'Places',
+ tags
=> [ qw/ 651a /
],
+ s
ep => ' -
',
},
{
},
{
-
link_value
=> 'su-ut',
- label
_value
=> 'Titles',
- tags
=> [ '500', '501', '502', '503', '504',
],
- s
ubfield => 'a
',
+
idx
=> 'su-ut',
+ label => 'Titles',
+ tags
=> [ qw/ 500a 501a 502a 503a 504a /
],
+ s
ep => ',
',
},
{
},
{
-
link_value
=> 'au',
- label
_value
=> 'Authors',
- tags
=> [ '700', '701', '702',
],
- s
ubfield => 'a
',
+
idx
=> 'au',
+ label => 'Authors',
+ tags
=> [ qw/ 700ab 701ab 702ab /
],
+ s
ep => ',
',
},
{
},
{
-
link_value
=> 'se',
- label
_value
=> 'Series',
- tags
=> ['225'
],
- s
ubfield => 'a
',
+
idx
=> 'se',
+ label => 'Series',
+ tags
=> [ qw/ 225a /
],
+ s
ep => ',
',
},
},
- ];
-
- my $library_facet;
-
- $library_facet = {
- link_value => 'branch',
- label_value => 'Libraries',
- tags => [ '995', ],
- subfield => 'b',
- expanded => '1',
- };
- push @$facets, $library_facet unless C4::Context->preference("singleBranchMode");
+ ];
+ my $library_facet = {
+ idx => 'branch',
+ label => 'Libraries',
+ tags => [ qw/ 995b / ],
+ expanded => '1',
+ };
+ push @$facets, $library_facet unless C4::Context->preference("singleBranchMode");
}
else {
$facets = [
{
}
else {
$facets = [
{
-
link_value
=> 'su-to',
- label
_value
=> 'Topics',
- tags
=> ['650'
],
- s
ubfield => 'a
',
+
idx
=> 'su-to',
+ label => 'Topics',
+ tags
=> [ qw/ 650a /
],
+ s
ep => '--
',
},
},
-
# {
# {
- #
link_value
=> 'su-na',
- # label
_value
=> 'People and Organizations',
- # tags
=> ['600', '610', '611'
],
- # s
ubfield
=> 'a',
+ #
idx
=> 'su-na',
+ # label => 'People and Organizations',
+ # tags
=> [ qw/ 600a 610a 611a /
],
+ # s
ep
=> 'a',
# },
{
# },
{
-
link_value
=> 'su-geo',
- label
_value
=> 'Places',
- tags
=> ['651'
],
- s
ubfield => 'a
',
+
idx
=> 'su-geo',
+ label => 'Places',
+ tags
=> [ qw/ 651a /
],
+ s
ep => '--
',
},
{
},
{
-
link_value
=> 'su-ut',
- label
_value
=> 'Titles',
- tags
=> ['630'
],
- s
ubfield => 'a
',
+
idx
=> 'su-ut',
+ label => 'Titles',
+ tags
=> [ qw/ 630a /
],
+ s
ep => '--
',
},
{
},
{
-
link_value
=> 'au',
- label
_value
=> 'Authors',
- tags
=> [ '100', '110', '700',
],
- s
ubfield => 'a
',
+
idx
=> 'au',
+ label => 'Authors',
+ tags
=> [ qw/ 100a 110a 700a /
],
+ s
ep => ',
',
},
{
},
{
-
link_value
=> 'se',
- label
_value
=> 'Series',
- tags
=> [ '440', '490',
],
- s
ubfield => 'a
',
+
idx
=> 'se',
+ label => 'Series',
+ tags
=> [ qw/ 440a 490a /
],
+ s
ep => ',
',
},
];
my $library_facet;
$library_facet = {
},
];
my $library_facet;
$library_facet = {
-
link_value
=> 'branch',
- label
_value
=> 'Libraries',
- tags
=> [ '952',
],
- s
ubfield => 'b
',
+
idx
=> 'branch',
+ label => 'Libraries',
+ tags
=> [ qw/ 952b /
],
+ s
ep => ',
',
expanded => '1',
};
push @$facets, $library_facet unless C4::Context->preference("singleBranchMode");
expanded => '1',
};
push @$facets, $library_facet unless C4::Context->preference("singleBranchMode");
@@
-1316,6
+1307,7
@@
sub _normalize_match_point {
}
sub _isbn_cleanup {
}
sub _isbn_cleanup {
+ require Business::ISBN;
my $isbn = Business::ISBN->new( $_[0] );
if ( $isbn ) {
$isbn = $isbn->as_isbn10 if $isbn->type eq 'ISBN13';
my $isbn = Business::ISBN->new( $_[0] );
if ( $isbn ) {
$isbn = $isbn->as_isbn10 if $isbn->type eq 'ISBN13';