Bug 7333 - Fixing up db_dependent/Search.t to use sample data Thanks to Chris N....

[koha.git] / tools / export.pl

diff --git a/tools/export.pl b/tools/export.pl
index fc0c7be..4b3e3f5 100755 (executable)
--- a/tools/export.pl
+++ b/tools/export.pl
@@ -20,7 +20,7 @@
 use strict;
 use warnings;
 use C4::Auth;
-use C4::Output;  # contains gettemplate
+use C4::Output;
 use C4::Biblio;  # GetMarcBiblio GetXmlBiblio
 use CGI;
 use C4::Koha;    # GetItemTypes
@@ -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,