X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=tools%2Fexport.pl;h=4a09868e59acde8ef44b95ad58f8990adfc2ae80;hb=8f21144fb154b68747d004eecca53fe84a020f22;hp=fc0c7be95b5bb1b411e554ee131e59b5f5a61806;hpb=228587f19b25406f8a2ee76827524ef3fc921a77;p=koha_gimpoz diff --git a/tools/export.pl b/tools/export.pl index fc0c7be95b..4a09868e59 100755 --- a/tools/export.pl +++ b/tools/export.pl @@ -133,13 +133,14 @@ if ($op eq "export") { next; } next if not defined $record; - if ( $dont_export_items || $strip_nonlocal_items || $limit_ind_branch) { + C4::Biblio::EmbedItemsInMarcBiblio($record, $biblionumber) unless $dont_export_items; + if ($strip_nonlocal_items || $limit_ind_branch) { my ( $homebranchfield, $homebranchsubfield ) = GetMarcFromKohaField( 'items.homebranch', '' ); for my $itemfield ($record->field($homebranchfield)){ # if stripping nonlocal items, use loggedinuser's branch if they didn't select one $branch = C4::Context->userenv->{'branch'} unless $branch; - $record->delete_field($itemfield) if($dont_export_items || ($itemfield->subfield($homebranchsubfield) ne $branch) ) ; + $record->delete_field($itemfield) if($itemfield->subfield($homebranchsubfield) ne $branch) ; } } @@ -183,16 +184,17 @@ else { push @itemtypesloop, \%row; } my @branchloop; - for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) { - my $selected = 1 if $thisbranch eq $branch; - my %row = ( - value => $thisbranch, - selected => $selected, + for my $thisbranch ( + sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } + keys %{$branches} + ) { + push @branchloop, + { value => $thisbranch, + selected => $thisbranch eq $branch, branchname => $branches->{$thisbranch}->{'branchname'}, - ); - push @branchloop, \%row; + }; } - + $template->param( branchloop => \@branchloop, itemtypeloop => \@itemtypesloop,