Bug 42363: Use C4::Context::csv_delimiter for delimiter validation
Signed-off-by: Pedro Amorim <pedro.amorim@openfifth.co.uk>
This commit is contained in:
parent
e7f36c5b87
commit
70f6545a53
|
|
@ -65,8 +65,8 @@ my $output = "screen";
|
||||||
my $output_input = $input->param("output");
|
my $output_input = $input->param("output");
|
||||||
my $basename = "Export";
|
my $basename = "Export";
|
||||||
my $basename_input = $input->param("basename");
|
my $basename_input = $input->param("basename");
|
||||||
our $sep = C4::Context->csv_delimiter();
|
|
||||||
my $sep_input = $input->param("sep");
|
our $sep = C4::Context->csv_delimiter( scalar $input->param("sep") );
|
||||||
|
|
||||||
my $item_itype;
|
my $item_itype;
|
||||||
|
|
||||||
|
|
@ -117,13 +117,6 @@ if ($basename_input) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#NOTE: Validate sep parameter
|
|
||||||
my $delimiter_choices = GetDelimiterChoices();
|
|
||||||
my %allowed_seps = map { $_ => 1 } @{ $delimiter_choices->{values} };
|
|
||||||
if ( $sep_input && $allowed_seps{$sep_input} ) {
|
|
||||||
$sep = $sep_input;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( C4::Context->preference('item-level_itypes') ) {
|
if ( C4::Context->preference('item-level_itypes') ) {
|
||||||
$item_itype = "items\.itype";
|
$item_itype = "items\.itype";
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue