X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FKoha.pm;h=0192989ecb83b04d30cac1cfcdb5deea4af0b439;hb=44ab1c531d1aca7bf5223ad011b7a1e848a291b7;hp=a63a3a551a4601cdf6dfb586e08f9a5224c2189a;hpb=c95b5153e0ed5585c8331273a42fc29d75f9f10f;p=koha_gimpoz diff --git a/C4/Koha.pm b/C4/Koha.pm index a63a3a551a..0192989ecb 100644 --- a/C4/Koha.pm +++ b/C4/Koha.pm @@ -2,6 +2,7 @@ package C4::Koha; # Copyright 2000-2002 Katipo Communications # Parts Copyright 2010 Nelsonville Public Library +# Parts copyright 2010 BibLibre # # This file is part of Koha. # @@ -22,10 +23,7 @@ package C4::Koha; use strict; #use warnings; FIXME - Bug 2505 use C4::Context; -use C4::Output; -use URI::Split qw(uri_split); use Memoize; -use Business::ISBN; use vars qw($VERSION @ISA @EXPORT $DEBUG); @@ -35,7 +33,6 @@ BEGIN { @ISA = qw(Exporter); @EXPORT = qw( &slashifyDate - &DisplayISBN &subfield_is_koha_internal_p &GetPrinters &GetPrinter &GetItemTypes &getitemtypeinfo @@ -57,6 +54,9 @@ BEGIN { &GetAuthorisedValueCategories &GetKohaAuthorisedValues &GetKohaAuthorisedValuesFromField + &GetKohaAuthorisedValueLib + &GetAuthorisedValueByCode + &GetKohaImageurlFromAuthorisedValues &GetAuthValCode &GetNormalizedUPC &GetNormalizedISBN @@ -105,106 +105,6 @@ sub slashifyDate { return ("$dateOut[2]/$dateOut[1]/$dateOut[0]"); } - -=head2 DisplayISBN - - my $string = DisplayISBN( $isbn ); - -=cut - -sub DisplayISBN { - my ($isbn) = @_; - if (length ($isbn)<13){ - my $seg1; - if ( substr( $isbn, 0, 1 ) <= 7 ) { - $seg1 = substr( $isbn, 0, 1 ); - } - elsif ( substr( $isbn, 0, 2 ) <= 94 ) { - $seg1 = substr( $isbn, 0, 2 ); - } - elsif ( substr( $isbn, 0, 3 ) <= 995 ) { - $seg1 = substr( $isbn, 0, 3 ); - } - elsif ( substr( $isbn, 0, 4 ) <= 9989 ) { - $seg1 = substr( $isbn, 0, 4 ); - } - else { - $seg1 = substr( $isbn, 0, 5 ); - } - my $x = substr( $isbn, length($seg1) ); - my $seg2; - if ( substr( $x, 0, 2 ) <= 19 ) { - - # if(sTmp2 < 10) sTmp2 = "0" sTmp2; - $seg2 = substr( $x, 0, 2 ); - } - elsif ( substr( $x, 0, 3 ) <= 699 ) { - $seg2 = substr( $x, 0, 3 ); - } - elsif ( substr( $x, 0, 4 ) <= 8399 ) { - $seg2 = substr( $x, 0, 4 ); - } - elsif ( substr( $x, 0, 5 ) <= 89999 ) { - $seg2 = substr( $x, 0, 5 ); - } - elsif ( substr( $x, 0, 6 ) <= 9499999 ) { - $seg2 = substr( $x, 0, 6 ); - } - else { - $seg2 = substr( $x, 0, 7 ); - } - my $seg3 = substr( $x, length($seg2) ); - $seg3 = substr( $seg3, 0, length($seg3) - 1 ); - my $seg4 = substr( $x, -1, 1 ); - return "$seg1-$seg2-$seg3-$seg4"; - } else { - my $seg1; - $seg1 = substr( $isbn, 0, 3 ); - my $seg2; - if ( substr( $isbn, 3, 1 ) <= 7 ) { - $seg2 = substr( $isbn, 3, 1 ); - } - elsif ( substr( $isbn, 3, 2 ) <= 94 ) { - $seg2 = substr( $isbn, 3, 2 ); - } - elsif ( substr( $isbn, 3, 3 ) <= 995 ) { - $seg2 = substr( $isbn, 3, 3 ); - } - elsif ( substr( $isbn, 3, 4 ) <= 9989 ) { - $seg2 = substr( $isbn, 3, 4 ); - } - else { - $seg2 = substr( $isbn, 3, 5 ); - } - my $x = substr( $isbn, length($seg2) +3); - my $seg3; - if ( substr( $x, 0, 2 ) <= 19 ) { - - # if(sTmp2 < 10) sTmp2 = "0" sTmp2; - $seg3 = substr( $x, 0, 2 ); - } - elsif ( substr( $x, 0, 3 ) <= 699 ) { - $seg3 = substr( $x, 0, 3 ); - } - elsif ( substr( $x, 0, 4 ) <= 8399 ) { - $seg3 = substr( $x, 0, 4 ); - } - elsif ( substr( $x, 0, 5 ) <= 89999 ) { - $seg3 = substr( $x, 0, 5 ); - } - elsif ( substr( $x, 0, 6 ) <= 9499999 ) { - $seg3 = substr( $x, 0, 6 ); - } - else { - $seg3 = substr( $x, 0, 7 ); - } - my $seg4 = substr( $x, length($seg3) ); - $seg4 = substr( $seg4, 0, length($seg4) - 1 ); - my $seg5 = substr( $x, -1, 1 ); - return "$seg1-$seg2-$seg3-$seg4-$seg5"; - } -} - # FIXME.. this should be moved to a MARC-specific module sub subfield_is_koha_internal_p ($) { my ($subfield) = @_; @@ -552,7 +452,7 @@ sub getitemtypeimagedir { 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'; } } @@ -561,7 +461,7 @@ sub getitemtypeimagesrc { 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'; } } @@ -569,8 +469,9 @@ sub getitemtypeimagelocation($$) { 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 ); @@ -670,8 +571,8 @@ sub getImageSets { my @imagesets = (); # list of hasrefs of image set data to pass to template my @subdirectories = _getSubdirectoryNames( $paths->{'staff'}{'filesystem'} ); - foreach my $imagesubdir ( @subdirectories ) { + warn $imagesubdir if $DEBUG; my @imagelist = (); # hashrefs of image info my @imagenames = _getImagesFromDirectory( File::Spec->catfile( $paths->{'staff'}{'filesystem'}, $imagesubdir ) ); my $imagesetactive = 0; @@ -777,95 +678,89 @@ sub getFacets { 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'], - subfield => 'a', + idx => 'su-geo', + label => 'Places', + tags => [ qw/ 651a / ], + sep => ' - ', }, { - link_value => 'su-ut', - label_value => 'Titles', - tags => [ '500', '501', '502', '503', '504', ], - subfield => 'a', + idx => 'su-ut', + label => 'Titles', + tags => [ qw/ 500a 501a 502a 503a 504a / ], + sep => ', ', }, { - link_value => 'au', - label_value => 'Authors', - tags => [ '700', '701', '702', ], - subfield => 'a', + idx => 'au', + label => 'Authors', + tags => [ qw/ 700ab 701ab 702ab / ], + sep => ', ', }, { - link_value => 'se', - label_value => 'Series', - tags => ['225'], - subfield => 'a', + idx => 'se', + label => 'Series', + tags => [ qw/ 225a / ], + sep => ', ', }, - ]; - - 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 = [ { - link_value => 'su-to', - label_value => 'Topics', - tags => ['650'], - subfield => 'a', + idx => 'su-to', + label => 'Topics', + tags => [ qw/ 650a / ], + sep => '--', }, - # { - # link_value => 'su-na', - # label_value => 'People and Organizations', - # tags => ['600', '610', '611'], - # subfield => 'a', + # idx => 'su-na', + # label => 'People and Organizations', + # tags => [ qw/ 600a 610a 611a / ], + # sep => 'a', # }, { - link_value => 'su-geo', - label_value => 'Places', - tags => ['651'], - subfield => 'a', + idx => 'su-geo', + label => 'Places', + tags => [ qw/ 651a / ], + sep => '--', }, { - link_value => 'su-ut', - label_value => 'Titles', - tags => ['630'], - subfield => 'a', + idx => 'su-ut', + label => 'Titles', + tags => [ qw/ 630a / ], + sep => '--', }, { - link_value => 'au', - label_value => 'Authors', - tags => [ '100', '110', '700', ], - subfield => 'a', + idx => 'au', + label => 'Authors', + tags => [ qw/ 100a 110a 700a / ], + sep => ', ', }, { - link_value => 'se', - label_value => 'Series', - tags => [ '440', '490', ], - subfield => 'a', + idx => 'se', + label => 'Series', + tags => [ qw/ 440a 490a / ], + sep => ', ', }, ]; my $library_facet; $library_facet = { - link_value => 'branch', - label_value => 'Libraries', - tags => [ '952', ], - subfield => 'b', + idx => 'branch', + label => 'Libraries', + tags => [ qw/ 952b / ], + sep => ', ', expanded => '1', }; push @$facets, $library_facet unless C4::Context->preference("singleBranchMode"); @@ -1040,6 +935,25 @@ sub displayServers { return \@primaryserverloop; } + +=head2 GetKohaImageurlFromAuthorisedValues + +$authhorised_value = GetKohaImageurlFromAuthorisedValues( $category, $authvalcode ); + +Return the first url of the authorised value image represented by $lib. + +=cut + +sub GetKohaImageurlFromAuthorisedValues { + my ( $category, $lib ) = @_; + my $dbh = C4::Context->dbh; + my $sth = $dbh->prepare("SELECT imageurl FROM authorised_values WHERE category=? AND lib =?"); + $sth->execute( $category, $lib ); + while ( my $data = $sth->fetchrow_hashref ) { + return $data->{'imageurl'}; + } +} + =head2 GetAuthValCode $authvalcode = GetAuthValCode($kohafield,$frameworkcode); @@ -1128,12 +1042,32 @@ sub GetAuthorisedValueCategories { my $sth = $dbh->prepare("SELECT DISTINCT category FROM authorised_values ORDER BY category"); $sth->execute; my @results; - while (my $category = $sth->fetchrow_array) { + while (defined (my $category = $sth->fetchrow_array) ) { push @results, $category; } return \@results; } +=head2 GetAuthorisedValueByCode + +$authhorised_value = GetAuthorisedValueByCode( $category, $authvalcode ); + +Return the lib attribute from authorised_values from the row identified +by the passed category and code + +=cut + +sub GetAuthorisedValueByCode { + my ( $category, $authvalcode ) = @_; + + my $dbh = C4::Context->dbh; + my $sth = $dbh->prepare("SELECT lib FROM authorised_values WHERE category=? AND authorised_value =?"); + $sth->execute( $category, $authvalcode ); + while ( my $data = $sth->fetchrow_hashref ) { + return $data->{'lib'}; + } +} + =head2 GetKohaAuthorisedValues Takes $kohafield, $fwcode as parameters. @@ -1214,6 +1148,27 @@ sub xml_escape { return $str; } +=head2 GetKohaAuthorisedValueLib + +Takes $category, $authorised_value as parameters. + +If $opac parameter is set to a true value, displays OPAC descriptions rather than normal ones when they exist. + +Returns authorised value description + +=cut + +sub GetKohaAuthorisedValueLib { + my ($category,$authorised_value,$opac) = @_; + my $value; + my $dbh = C4::Context->dbh; + my $sth = $dbh->prepare("select lib, lib_opac from authorised_values where category=? and authorised_value=?"); + $sth->execute($category,$authorised_value); + my $data = $sth->fetchrow_hashref; + $value = ($opac && $$data{'lib_opac'}) ? $$data{'lib_opac'} : $$data{'lib'}; + return $value; +} + =head2 display_marc_indicators my $display_form = C4::Koha::display_marc_indicators($field); @@ -1239,21 +1194,22 @@ sub GetNormalizedUPC { my ($record,$marcflavour) = @_; my (@fields,$upc); - if ($marcflavour eq 'MARC21') { - @fields = $record->field('024'); + if ($marcflavour eq 'UNIMARC') { + @fields = $record->field('072'); foreach my $field (@fields) { - my $indicator = $field->indicator(1); my $upc = _normalize_match_point($field->subfield('a')); - if ($indicator == 1 and $upc ne '') { + if ($upc ne '') { return $upc; } } + } - else { # assume unimarc if not marc21 - @fields = $record->field('072'); + else { # assume marc21 if not unimarc + @fields = $record->field('024'); foreach my $field (@fields) { + my $indicator = $field->indicator(1); my $upc = _normalize_match_point($field->subfield('a')); - if ($upc ne '') { + if ($indicator == 1 and $upc ne '') { return $upc; } } @@ -1273,10 +1229,10 @@ sub GetNormalizedISBN { } return undef unless $record; - if ($marcflavour eq 'MARC21') { - @fields = $record->field('020'); + if ($marcflavour eq 'UNIMARC') { + @fields = $record->field('010'); foreach my $field (@fields) { - $isbn = $field->subfield('a'); + my $isbn = $field->subfield('a'); if ($isbn) { return _isbn_cleanup($isbn); } else { @@ -1284,10 +1240,10 @@ sub GetNormalizedISBN { } } } - else { # assume unimarc if not marc21 - @fields = $record->field('010'); + else { # assume marc21 if not unimarc + @fields = $record->field('020'); foreach my $field (@fields) { - my $isbn = $field->subfield('a'); + $isbn = $field->subfield('a'); if ($isbn) { return _isbn_cleanup($isbn); } else { @@ -1295,28 +1251,27 @@ sub GetNormalizedISBN { } } } - } sub GetNormalizedEAN { my ($record,$marcflavour) = @_; my (@fields,$ean); - if ($marcflavour eq 'MARC21') { - @fields = $record->field('024'); + if ($marcflavour eq 'UNIMARC') { + @fields = $record->field('073'); foreach my $field (@fields) { - my $indicator = $field->indicator(1); $ean = _normalize_match_point($field->subfield('a')); - if ($indicator == 3 and $ean ne '') { + if ($ean ne '') { return $ean; } } } - else { # assume unimarc if not marc21 - @fields = $record->field('073'); + else { # assume marc21 if not unimarc + @fields = $record->field('024'); foreach my $field (@fields) { + my $indicator = $field->indicator(1); $ean = _normalize_match_point($field->subfield('a')); - if ($ean ne '') { + if ($indicator == 3 and $ean ne '') { return $ean; } } @@ -1326,7 +1281,10 @@ sub GetNormalizedOCLCNumber { my ($record,$marcflavour) = @_; my (@fields,$oclc); - if ($marcflavour eq 'MARC21') { + if ($marcflavour eq 'UNIMARC') { + # TODO: add UNIMARC fields + } + else { # assume marc21 if not unimarc @fields = $record->field('035'); foreach my $field (@fields) { $oclc = $field->subfield('a'); @@ -1338,8 +1296,6 @@ sub GetNormalizedOCLCNumber { } } } - else { # TODO: add UNIMARC fields - } } sub _normalize_match_point { @@ -1351,6 +1307,7 @@ sub _normalize_match_point { } sub _isbn_cleanup { + require Business::ISBN; my $isbn = Business::ISBN->new( $_[0] ); if ( $isbn ) { $isbn = $isbn->as_isbn10 if $isbn->type eq 'ISBN13';