gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 15451: Koha::CsvProfiles - Remove GetCsvProfileId 

This subroutine returned the export_format_id for a given profile name.
This can be done easily with the Koha::CsvProfiles->search method.

Test plan:
Export records using the misc/export_records.pl script and the
export tool.
If you are exporting using the MARC format, the profile filled in the pref
ExportWithCsvProfile will be used (or the one passed in parameter of
misc/export_records.pl).
If you are exporting using the CSV format, you can choose a profile in
the dropdown list.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Exported using tool & cmd, marc & csv. Pref is used.
No errors

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Jonathan Druart 2015-12-30 18:23:24 +00:00 committed by Kyle M Hall
parent 04c7a8a845
commit bea95dace6
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
C4/Csv.pm
View File

@ -32,7 +32,6 @@ use vars qw(@ISA @EXPORT);
@EXPORT = qw(
&GetCsvProfile
&GetCsvProfileId
&GetMarcFieldsForCsv
);
@ -49,18 +48,6 @@ sub GetCsvProfile {
return ($sth->fetchrow_hashref);
}
# Returns id of csv profile about a given csv profile name
sub GetCsvProfileId {
my ($name) = @_;
my $dbh = C4::Context->dbh;
my $query = "SELECT export_format_id FROM export_format WHERE profile=?";
$sth = $dbh->prepare($query);
$sth->execute($name);
return ( $sth->fetchrow );
}
# Returns fields to extract for the given csv profile
sub GetMarcFieldsForCsv {

3
Koha/Exporter/Record.pm
View File

@ -7,6 +7,7 @@ use MARC::File::USMARC;
use C4::AuthoritiesMarc;
use C4::Biblio;
use C4::Record;
use Koha::CsvProfiles;
sub _get_record_for_export {
my ($params) = @_;
@ -133,7 +134,7 @@ sub export {
print MARC::File::XML::footer();
print "\n";
} elsif ( $format eq 'csv' ) {
$csv_profile_id ||= C4::Csv::GetCsvProfileId( C4::Context->preference('ExportWithCsvProfile') );
$csv_profile_id ||= Koha::CsvProfiles->search({ profile => C4::Context->preference('ExportWithCsvProfile') })->export_format_id;
print marc2csv( $record_ids, $csv_profile_id, $itemnumbers );
}

7
misc/export_records.pl
View File

@ -29,6 +29,7 @@ use C4::Record;
use Koha::Biblioitems;
use Koha::Database;
use Koha::CsvProfiles;
use Koha::Exporter::Record;
use Koha::DateUtils qw( dt_from_string output_pref );
@ -195,11 +196,15 @@ 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;
}
Koha::Exporter::Record::export(
{ record_type => $record_type,
record_ids => \@record_ids,
format => $output_format,
csv_profile_id => ( $csv_profile_id || GetCsvProfileId( C4::Context->preference('ExportWithCsvProfile') ) || undef ),
csv_profile_id => $csv_profile_id,
export_items => (not $dont_export_items),
clean => $clean || 0,
}

10
tools/export.pl
View File

@ -193,6 +193,12 @@ if ( $op eq "export" ) {
-attachment => $filename,
);
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;
}
Koha::Exporter::Record::export(
{ record_type => $record_type,
record_ids => \@record_ids,
@ -200,7 +206,7 @@ if ( $op eq "export" ) {
filename => $filename,
itemnumbers => \@itemnumbers,
dont_export_fields => $export_remove_fields,
csv_profile_id => ( $query->param('csv_profile_id') || GetCsvProfileId( C4::Context->preference('ExportWithCsvProfile') ) || undef ),
csv_profile_id => $csv_profile_id,
export_items => (not $dont_export_items),
}
);
@ -310,7 +316,7 @@ else {
itemtypeloop => \@itemtypesloop,
authority_types => $authority_types,
export_remove_fields => C4::Context->preference("ExportRemoveFields"),
csv_profiles => [ Koha::CsvProfiles->search({ type => 'marc' }),
csv_profiles => [ Koha::CsvProfiles->search({ type => 'marc' }) ],
);
output_html_with_http_headers $query, $cookie, $template->output;