use Module::Load::Conditional qw(can_load);
use C4::Koha;
-use C4::Dates qw/format_date/;
use C4::Log; # logaction
use C4::Budgets;
use C4::ClassSource;
use C4::OAI::Sets;
use Koha::Cache;
+use Koha::Authority::Types;
use vars qw($VERSION @ISA @EXPORT);
$results{'linked'}->{ $heading->display_form() }++;
}
else {
- my $authtypedata =
- C4::AuthoritiesMarc::GetAuthType( $heading->auth_type() );
+ my $authority_type = Koha::Authority::Types->find( $heading->auth_type() );
my $marcrecordauth = MARC::Record->new();
if ( C4::Context->preference('marcflavour') eq 'MARC21' ) {
$marcrecordauth->leader(' nz a22 o 4500');
$field->delete_subfield( code => '9' )
if defined $current_link;
my $authfield =
- MARC::Field->new( $authtypedata->{auth_tag_to_report},
+ MARC::Field->new( $authority_type->auth_tag_to_report,
'', '', "a" => "" . $field->subfield('a') );
map {
$authfield->add_subfields( $_->[0] => $_->[1] )
=head2 GetMarcBiblio
- my $record = GetMarcBiblio($biblionumber, [$embeditems]);
+ my $record = GetMarcBiblio($biblionumber, [$embeditems], [$opac]);
-Returns MARC::Record representing bib identified by
-C<$biblionumber>. If no bib exists, returns undef.
-C<$embeditems>. If set to true, items data are included.
-The MARC record contains biblio data, and items data if $embeditems is set to true.
+Returns MARC::Record representing a biblio record, or C<undef> if the
+biblionumber doesn't exist.
+
+=over 4
+
+=item C<$biblionumber>
+
+the biblionumber
+
+=item C<$embeditems>
+
+set to true to include item information.
+
+=item C<$opac>
+
+set to true to make the result suited for OPAC view. This causes things like
+OpacHiddenItems to be applied.
+
+=back
=cut
sub GetMarcBiblio {
my $biblionumber = shift;
my $embeditems = shift || 0;
+ my $opac = shift || 0;
if (not defined $biblionumber) {
carp 'GetMarcBiblio called with undefined biblionumber';
my $record = MARC::Record->new();
if ($marcxml) {
- $record = eval { MARC::Record::new_from_xml( $marcxml, "utf8", C4::Context->preference('marcflavour') ) };
+ $record = eval {
+ MARC::Record::new_from_xml( $marcxml, "utf8",
+ C4::Context->preference('marcflavour') );
+ };
if ($@) { warn " problem with :$biblionumber : $@ \n$marcxml"; }
return unless $record;
- C4::Biblio::_koha_marc_update_bib_ids($record, $frameworkcode, $biblionumber, $biblioitemnumber);
- C4::Biblio::EmbedItemsInMarcBiblio($record, $biblionumber) if ($embeditems);
+ C4::Biblio::_koha_marc_update_bib_ids( $record, $frameworkcode, $biblionumber,
+ $biblioitemnumber );
+ C4::Biblio::EmbedItemsInMarcBiblio( $record, $biblionumber, undef, $opac )
+ if ($embeditems);
return $record;
- } else {
+ }
+ else {
return;
}
}
#---- itemtypes
if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
- return getitemtypeinfo($value)->{description};
+ return getitemtypeinfo($value)->{translated_description};
}
#---- "true" authorized value
=cut
sub TransformHtmlToMarc {
- my $cgi = shift;
+ my ($cgi, $isbiblio) = @_;
my @params = $cgi->param();
# creating a new record
my $record = MARC::Record->new();
- my $i = 0;
my @fields;
+ my ($biblionumbertagfield, $biblionumbertagsubfield) = (-1, -1);
+ ($biblionumbertagfield, $biblionumbertagsubfield) =
+ &GetMarcFromKohaField( "biblio.biblionumber", '' ) if $isbiblio;
#FIXME This code assumes that the CGI params will be in the same order as the fields in the template; this is no absolute guarantee!
- while ( $params[$i] ) { # browse all CGI params
+ for (my $i = 0; $params[$i]; $i++ ) { # browse all CGI params
my $param = $params[$i];
my $newfield = 0;
# if we are on biblionumber, store it in the MARC::Record (it may not be in the edited fields)
if ( $param eq 'biblionumber' ) {
- my ( $biblionumbertagfield, $biblionumbertagsubfield ) = &GetMarcFromKohaField( "biblio.biblionumber", '' );
if ( $biblionumbertagfield < 10 ) {
$newfield = MARC::Field->new( $biblionumbertagfield, $cgi->param($param), );
} else {
if ( $tag < 10 ) { # no code for theses fields
# in MARC editor, 000 contains the leader.
- if ( $tag eq '000' ) {
+ if ( $tag == $biblionumbertagfield ) {
+ # We do nothing and let $i be incremented
+ }
+ elsif ( $tag eq '000' ) {
# Force a fake leader even if not provided to avoid crashing
# during decoding MARC record containing UTF-8 characters
$record->leader(
# browse subfields for this tag (reason for _code_ match)
while(defined $params[$j] && $params[$j] =~ /_code_/) {
last unless defined $params[$j+1];
+ $j += 2 and next
+ if $tag == $biblionumbertagfield and
+ $cgi->param($params[$j]) eq $biblionumbertagsubfield;
#if next param ne subfield, then it was probably empty
#try next param by incrementing j
if($params[$j+1]!~/_subfield_/) {$j++; next; }
}
push @fields, $newfield if ($newfield);
}
- $i++;
}
$record->append_fields(@fields);
=head2 EmbedItemsInMarcBiblio
- EmbedItemsInMarcBiblio($marc, $biblionumber, $itemnumbers);
+ EmbedItemsInMarcBiblio($marc, $biblionumber, $itemnumbers, $opac);
Given a MARC::Record object containing a bib record,
modify it to include the items attached to it as 9XX
per the bib's MARC framework.
-if $itemnumbers is defined, only specified itemnumbers are embedded
+if $itemnumbers is defined, only specified itemnumbers are embedded.
+
+If $opac is true, then opac-relevant suppressions are included.
=cut
sub EmbedItemsInMarcBiblio {
- my ($marc, $biblionumber, $itemnumbers) = @_;
+ my ($marc, $biblionumber, $itemnumbers, $opac) = @_;
if ( !$marc ) {
carp 'EmbedItemsInMarcBiblio: No MARC record passed';
return;
$sth->execute($biblionumber);
my @item_fields;
my ( $itemtag, $itemsubfield ) = GetMarcFromKohaField( "items.itemnumber", $frameworkcode );
- while (my ($itemnumber) = $sth->fetchrow_array) {
+ my @items;
+ my $opachiddenitems = $opac
+ && ( C4::Context->preference('OpacHiddenItems') !~ /^\s*$/ );
+ require C4::Items;
+ while ( my ($itemnumber) = $sth->fetchrow_array ) {
next if @$itemnumbers and not grep { $_ == $itemnumber } @$itemnumbers;
- require C4::Items;
- my $item_marc = C4::Items::GetMarcItem($biblionumber, $itemnumber);
+ my $i = $opachiddenitems ? C4::Items::GetItem($itemnumber) : undef;
+ push @items, { itemnumber => $itemnumber, item => $i };
+ }
+ my @hiddenitems =
+ $opachiddenitems
+ ? C4::Items::GetHiddenItemnumbers( map { $_->{item} } @items )
+ : ();
+ # Convert to a hash for quick searching
+ my %hiddenitems = map { $_ => 1 } @hiddenitems;
+ foreach my $itemnumber ( map { $_->{itemnumber} } @items ) {
+ next if $hiddenitems{$itemnumber};
+ my $item_marc = C4::Items::GetMarcItem( $biblionumber, $itemnumber );
push @item_fields, $item_marc->field($itemtag);
}
$marc->append_fields(@item_fields);
projects / koha.git / blobdiff