From ae62ef347e16ead9d1560e3605511a2ccec57df9 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 30 Dec 2015 18:28:55 +0000 Subject: [PATCH] Bug 15451: Koha::CsvProfiles - Remove the residue Content-Type: text/plain; charset=utf-8 This patch erase all traces of C4::Csv since it's not used anymore. All occurrences have been replaced by previous patches to use Koha::CsvProfiles. Note that GetMarcFieldsForCsv was not used prior this patch set. Test plan: git grep 'C4::Csv' should not return any result. Signed-off-by: Bernardo Gonzalez Kriegel No more traces of the file. This produces a koha-qa fail, due to the missing file. No other errors Signed-off-by: Marcel de Rooy --- C4/Csv.pm | 54 ------------------------------- C4/Record.pm | 1 - basket/downloadcart.pl | 1 - misc/export_records.pl | 1 - opac/opac-downloadcart.pl | 1 - opac/opac-downloadshelf.pl | 1 - serials/claims.pl | 2 +- serials/lateissues-export.pl | 1 - t/db_dependent/Csv.t | 67 --------------------------------------- tools/export.pl | 1 - virtualshelves/downloadshelf.pl | 1 - virtualshelves/shelves.pl | 1 - 12 files changed, 1 insertion(+), 131 deletions(-) delete mode 100644 C4/Csv.pm delete mode 100755 t/db_dependent/Csv.t diff --git a/C4/Csv.pm b/C4/Csv.pm deleted file mode 100644 index 2cd6430..0000000 --- a/C4/Csv.pm +++ /dev/null @@ -1,54 +0,0 @@ -package C4::Csv; - -# Copyright 2008 BibLibre -# -# 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 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. -# -# You should have received a copy of the GNU General Public License -# along with Koha; if not, see . -# -# - -#use strict; -#use warnings; FIXME - Bug 2505 - -use C4::Context; -use vars qw(@ISA @EXPORT); - - -@ISA = qw(Exporter); - -# only export API methods - -@EXPORT = qw( - &GetMarcFieldsForCsv -); - - -# Returns fields to extract for the given csv profile -sub GetMarcFieldsForCsv { - - my ($id) = @_; - my $dbh = C4::Context->dbh; - my $query = "SELECT content FROM export_format WHERE export_format_id=?"; - - $sth = $dbh->prepare($query); - $sth->execute($id); - - return ($sth->fetchrow_hashref)->{content}; - - -} - - -1; diff --git a/C4/Record.pm b/C4/Record.pm index dbbde57..440b48e 100644 --- a/C4/Record.pm +++ b/C4/Record.pm @@ -29,7 +29,6 @@ use MARC::File::XML; # marc2marcxml, marcxml2marc, changeEncoding use Biblio::EndnoteStyle; use Unicode::Normalize; # _entity_encode use C4::Biblio; #marc2bibtex -use C4::Csv; #marc2csv use C4::Koha; #marc2csv use C4::XSLT (); use YAML; #marcrecords2csv diff --git a/basket/downloadcart.pl b/basket/downloadcart.pl index 0690da5..f5cec95 100755 --- a/basket/downloadcart.pl +++ b/basket/downloadcart.pl @@ -28,7 +28,6 @@ use C4::Items; use C4::Output; use C4::Record; use C4::Ris; -use C4::Csv; use Koha::CsvProfiles; diff --git a/misc/export_records.pl b/misc/export_records.pl index 2d24569..3236a4f 100755 --- a/misc/export_records.pl +++ b/misc/export_records.pl @@ -24,7 +24,6 @@ use Pod::Usage; use C4::Auth; use C4::Context; -use C4::Csv; use C4::Record; use Koha::Biblioitems; diff --git a/opac/opac-downloadcart.pl b/opac/opac-downloadcart.pl index ba4d4b2..6c374cd 100755 --- a/opac/opac-downloadcart.pl +++ b/opac/opac-downloadcart.pl @@ -28,7 +28,6 @@ use C4::Items; use C4::Output; use C4::Record; use C4::Ris; -use C4::Csv; use Koha::CsvProfiles; diff --git a/opac/opac-downloadshelf.pl b/opac/opac-downloadshelf.pl index 8413e75..1123f91 100755 --- a/opac/opac-downloadshelf.pl +++ b/opac/opac-downloadshelf.pl @@ -28,7 +28,6 @@ use C4::Items; use C4::Output; use C4::Record; use C4::Ris; -use C4::Csv; use Koha::CsvProfiles; use Koha::Virtualshelves; diff --git a/serials/claims.pl b/serials/claims.pl index e3a3385..97f52ae 100755 --- a/serials/claims.pl +++ b/serials/claims.pl @@ -27,9 +27,9 @@ use C4::Context; use C4::Letters; use C4::Branch; # GetBranches GetBranchesLoop use C4::Koha qw( GetAuthorisedValues ); + use Koha::AdditionalField; use Koha::CsvProfiles; -use C4::Csv; my $input = CGI->new; diff --git a/serials/lateissues-export.pl b/serials/lateissues-export.pl index e38f6bc..cc23ddc 100755 --- a/serials/lateissues-export.pl +++ b/serials/lateissues-export.pl @@ -22,7 +22,6 @@ use C4::Serials; use C4::Acquisition; use C4::Output; use C4::Context; -use C4::Csv; use Koha::CsvProfiles; diff --git a/t/db_dependent/Csv.t b/t/db_dependent/Csv.t deleted file mode 100755 index be42e8a..0000000 --- a/t/db_dependent/Csv.t +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; - -use Test::More tests => 10; -use Test::Deep; - -use C4::Context; -BEGIN { - use_ok('C4::Csv'); -} - -my $dbh = C4::Context->dbh; -$dbh->{AutoCommit} = 0; -$dbh->{RaiseError} = 1; - -$dbh->do('DELETE FROM export_format'); - -my $sth = $dbh->prepare(q{ - INSERT INTO export_format (profile, description, content, type) - VALUES (?, ?, ?, ?) -}); -$sth->execute('MARC', 'MARC profile', '245$a', 'marc'); -$sth->execute('SQL', 'SQL profile', 'borrowers.surname', 'sql'); - -my $all_profiles = C4::Csv::GetCsvProfiles(); -is(@$all_profiles, 2, 'test getting all CSV profiles'); - -my $sql_profiles = C4::Csv::GetCsvProfiles('sql'); -is(@$sql_profiles, 1, 'test getting SQL CSV profiles'); -is($sql_profiles->[0]->{profile}, 'SQL', '... and got the right one'); -my $marc_profiles = C4::Csv::GetCsvProfiles('marc'); -is(@$marc_profiles, 1, 'test getting MARC CSV profiles'); -is($marc_profiles->[0]->{profile}, 'MARC', '... and got the right one'); - -my $id = C4::Csv::GetCsvProfileId('MARC'); -my $profile = C4::Csv::GetCsvProfile($id); -is($profile->{profile}, 'MARC', 'retrieved profile by ID'); - -is(C4::Csv::GetCsvProfile(), undef, 'test getting CSV profile but not supplying ID'); - -cmp_deeply( - C4::Csv::GetCsvProfilesLoop(), - [ - { - export_format_id => ignore(), - profile => 'MARC', - }, - { - export_format_id => ignore(), - profile => 'SQL', - }, - ], - 'test getting profile loop' -); - -cmp_deeply( - C4::Csv::GetCsvProfilesLoop('marc'), - [ - { - export_format_id => ignore(), - profile => 'MARC', - }, - ], - 'test getting profile loop for one type' -); diff --git a/tools/export.pl b/tools/export.pl index 35b4f2c..850c0ce 100755 --- a/tools/export.pl +++ b/tools/export.pl @@ -22,7 +22,6 @@ use MARC::File::XML; use List::MoreUtils qw(uniq); use C4::Auth; use C4::Branch; # GetBranches -use C4::Csv; use C4::Koha; # GetItemTypes use C4::Output; diff --git a/virtualshelves/downloadshelf.pl b/virtualshelves/downloadshelf.pl index 3db362a..4d1bde2 100755 --- a/virtualshelves/downloadshelf.pl +++ b/virtualshelves/downloadshelf.pl @@ -28,7 +28,6 @@ use C4::Items; use C4::Output; use C4::Record; use C4::Ris; -use C4::Csv; use Koha::CsvProfiles; use Koha::Virtualshelves; diff --git a/virtualshelves/shelves.pl b/virtualshelves/shelves.pl index 6a62750..100af44 100755 --- a/virtualshelves/shelves.pl +++ b/virtualshelves/shelves.pl @@ -21,7 +21,6 @@ use Modern::Perl; use CGI qw ( -utf8 ); use C4::Auth; use C4::Biblio; -use C4::Csv; use C4::Koha; use C4::Items; use C4::Members; -- 1.7.10.4