X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-downloadshelf.pl;h=320b1612fd1e9ce8f7518ac97c625c8ffa007ae1;hb=ca0de1009cfaf822911a12ae8980cc4e29ad39a6;hp=ab1fe8daefd6c3f753816009c0fd9a888b786f7a;hpb=dcb86689f73089ceaa789a92c34e78200d05af61;p=koha.git

diff --git a/opac/opac-downloadshelf.pl b/opac/opac-downloadshelf.pl
index ab1fe8daef..320b1612fd 100755
--- a/opac/opac-downloadshelf.pl
+++ b/opac/opac-downloadshelf.pl
@@ -4,23 +4,23 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use strict;
 use warnings;
 
-use CGI;
+use CGI qw ( -utf8 );
 use Encode qw(encode);
 
 use C4::Auth;
@@ -31,69 +31,94 @@ use C4::VirtualShelves;
 use C4::Record;
 use C4::Ris;
 use C4::Csv;
+
+use Koha::Virtualshelves;
+
 use utf8;
 my $query = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
     {
-        template_name   => "opac-downloadshelf.tmpl",
+        template_name   => "opac-downloadshelf.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 1,
-        flagsrequired   => { borrow => 1 },
+        authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
     }
 );
 
-my $shelfid = $query->param('shelfid');
+my $shelfnumber = $query->param('shelfnumber');
 my $format  = $query->param('format');
+my $context = $query->param('context');
 my $dbh     = C4::Context->dbh;
 
-if ($shelfid && $format) {
+my $shelf = Koha::Virtualshelves->find( $shelfnumber );
+if ( $shelf and $shelf->can_be_viewed( $borrowernumber ) ) {
 
-    my @shelf               = GetShelf($shelfid);
-    my ($items, $totitems)  = GetShelfContents($shelfid);
-    my $marcflavour         = C4::Context->preference('marcflavour');
-    my $output;
+    if ($shelfnumber && $format) {
 
-   # 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};
 
-            my $record = GetMarcBiblio($biblionumber);
-            next unless $record;
+        my $contents = $shelf->get_contents;
+        my $marcflavour         = C4::Context->preference('marcflavour');
+        my $output;
+        my $extension;
+        my $type;
 
-            if ($format eq 'iso2709') {
-                $output .= $record->as_usmarc();
+       # CSV
+        if ($format =~ /^\d+$/) {
+            my @biblios;
+            while ( my $content = $contents->next ) {
+                push @biblios, $content->biblionumber->biblionumber;
             }
-            elsif ($format eq 'ris' ) {
-                $output .= marc2ris($record);
-            }
-            elsif ($format eq 'bibtex') {
-                $output .= marc2bibtex($record, $biblionumber);
+            $output = marc2csv(\@biblios, $format);
+        # Other formats
+        } else {
+            while ( my $content = $contents->next ) {
+                my $biblionumber = $content->biblionumber->biblionumber;
+
+                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);
+                }
+                elsif ( $format eq 'isbd' ) {
+                    $output   .= GetISBDView($biblionumber, "opac");
+                    $extension = "txt";
+                    $type      = "text/plain";
+                }
             }
         }
-    }
 
-    # 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 => ($type) ? $type : 'application/octet-stream',
+            -'Content-Transfer-Encoding' => 'binary',
+                             -attachment => ($extension) ? "shelf.$format.$extension" : "shelf.$format"
+        );
+        print $output;
+
+    } else {
 
-    print $query->header(
-	-type => 'application/octet-stream',
-	-'Content-Transfer-Encoding' => 'binary',
-	-attachment=>"shelf.$format");
-    print $output;
+        # if modal context is passed set a variable so that page markup can be different
+        if($context eq "modal"){
+            $template->param(modal => 1);
+        } else {
+            $template->param(fullpage => 1);
+        }
+        $template->param(csv_profiles => GetCsvProfilesLoop('marc'));
+        $template->param( shelf => $shelf );
+        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;
 }