From 27a3ad799ce3c125c4e727fcf39012c81ba4bb1c Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 31 Dec 2015 10:32:35 +0000 Subject: [PATCH] Bug 15451: Koha::CsvProfiles - Remove GetCsvProfilesLoop This subroutine returned the csv profiles for a given type. This could be done easily with the new Koha::CsvProfiles->search method. Test plan: To do at the OPAC and staff interface! 1/ Export a list using a CSV profile 2/ Export your CART using a CSV profile Note that only MARC profiles should be available. Signed-off-by: Bernardo Gonzalez Kriegel Tested on staff/opac & cart/list Small problem on filename extension fixed in followup. No errors Signed-off-by: Marcel de Rooy Signed-off-by: Mason James --- C4/Csv.pm | 19 ------------------- basket/basket.pl | 8 ++++---- basket/downloadcart.pl | 8 +++++--- opac/opac-downloadcart.pl | 8 +++++--- opac/opac-downloadshelf.pl | 6 +++--- virtualshelves/downloadshelf.pl | 6 +++--- virtualshelves/shelves.pl | 4 +++- 7 files changed, 23 insertions(+), 36 deletions(-) diff --git a/C4/Csv.pm b/C4/Csv.pm index ce4693a86e..275fb49395 100644 --- a/C4/Csv.pm +++ b/C4/Csv.pm @@ -34,7 +34,6 @@ use vars qw(@ISA @EXPORT); &GetCsvProfiles &GetCsvProfile &GetCsvProfileId - &GetCsvProfilesLoop &GetMarcFieldsForCsv ); @@ -94,23 +93,5 @@ sub GetMarcFieldsForCsv { } -# Returns informations aboout csv profiles suitable for html templates -sub GetCsvProfilesLoop { - my ( $type ) = @_; - # List of existing profiles - my $dbh = C4::Context->dbh; - my $sth; - my $query = "SELECT export_format_id, profile FROM export_format"; - if ( $type ) { - $query .= " WHERE type = ?"; - } - - $sth = $dbh->prepare($query); - $sth->execute( $type ? $type : () ); - return $sth->fetchall_arrayref({}); - -} - - 1; diff --git a/basket/basket.pl b/basket/basket.pl index 1dfbdb805d..ec5e485892 100755 --- a/basket/basket.pl +++ b/basket/basket.pl @@ -16,15 +16,15 @@ # along with Koha; if not, see . -use strict; -use warnings; +use Modern::Perl; use CGI qw ( -utf8 ); use C4::Koha; use C4::Biblio; use C4::Items; use C4::Auth; use C4::Output; -use C4::Csv; + +use Koha::CsvProfiles; my $query = new CGI; @@ -121,7 +121,7 @@ my $resultsarray = \@results; $template->param( BIBLIO_RESULTS => $resultsarray, - csv_profiles => GetCsvProfilesLoop('marc'), + csv_profiles => [ Koha::CsvProfiles->search({ type => 'marc' }) ], bib_list => $bib_list, ); diff --git a/basket/downloadcart.pl b/basket/downloadcart.pl index 17e56175ac..0690da5c69 100755 --- a/basket/downloadcart.pl +++ b/basket/downloadcart.pl @@ -17,8 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Koha; if not, see . -use strict; -use warnings; +use Modern::Perl; use CGI qw ( -utf8 ); use Encode qw(encode); @@ -30,6 +29,9 @@ use C4::Output; use C4::Record; use C4::Ris; use C4::Csv; + +use Koha::CsvProfiles; + use utf8; my $query = new CGI; @@ -89,7 +91,7 @@ if ($bib_list && $format) { print $output; } else { - $template->param(csv_profiles => GetCsvProfilesLoop('marc')); + $template->param(csv_profiles => [ Koha::CsvProfiles->search({ type => 'marc' }) ]); $template->param(bib_list => $bib_list); output_html_with_http_headers $query, $cookie, $template->output; } diff --git a/opac/opac-downloadcart.pl b/opac/opac-downloadcart.pl index c5574e34a0..ba4d4b2a80 100755 --- a/opac/opac-downloadcart.pl +++ b/opac/opac-downloadcart.pl @@ -17,8 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Koha; if not, see . -use strict; -use warnings; +use Modern::Perl; use CGI qw ( -utf8 ); use Encode qw(encode); @@ -30,6 +29,9 @@ use C4::Output; use C4::Record; use C4::Ris; use C4::Csv; + +use Koha::CsvProfiles; + use utf8; my $query = new CGI; @@ -95,7 +97,7 @@ if ($bib_list && $format) { print $output; } else { - $template->param(csv_profiles => GetCsvProfilesLoop('marc')); + $template->param(csv_profiles => [ Koha::CsvProfiles->search({ type => 'marc' }) ]); $template->param(bib_list => $bib_list); output_html_with_http_headers $query, $cookie, $template->output; } diff --git a/opac/opac-downloadshelf.pl b/opac/opac-downloadshelf.pl index 610208213e..8413e75434 100755 --- a/opac/opac-downloadshelf.pl +++ b/opac/opac-downloadshelf.pl @@ -17,8 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Koha; if not, see . -use strict; -use warnings; +use Modern::Perl; use CGI qw ( -utf8 ); use Encode qw(encode); @@ -31,6 +30,7 @@ use C4::Record; use C4::Ris; use C4::Csv; +use Koha::CsvProfiles; use Koha::Virtualshelves; use utf8; @@ -118,7 +118,7 @@ if ( $shelf and $shelf->can_be_viewed( $borrowernumber ) ) { } else { $template->param(fullpage => 1); } - $template->param(csv_profiles => GetCsvProfilesLoop('marc')); + $template->param(csv_profiles => [ Koha::CsvProfiles->search({ type => 'marc' }) ]); $template->param( shelf => $shelf ); output_html_with_http_headers $query, $cookie, $template->output; } diff --git a/virtualshelves/downloadshelf.pl b/virtualshelves/downloadshelf.pl index 5a00694645..3db362aa5b 100755 --- a/virtualshelves/downloadshelf.pl +++ b/virtualshelves/downloadshelf.pl @@ -17,8 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Koha; if not, see . -use strict; -use warnings; +use Modern::Perl; use CGI qw ( -utf8 ); use Encode qw(encode); @@ -31,6 +30,7 @@ use C4::Record; use C4::Ris; use C4::Csv; +use Koha::CsvProfiles; use Koha::Virtualshelves; use utf8; @@ -101,7 +101,7 @@ if ($shelfid && $format) { $format = "csv" if ($format =~ m/^\d+$/); } else { - $template->param(csv_profiles => GetCsvProfilesLoop('marc')); + $template->param(csv_profiles => [ Koha::CsvProfiles->search({ type => 'marc' }) ]); $template->param(shelfid => $shelfid); } $template->param( messages => \@messages ); diff --git a/virtualshelves/shelves.pl b/virtualshelves/shelves.pl index aecb563a47..146f68d262 100755 --- a/virtualshelves/shelves.pl +++ b/virtualshelves/shelves.pl @@ -27,6 +27,8 @@ use C4::Items; use C4::Members; use C4::Output; use C4::XSLT; + +use Koha::CsvProfiles; use Koha::Virtualshelves; my $query = new CGI; @@ -314,7 +316,7 @@ $template->param( messages => \@messages, category => $category, print => scalar $query->param('print') || 0, - csv_profiles => GetCsvProfilesLoop('marc'), + csv_profiles => [ Koha::CsvProfiles->search({ type => 'marc' }) ], ); output_html_with_http_headers $query, $cookie, $template->output; -- 2.39.5