Bug 12478: paging is fixed now too

[srvgit] / opac / opac-export.pl

diff --git a/opac/opac-export.pl b/opac/opac-export.pl
index 8d76a1c..c4ab83a 100755 (executable)
--- a/opac/opac-export.pl
+++ b/opac/opac-export.pl
@@ -4,18 +4,18 @@
 #
 # 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;
@@ -24,7 +24,7 @@ use C4::Record;
 use C4::Auth;
 use C4::Output;
 use C4::Biblio;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Ris;
 
@@ -60,8 +60,8 @@ elsif ($format =~ /bibtex/) {
     $marc = marc2bibtex(C4::Biblio::GetMarcBiblio($biblionumber),$biblionumber);
     $format = 'bibtex';
 }
-elsif ($format =~ /dc/) {
-    ($error,$marc) = marc2dcxml($marc,1);
+elsif ($format =~ /dc$/) {
+    $marc = marc2dcxml(undef, undef, $biblionumber, $format);
     $format = "dublin-core.xml";
 }
 elsif ($format =~ /marc8/) {
@@ -79,6 +79,10 @@ elsif ($format =~ /marcstd/) {
     ($error,$marc) = marc2marc($marc, 'marcstd', C4::Context->preference('marcflavour'));
     $format = 'marcstd';
 }
+elsif ( $format =~ /isbd/ ) {
+    $marc   = GetISBDView($biblionumber, "opac");
+    $format = 'isbd';
+}
 else {
     $error= "Format $format is not supported.";
 }
@@ -96,10 +100,18 @@ else {
             -type => 'application/marc',
             -charset=>'ISO-2022',
             -attachment=>"bib-$biblionumber.$format");
+    }
+    elsif ( $format eq 'isbd' ) {
+        print $query->header(
+            -type       => 'text/plain',
+            -charset    => 'utf-8',
+            -attachment =>  "bib-$biblionumber.txt"
+        );
     }else{
         print $query->header(
             -type => 'application/octet-stream',
             -charset=>'utf-8',
             -attachment=>"bib-$biblionumber.$format");
     }
+    print $marc;
 }