X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FKoha.pm;h=997699541b5b0f18f78e8e00f68a621b302246c0;hb=be869ab2790f1a5d43c7d5f3aab4d8b77d2acc9f;hp=4f386e469d5cc7a6123ef742f1f360b54d97bb93;hpb=5432bd488f2cd842f4fece93c42423a3fc26143b;p=koha.git diff --git a/C4/Koha.pm b/C4/Koha.pm index 4f386e469d..997699541b 100644 --- a/C4/Koha.pm +++ b/C4/Koha.pm @@ -24,7 +24,7 @@ use strict; #use warnings; FIXME - Bug 2505 use C4::Context; - +use C4::Branch qw(GetBranchesCount); use Memoize; use DateTime; use DateTime::Format::MySQL; @@ -57,12 +57,14 @@ BEGIN { &getitemtypeimagelocation &GetAuthorisedValues &GetAuthorisedValueCategories + &IsAuthorisedValueCategory &GetKohaAuthorisedValues &GetKohaAuthorisedValuesFromField &GetKohaAuthorisedValueLib &GetAuthorisedValueByCode &GetKohaImageurlFromAuthorisedValues &GetAuthValCode + &AddAuthorisedValue &GetNormalizedUPC &GetNormalizedISBN &GetNormalizedEAN @@ -112,7 +114,7 @@ sub slashifyDate { } # FIXME.. this should be moved to a MARC-specific module -sub subfield_is_koha_internal_p ($) { +sub subfield_is_koha_internal_p { my ($subfield) = @_; # We could match on 'lib' and 'tab' (and 'mandatory', & more to come!) @@ -204,10 +206,15 @@ sub GetSupportList{ } =head2 GetItemTypes - $itemtypes = &GetItemTypes(); + $itemtypes = &GetItemTypes( style => $style ); Returns information about existing itemtypes. +Params: + style: either 'array' or 'hash', defaults to 'hash'. + 'array' returns an arrayref, + 'hash' return a hashref with the itemtype value as the key + build a HTML select with the following code : =head3 in PERL SCRIPT @@ -240,6 +247,8 @@ build a HTML select with the following code : =cut sub GetItemTypes { + my ( %params ) = @_; + my $style = defined( $params{'style'} ) ? $params{'style'} : 'hash'; # returns a reference to a hash of references to itemtypes... my %itemtypes; @@ -250,10 +259,15 @@ sub GetItemTypes { |; my $sth = $dbh->prepare($query); $sth->execute; - while ( my $IT = $sth->fetchrow_hashref ) { - $itemtypes{ $IT->{'itemtype'} } = $IT; + + if ( $style eq 'hash' ) { + while ( my $IT = $sth->fetchrow_hashref ) { + $itemtypes{ $IT->{'itemtype'} } = $IT; + } + return ( \%itemtypes ); + } else { + return $sth->fetchall_arrayref({}); } - return ( \%itemtypes ); } sub get_itemtypeinfos_of { @@ -425,20 +439,22 @@ sub getframeworkinfo { =head2 getitemtypeinfo - $itemtype = &getitemtype($itemtype); + $itemtype = &getitemtypeinfo($itemtype, [$interface]); -Returns information about an itemtype. +Returns information about an itemtype. The optional $interface argument +sets which interface ('opac' or 'intranet') to return the imageurl for. +Defaults to intranet. =cut sub getitemtypeinfo { - my ($itemtype) = @_; + my ($itemtype, $interface) = @_; my $dbh = C4::Context->dbh; my $sth = $dbh->prepare("select * from itemtypes where itemtype=?"); $sth->execute($itemtype); my $res = $sth->fetchrow_hashref; - $res->{imageurl} = getitemtypeimagelocation( 'intranet', $res->{imageurl} ); + $res->{imageurl} = getitemtypeimagelocation( ( ( defined $interface && $interface eq 'opac' ) ? 'opac' : 'intranet' ), $res->{imageurl} ); return $res; } @@ -471,7 +487,7 @@ sub getitemtypeimagesrc { } } -sub getitemtypeimagelocation($$) { +sub getitemtypeimagelocation { my ( $src, $image ) = @_; return '' if ( !$image ); @@ -630,7 +646,7 @@ sub GetPrinters { =cut -sub GetPrinter ($$) { +sub GetPrinter { my ( $query, $printers ) = @_; # get printer for this query from printers my $printer = $query->param('printer'); my %cookie = $query->cookie('userenv'); @@ -674,6 +690,7 @@ sub getallthemes { opendir D, "$htdocs"; my @dirlist = readdir D; foreach my $directory (@dirlist) { + next if $directory eq 'lib'; -d "$htdocs/$directory/en" and push @themes, $directory; } return @themes; @@ -686,26 +703,26 @@ sub getFacets { { idx => 'su-to', label => 'Topics', - tags => [ qw/ 600a 601a 602a 603a 604a 605a 606ax 610a/ ], + tags => [ qw/ 600ab 601ab 602a 604at 605a 606ax 610a / ], sep => ' - ', }, { idx => 'su-geo', label => 'Places', - tags => [ qw/ 651a / ], + tags => [ qw/ 607a / ], sep => ' - ', }, { idx => 'su-ut', label => 'Titles', - tags => [ qw/ 500a 501a 502a 503a 504a / ], + tags => [ qw/ 500a 501a 503a / ], sep => ', ', }, { idx => 'au', label => 'Authors', tags => [ qw/ 700ab 701ab 702ab / ], - sep => ', ', + sep => C4::Context->preference("UNIMARCAuthorsFacetsSeparator"), }, { idx => 'se', @@ -713,14 +730,23 @@ sub getFacets { tags => [ qw/ 225a / ], sep => ', ', }, - ]; - my $library_facet = { - idx => 'branch', - label => 'Libraries', - tags => [ qw/ 995b / ], - expanded => '1', - }; - push @$facets, $library_facet unless C4::Context->preference("singleBranchMode"); + ]; + + my $library_facet; + unless ( C4::Context->preference("singleBranchMode") || GetBranchesCount() == 1 ) { + $library_facet = { + idx => 'branch', + label => 'Libraries', + tags => [ qw/ 995b / ], + }; + } else { + $library_facet = { + idx => 'location', + label => 'Location', + tags => [ qw/ 995c / ], + }; + } + push( @$facets, $library_facet ); } else { $facets = [ @@ -767,15 +793,22 @@ sub getFacets { sep => ', ', }, ]; + my $library_facet; - $library_facet = { - idx => 'branch', - label => 'Libraries', - tags => [ qw/ 952b / ], - sep => ', ', - expanded => '1', - }; - push @$facets, $library_facet unless C4::Context->preference("singleBranchMode"); + unless ( C4::Context->preference("singleBranchMode") || GetBranchesCount() == 1 ) { + $library_facet = { + idx => 'branch', + label => 'Libraries', + tags => [ qw / 952b / ], + }; + } else { + $library_facet = { + idx => 'location', + label => 'Location', + tags => [ qw / 952c / ], + }; + } + push( @$facets, $library_facet ); } return $facets; } @@ -892,13 +925,13 @@ like: { 'checked' => 'checked', - 'encoding' => 'MARC-8' + 'encoding' => 'utf8', 'icon' => undef, 'id' => 'LIBRARY OF CONGRESS', 'label' => '', 'name' => 'server', 'opensearch' => '', - 'value' => 'z3950.loc.gov:7090/', + 'value' => 'lx2.loc.gov:210/', 'zed' => 1, }, @@ -1019,28 +1052,50 @@ C<$opac> If set to a true value, displays OPAC descriptions rather than normal o =cut sub GetAuthorisedValues { - my ($category,$selected,$opac) = @_; + my ( $category, $selected, $opac ) = @_; + my $branch_limit = C4::Context->userenv ? C4::Context->userenv->{"branch"} : ""; my @results; my $dbh = C4::Context->dbh; - my $query = "SELECT * FROM authorised_values"; - $query .= " WHERE category = '" . $category . "'" if $category; - $query .= " ORDER BY category, lib, lib_opac"; + my $query = qq{ + SELECT * + FROM authorised_values + }; + $query .= qq{ + LEFT JOIN authorised_values_branches ON ( id = av_id ) + } if $branch_limit; + my @where_strings; + my @where_args; + if($category) { + push @where_strings, "category = ?"; + push @where_args, $category; + } + if($branch_limit) { + push @where_strings, "( branchcode = ? OR branchcode IS NULL )"; + push @where_args, $branch_limit; + } + if(@where_strings > 0) { + $query .= " WHERE " . join(" AND ", @where_strings); + } + $query .= " GROUP BY lib ORDER BY category, lib, lib_opac"; + my $sth = $dbh->prepare($query); - $sth->execute; + + $sth->execute( @where_args ); while (my $data=$sth->fetchrow_hashref) { - if ( (defined($selected)) && ($selected eq $data->{'authorised_value'}) ) { - $data->{'selected'} = 1; + if ( defined $selected and $selected eq $data->{authorised_value} ) { + $data->{selected} = 1; } else { - $data->{'selected'} = 0; + $data->{selected} = 0; } - if ($opac && $data->{'lib_opac'}) { - $data->{'lib'} = $data->{'lib_opac'}; + + if ($opac && $data->{lib_opac}) { + $data->{lib} = $data->{lib_opac}; } push @results, $data; } - #my $data = $sth->fetchall_arrayref({}); - return \@results; #$data; + $sth->finish; + return \@results; } =head2 GetAuthorisedValueCategories @@ -1063,9 +1118,31 @@ sub GetAuthorisedValueCategories { return \@results; } +=head2 IsAuthorisedValueCategory + + $is_auth_val_category = IsAuthorisedValueCategory($category); + +Returns whether a given category name is a valid one + +=cut + +sub IsAuthorisedValueCategory { + my $category = shift; + my $query = ' + SELECT category + FROM authorised_values + WHERE BINARY category=? + LIMIT 1 + '; + my $sth = C4::Context->dbh->prepare($query); + $sth->execute($category); + $sth->fetchrow ? return 1 + : return 0; +} + =head2 GetAuthorisedValueByCode -$authhorised_value = GetAuthorisedValueByCode( $category, $authvalcode ); +$authorised_value = GetAuthorisedValueByCode( $category, $authvalcode, $opac ); Return the lib attribute from authorised_values from the row identified by the passed category and code @@ -1073,13 +1150,14 @@ by the passed category and code =cut sub GetAuthorisedValueByCode { - my ( $category, $authvalcode ) = @_; + my ( $category, $authvalcode, $opac ) = @_; + my $field = $opac ? 'lib_opac' : 'lib'; my $dbh = C4::Context->dbh; - my $sth = $dbh->prepare("SELECT lib FROM authorised_values WHERE category=? AND authorised_value =?"); + my $sth = $dbh->prepare("SELECT $field FROM authorised_values WHERE category=? AND authorised_value =?"); $sth->execute( $category, $authvalcode ); while ( my $data = $sth->fetchrow_hashref ) { - return $data->{'lib'}; + return $data->{ $field }; } } @@ -1109,7 +1187,7 @@ sub GetKohaAuthorisedValues { } return \%values; } else { - return undef; + return; } } @@ -1140,7 +1218,7 @@ sub GetKohaAuthorisedValuesFromField { } return \%values; } else { - return undef; + return; } } @@ -1184,6 +1262,26 @@ sub GetKohaAuthorisedValueLib { return $value; } +=head2 AddAuthorisedValue + + AddAuthorisedValue($category, $authorised_value, $lib, $lib_opac, $imageurl); + +Create a new authorised value. + +=cut + +sub AddAuthorisedValue { + my ($category, $authorised_value, $lib, $lib_opac, $imageurl) = @_; + + my $dbh = C4::Context->dbh; + my $query = qq{ + INSERT INTO authorised_values (category, authorised_value, lib, lib_opac, imageurl) + VALUES (?,?,?,?,?) + }; + my $sth = $dbh->prepare($query); + $sth->execute($category, $authorised_value, $lib, $lib_opac, $imageurl); +} + =head2 display_marc_indicators my $display_form = C4::Koha::display_marc_indicators($field); @@ -1232,7 +1330,7 @@ sub GetNormalizedUPC { } # Normalizes and returns the first valid ISBN found in the record -# ISBN13 are converted into ISBN10. This is required to get Amazon cover book. +# ISBN13 are converted into ISBN10. This is required to get some book cover images. sub GetNormalizedISBN { my ($isbn,$record,$marcflavour) = @_; my @fields; @@ -1242,7 +1340,7 @@ sub GetNormalizedISBN { $isbn =~ s/(.*)( \| )(.*)/$1/; return _isbn_cleanup($isbn); } - return undef unless $record; + return unless $record; if ($marcflavour eq 'UNIMARC') { @fields = $record->field('010'); @@ -1251,7 +1349,7 @@ sub GetNormalizedISBN { if ($isbn) { return _isbn_cleanup($isbn); } else { - return undef; + return; } } } @@ -1262,7 +1360,7 @@ sub GetNormalizedISBN { if ($isbn) { return _isbn_cleanup($isbn); } else { - return undef; + return; } } } @@ -1307,7 +1405,7 @@ sub GetNormalizedOCLCNumber { $oclc =~ s/\(OCoLC\)//; return $oclc; } else { - return undef; + return; } } }