X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=tools%2Fexport.pl;h=d3d8646c4dafc46290f3d7c1344e27f807dfe210;hb=69a1d77dd9cfc41bd0b3d07cb98c4e11a2f3823b;hp=4d23d08bbfb9a33fa8fc11d364d99373c2147120;hpb=aaa0cdb9e82930b2d920ee02b71673e6e236b5f8;p=koha_gimpoz

diff --git a/tools/export.pl b/tools/export.pl
index 4d23d08bbf..d3d8646c4d 100755
--- 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
@@ -47,16 +47,17 @@ my ($template, $loggedinuser, $cookie)
 
 	my $limit_ind_branch=(C4::Context->preference('IndependantBranches') &&
               C4::Context->userenv &&
-              C4::Context->userenv->{flags} % 2 !=1  &&
+              !(C4::Context->userenv->{flags} & 1) &&
               C4::Context->userenv->{branch}?1:0);
 	my $branches = GetBranches($limit_ind_branch);    
     my $branch                = $query->param("branch") || '';
-	if ( C4::Context->preference("IndependantBranches") ) {
+	if ( C4::Context->preference("IndependantBranches") &&
+         !(C4::Context->userenv->{flags} & 1) ) {
     	$branch = C4::Context->userenv->{'branch'};
 	}
 
 if ($op eq "export") {
-    binmode(STDOUT,":utf8");
+    binmode STDOUT, ':encoding(UTF-8)';
 	print $query->header(   -type => 'application/octet-stream', 
                             -charset => 'utf-8',
                             -attachment=>$filename);
@@ -94,28 +95,28 @@ if ($op eq "export") {
         $query .= " AND biblioitems.biblionumber <= ? ";
         push @sql_params, $EndingBiblionumber;    
     }
-    
-    if ( $branch ) {
-        $query .= " AND biblioitems.biblionumber = items.biblionumber AND homebranch = ? ";
+
+    if ($branch) {
+        $query .= " AND homebranch = ? ";
         push @sql_params, $branch;
     }
-    
-    if ( $start_callnumber ) {
-        $query .= " AND biblioitems.biblionumber = items.biblionumber AND itemcallnumber >= ? ";
+
+    if ($start_callnumber) {
+        $query .= " AND itemcallnumber <= ? ";
         push @sql_params, $start_callnumber;
     }
-    
-    if ( $end_callnumber ) {
-        $query .= " AND biblioitems.biblionumber = items.biblionumber AND itemcallnumber <= ? ";
+
+    if ($end_callnumber) {
+        $query .= " AND itemcallnumber >= ? ";
         push @sql_params, $end_callnumber;
     }
-    if ( $start_accession ) {
-        $query .= " AND biblioitems.biblionumber = items.biblionumber AND dateaccessioned >= ? ";
-        push @sql_params,$start_accession->output('iso');
+    if ($start_accession) {
+        $query .= " AND dateaccessioned >= ? ";
+        push @sql_params, $start_accession->output('iso');
     }
-    
-    if ( $end_accession ) {
-        $query .= " AND biblioitems.biblionumber = items.biblionumber AND dateaccessioned <= ? ";
+
+    if ($end_accession) {
+        $query .= " AND dateaccessioned <= ? ";
         push @sql_params, $end_accession->output('iso');
     }
     
@@ -133,13 +134,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 +185,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,