From 0e9c3d446d999b00558611746f433cf193669adf Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 6 Jan 2016 08:58:13 +0000 Subject: [PATCH] Bug 15451: Do not considered a Resultset as a Result The previous calls were wrong, but there is something bad with the DB structure: export_format.profile should be a unique key. This patch fixes the previous calls and add a FIXME not to forget to fix the DB structure. Signed-off-by: Bernardo Gonzalez Kriegel Previous test where done with all patches applied, including this one, and all worked. No errors Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall --- Koha/Exporter/Record.pm | 7 ++++++- misc/export_records.pl | 5 +++-- tools/export.pl | 5 +++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Koha/Exporter/Record.pm b/Koha/Exporter/Record.pm index b043411d78..ef2a37da14 100644 --- a/Koha/Exporter/Record.pm +++ b/Koha/Exporter/Record.pm @@ -134,7 +134,12 @@ sub export { print MARC::File::XML::footer(); print "\n"; } elsif ( $format eq 'csv' ) { - $csv_profile_id ||= Koha::CsvProfiles->search({ profile => C4::Context->preference('ExportWithCsvProfile') })->export_format_id; + unless ( $csv_profile_id ) { + # FIXME export_format.profile should be a unique key + my $csv_profiles = Koha::CsvProfiles->search({ profile => C4::Context->preference('ExportWithCsvProfile') }); + die "The ExportWithCsvProfile system preference is not defined or does not match a valid csv profile" unless $csv_profiles->count; + $csv_profile_id = $csv_profiles->next->export_format_id; + } print marc2csv( $record_ids, $csv_profile_id, $itemnumbers ); } diff --git a/misc/export_records.pl b/misc/export_records.pl index 3236a4f8e0..59d0dfe747 100755 --- a/misc/export_records.pl +++ b/misc/export_records.pl @@ -196,8 +196,9 @@ if ($deleted_barcodes) { } else { unless ( $csv_profile_id ) { - my $default_csv_profile = Koha::CsvProfiles->search({ profile => C4::Context->preference('ExportWithCsvProfile') }); - $csv_profile_id = $default_csv_profile ? $default_csv_profile->export_format_id : undef; + # FIXME export_format.profile should be a unique key + my $default_csv_profiles = Koha::CsvProfiles->search({ profile => C4::Context->preference('ExportWithCsvProfile') }); + $csv_profile_id = $default_csv_profiles->count ? $default_csv_profiles->next->export_format_id : undef; } Koha::Exporter::Record::export( { record_type => $record_type, diff --git a/tools/export.pl b/tools/export.pl index 850c0cee9c..46cca208c5 100755 --- a/tools/export.pl +++ b/tools/export.pl @@ -194,8 +194,9 @@ if ( $op eq "export" ) { my $csv_profile_id = $query->param('csv_profile_id'); unless ( $csv_profile_id ) { - my $default_csv_profile = Koha::CsvProfiles->search({ profile => C4::Context->preference('ExportWithCsvProfile') }); - $csv_profile_id = $default_csv_profile ? $default_csv_profile->export_format_id : undef; + # FIXME export_format.profile should be a unique key + my $default_csv_profiles = Koha::CsvProfiles->search({ profile => C4::Context->preference('ExportWithCsvProfile') }); + $csv_profile_id = $default_csv_profiles->count ? $default_csv_profiles->next->export_format_id : undef; } Koha::Exporter::Record::export( -- 2.39.5