Bug 6355: Correct GetLateOrders so it ignores cancelled orders

[koha_gimpoz] / tools / export.pl

diff --git a/tools/export.pl b/tools/export.pl
index 5f0a00a..d858f44 100755 (executable)
--- a/tools/export.pl
+++ b/tools/export.pl
@@ -27,7 +27,7 @@ use C4::Koha;    # GetItemTypes
 use C4::Branch;  # GetBranches
 
 my $query = new CGI;
-my $op=$query->param("op");
+my $op=$query->param("op") || '';
 my $filename=$query->param("filename");
 my $dbh=C4::Context->dbh;
 my $marcflavour = C4::Context->preference("marcflavour");
@@ -47,10 +47,10 @@ my ($template, $loggedinuser, $cookie)
 
        my $limit_ind_branch=(C4::Context->preference('IndependantBranches') &&
               C4::Context->userenv &&
-              C4::Context->userenv->{flags} !=1  &&
+              C4::Context->userenv->{flags} % 2 !=1  &&
               C4::Context->userenv->{branch}?1:0);
        my $branches = GetBranches($limit_ind_branch);    
-    my $branch                = $query->param("branch");
+    my $branch                = $query->param("branch") || '';
        if ( C4::Context->preference("IndependantBranches") ) {
        $branch = C4::Context->userenv->{'branch'};
        }
@@ -80,8 +80,8 @@ if ($op eq "export") {
         ($itemtype && C4::Context->preference('item-level_itypes'));
     my $query = $items_filter ?
         "SELECT DISTINCT biblioitems.biblionumber
-         FROM biblioitems,items
-         WHERE biblioitems.biblionumber=items.biblionumber "
+         FROM biblioitems JOIN items
+         USING (biblionumber) WHERE 1"
         :
         "SELECT biblioitems.biblionumber FROM biblioitems WHERE biblionumber >0 ";
                   
@@ -94,28 +94,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');
     }
     
@@ -127,15 +127,20 @@ if ($op eq "export") {
     $sth->execute(@sql_params);
     
     while (my ($biblionumber) = $sth->fetchrow) {
-        my $record = GetMarcBiblio($biblionumber);
+        my $record = eval{ GetMarcBiblio($biblionumber); };
+        # FIXME: decide how to handle records GetMarcBiblio can't parse or retrieve
+        if ($@) {
+            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) ;
             }
         }