Italian, Dutch and Polish updates

[koha.git] / tools / export.pl

diff --git a/tools/export.pl b/tools/export.pl
index 6e44c43..d31210c 100755 (executable)
--- a/tools/export.pl
+++ b/tools/export.pl
@@ -18,7 +18,7 @@
 
 
 use strict;
-require Exporter;
+use warnings;
 use C4::Auth;
 use C4::Output;  # contains gettemplate
 use C4::Biblio;  # GetMarcBiblio GetXmlBiblio
@@ -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");
@@ -50,10 +50,11 @@ my ($template, $loggedinuser, $cookie)
               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") ) {
+    my $branch                = $query->param("branch") || '';
+    if ( C4::Context->preference("IndependantBranches") ) {
        $branch = C4::Context->userenv->{'branch'};
-       }
+    }
+
 
 if ($op eq "export") {
     binmode(STDOUT,":utf8");
@@ -73,9 +74,17 @@ if ($op eq "export") {
     my $strip_nonlocal_items   = $query->param("strip_nonlocal_items");
     my $dont_export_fields    = $query->param("dont_export_fields");
     my @sql_params;
-    my $query = " SELECT DISTINCT biblioitems.biblionumber
-                  FROM biblioitems,items
-                  WHERE biblioitems.biblionumber=items.biblionumber ";
+    
+    my $items_filter =
+        $branch || $start_callnumber || $end_callnumber ||  
+        $start_accession || $end_accession || 
+        ($itemtype && C4::Context->preference('item-level_itypes'));
+    my $query = $items_filter ?
+        "SELECT DISTINCT biblioitems.biblionumber
+         FROM biblioitems JOIN items
+         USING (biblionumber) WHERE 1"
+        :
+        "SELECT biblioitems.biblionumber FROM biblioitems WHERE biblionumber >0 ";
                   
     if ( $StartingBiblionumber ) {
         $query .= " AND biblioitems.biblionumber >= ? ";
@@ -112,16 +121,23 @@ if ($op eq "export") {
     }
     
     if ( $itemtype ) {
-        $query .= " AND biblioitems.itemtype = ?";
+        $query .= (C4::Context->preference('item-level_itypes')) ? " AND items.itype = ? " : " AND biblioitems.itemtype = ?";
         push @sql_params, $itemtype;
     }
+    warn "$query, @sql_params";
     my $sth = $dbh->prepare($query);
     $sth->execute(@sql_params);
     
     while (my ($biblionumber) = $sth->fetchrow) {
-        my $record = GetMarcBiblio($biblionumber);
-        my ( $homebranchfield, $homebranchsubfield ) =  GetMarcFromKohaField( 'items.homebranch', '' );
+        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) {
+            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;
@@ -135,6 +151,8 @@ if ($op eq "export") {
                 /^(\d*)(\w)?$/;
                 my $field = $1;
                 my $subfield = $2;
+                # skip if this record doesn't have this field
+                next if not defined $record->field($field);
                 if( $subfield ) {
                     $record->field($field)->delete_subfields($subfield);
                 }