X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-downloadshelf.pl;h=662eb25bd5b4e5441275129cb474b1215dfa6009;hb=37f3807442ce1136a57e6fec76648994ada7a5cb;hp=a03a79bda5c5a7e13e32c0f361bc3a6755113d11;hpb=5429c5f497fe426b6905b5ef9693f4e42afff5d7;p=koha.git

diff --git a/opac/opac-downloadshelf.pl b/opac/opac-downloadshelf.pl
index a03a79bda5..662eb25bd5 100755
--- a/opac/opac-downloadshelf.pl
+++ b/opac/opac-downloadshelf.pl
@@ -13,16 +13,15 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
 use warnings;
 
 use CGI;
 use Encode qw(encode);
-use Switch;
 
 use C4::Auth;
 use C4::Biblio;
@@ -33,7 +32,6 @@ use C4::Record;
 use C4::Ris;
 use C4::Csv;
 use utf8;
-use open qw( :std :utf8);
 my $query = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
@@ -50,41 +48,58 @@ my $shelfid = $query->param('shelfid');
 my $format  = $query->param('format');
 my $dbh     = C4::Context->dbh;
 
-if ($shelfid && $format) {
+if ( ShelfPossibleAction( (defined($borrowernumber) ? $borrowernumber : -1), $shelfid, 'view' ) ) {
 
-    my @shelf               = GetShelf($shelfid);
-    my ($items, $totitems)  = GetShelfContents($shelfid);
-    my $marcflavour         = C4::Context->preference('marcflavour');
-    my $output;
+    if ($shelfid && $format) {
 
-    # retrieve biblios from shelf
-    my $firstpass = 1;
-    foreach my $biblio (@$items) {
-	my $biblionumber = $biblio->{biblionumber};
+        my ($items, $totitems)  = GetShelfContents($shelfid);
+        my $marcflavour         = C4::Context->preference('marcflavour');
+        my $output;
 
-	my $record = GetMarcBiblio($biblionumber);
+       # CSV
+        if ($format =~ /^\d+$/) {
+            my @biblios;
+            foreach (@$items) {
+                push @biblios, $_->{biblionumber};
+            }
+            $output = marc2csv(\@biblios, $format);
+                
+        # Other formats
+        } else {
+            foreach my $biblio (@$items) {
+                my $biblionumber = $biblio->{biblionumber};
 
-	switch ($format) {
-	    case "iso2709" { $output .= $record->as_usmarc(); }
-	    case "ris"     { $output .= marc2ris($record); }
-	    case "bibtex"  { $output .= marc2bibtex($record, $biblionumber); }
-	    # We're in the case of a csv profile (firstpass is used for headers printing) :
-	    case /^\d+$/   { $output .= marc2csv($biblionumber, $format, $firstpass); }
-	}
-	$firstpass = 0;
-    }
+                my $record = GetMarcBiblio($biblionumber, 1);
+                next unless $record;
+
+                if ($format eq 'iso2709') {
+                    $output .= $record->as_usmarc();
+                }
+                elsif ($format eq 'ris' ) {
+                    $output .= marc2ris($record);
+                }
+                elsif ($format eq 'bibtex') {
+                    $output .= marc2bibtex($record, $biblionumber);
+                }
+            }
+        }
 
-    # If it was a CSV export we change the format after the export so the file extension is fine
-    $format = "csv" if ($format =~ m/^\d+$/);
+        # If it was a CSV export we change the format after the export so the file extension is fine
+        $format = "csv" if ($format =~ m/^\d+$/);
 
-    print $query->header(
-	-type => 'application/octet-stream',
-	-'Content-Transfer-Encoding' => 'binary',
-	-attachment=>"shelf.$format");
-    print $output;
+        print $query->header(
+    	-type => 'application/octet-stream',
+    	-'Content-Transfer-Encoding' => 'binary',
+    	-attachment=>"shelf.$format");
+        print $output;
+
+    } else {
+        $template->param(csv_profiles => GetCsvProfilesLoop());
+        $template->param(shelfid => $shelfid); 
+        output_html_with_http_headers $query, $cookie, $template->output;
+    }
 
 } else {
-    $template->param(csv_profiles => GetCsvProfilesLoop());
-    $template->param(shelfid => $shelfid); 
+    $template->param(invalidlist => 1); 
     output_html_with_http_headers $query, $cookie, $template->output;
 }