X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-downloadcart.pl;h=12d6777c57874dfd8f9adc785cfe3e77bc46779d;hb=25b2cd1c6526b10bc6a726c4ef8296b87a38de02;hp=a670a654cf509f4b436fa073d1852ca8f57a2670;hpb=3bbbc15ccfc179eb95e2b092866d9aea65c81835;p=koha_fer

diff --git a/opac/opac-downloadcart.pl b/opac/opac-downloadcart.pl
index a670a654cf..12d6777c57 100755
--- a/opac/opac-downloadcart.pl
+++ b/opac/opac-downloadcart.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;
@@ -61,18 +60,23 @@ if ($bib_list && $format) {
 
         $output = marc2csv(\@bibs, $format);
 
-    # Other formats
+        # Other formats
     } else {
-	foreach my $biblio (@bibs) {
-
-	    my $record = GetMarcBiblio($biblio);
-
-	    switch ($format) {
-		case "iso2709" { $output .= $record->as_usmarc(); }
-		case "ris"     { $output .= marc2ris($record); }
-		case "bibtex"  { $output .= marc2bibtex($record, $biblio); }
-	    }
-	}
+        foreach my $biblio (@bibs) {
+
+            my $record = GetMarcBiblio($biblio, 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, $biblio);
+            }
+        }
     }
 
     # If it was a CSV export we change the format after the export so the file extension is fine
@@ -85,7 +89,7 @@ if ($bib_list && $format) {
     print $output;
 
 } else { 
-    $template->param(csv_profiles => GetCsvProfilesLoop());
+    $template->param(csv_profiles => GetCsvProfilesLoop('marc'));
     $template->param(bib_list => $bib_list); 
     output_html_with_http_headers $query, $cookie, $template->output;
 }