X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=labels%2Flabel-edit-layout.pl;h=f1fc6878a18357d8df8a9f739d89873c13841693;hb=992ccebbdb4635854ebada9c02e17846b7e82b90;hp=6a702122b254954494b99dc0146dfc625c20048a;hpb=0fff79d6b464eb9e053ed568234e43695fbec66b;p=srvgit diff --git a/labels/label-edit-layout.pl b/labels/label-edit-layout.pl index 6a702122b2..f1fc6878a1 100755 --- a/labels/label-edit-layout.pl +++ b/labels/label-edit-layout.pl @@ -5,47 +5,48 @@ # # 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 2 of the License, or (at your option) any later -# version. +# 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. +# 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, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# 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; +use CGI qw ( -utf8 ); use POSIX; -use Text::CSV_XS; -use C4::Auth qw(get_template_and_user); -use C4::Output qw(output_html_with_http_headers); -use C4::Creators 1.000000; -use C4::Labels 1.000000; +use C4::Auth qw( get_template_and_user ); +use C4::Output qw( output_html_with_http_headers ); +use C4::Creators qw( + get_barcode_types + get_font_types + get_label_types + get_text_justification_types +); +use C4::Labels; -my $cgi = new CGI; +my $cgi = CGI->new; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { - template_name => "labels/label-edit-layout.tmpl", + template_name => "labels/label-edit-layout.tt", query => $cgi, type => "intranet", - authnotrequired => 0, flagsrequired => { catalogue => 1 }, - debug => 1, } ); -my $op = $cgi->param('op') || $ARGV[0] || ''; -my $layout_id = $cgi->param('layout_id') || $cgi->param('element_id') || $ARGV[1] || ''; +my $op = $cgi->param('op') || ''; +my $layout_id = $cgi->param('layout_id') || $cgi->param('element_id') || ''; my $layout_choice = $cgi->param('layout_choice') || ''; -my $layout = ''; +our $layout = ''; sub _set_selected { my ($type_list, $object, $data_type) = @_; @@ -66,40 +67,23 @@ sub _set_selected { sub _select_format_string { # generate field table based on format_string my $format_string = shift; - $format_string =~ s/(?<=,) (?![A-Z][a-z][0-9])//g; # remove spaces between fields - my $table = []; - my $fields = []; - my ($row_index, $col_index, $field_index) = (0,0,0); - my $cols = 5; # number of columns to wrap on - my $csv = Text::CSV_XS->new({ allow_whitespace => 1 }); - my $status = $csv->parse($format_string); - my @text_fields = $csv->fields(); - warn sprintf('Error parsing format_string. Parser returned: %s', $csv->error_input()) if $csv->error_input(); - my $field_count = $#text_fields + 1; - POPULATE_TABLE: - foreach my $text_field (@text_fields) { - $$fields[$col_index] = {field_empty => 0, field_name => ($text_field . "_tbl"), field_label => $text_field, order => [{num => '', selected => 0}]}; - for (my $order_i = 1; $order_i <= $field_count; $order_i++) { - $$fields[$col_index]{'order'}[$order_i] = {num => $order_i, selected => ($field_index == $order_i-1 ? 1 : 0)}; - } - $col_index++; + + my @text_fields = grep /\w/, split /\s*,\s/, $format_string; + my %tf = map {$_ => 1} @text_fields; + my @missing_fields = grep { !$tf{$_} } @{ C4::Labels::Layout->PRESET_FIELDS }; + + my $field_count = scalar(@text_fields) + scalar( @missing_fields); + + my @fields; + my $field_index = 1; + foreach my $f (@text_fields) { + push @fields, {field_name => ($f . "_tbl"), field_label => $f, order => $field_index}; $field_index++; - if ((($col_index > 0) && !($col_index % $cols)) || ($field_index == $field_count)) { # wrap to new row - if (($field_index == $field_count) && ($row_index > 0)) { # in this case fill out row with empty fields - while ($col_index < $cols) { - $$fields[$col_index] = {field_empty => 1, field_name => '', field_label => '', order => [{num => '', selected => 0}]}; - $col_index++; - } - $$table[$row_index] = {text_fields => $fields}; - last POPULATE_TABLE; - } - $$table[$row_index] = {text_fields => $fields}; - $row_index++; - $fields = []; - $col_index = 0; - } } - return $table; + foreach my $f (@missing_fields) { + push @fields, {field_name => ($f . "_tbl"), field_label => $f}; + } + return (\@fields, $field_count); } if ($op eq 'edit') { @@ -110,27 +94,27 @@ if ($op eq 'edit') { elsif ($op eq 'save') { my $format_string = ''; if ($layout_choice eq 'layout_table') { # translate the field table into a format_string - my @layout_table = (); + my %layout_table; foreach my $cgi_param ($cgi->param()) { if (($cgi_param =~ m/^(.*)_tbl$/) && ($cgi->param($cgi_param))) { my $value = $cgi->param($cgi_param); - $layout_table[$value - 1] = $1; + $layout_table{$1} = $value; } } - @layout_table = grep {$_} @layout_table; # this removes numerically 'skipped' fields. ie. user omits a number in sequential order - $format_string = join ', ', @layout_table; + $format_string = join ', ', sort { $layout_table{$a} <=> $layout_table{$b} } keys %layout_table; $cgi->param('format_string', $format_string); } my @params = ( - barcode_type => $cgi->param('barcode_type') || 'CODE39', - printing_type => $cgi->param('printing_type') || 'BAR', - layout_name => $cgi->param('layout_name') || 'DEFAULT', + barcode_type => scalar $cgi->param('barcode_type') || 'CODE39', + printing_type => scalar $cgi->param('printing_type') || 'BAR', + layout_name => scalar $cgi->param('layout_name') || 'DEFAULT', guidebox => ($cgi->param('guidebox') ? 1 : 0), - font => $cgi->param('font') || 'TR', - font_size => $cgi->param('font_size') || 3, + oblique_title => ($cgi->param('oblique_title') ? 1 : 0), + font => scalar $cgi->param('font') || 'TR', + font_size => scalar $cgi->param('font_size') || 3, callnum_split => ($cgi->param('callnum_split') ? 1 : 0), - text_justify => $cgi->param('text_justify') || 'L', - format_string => $cgi->param('format_string') || 'title, author, isbn, issn, itemtype, barcode, itemcallnumber', + text_justify => scalar $cgi->param('text_justify') || 'L', + format_string => scalar $cgi->param('format_string') || 'title, author, isbn, issn, itemtype, barcode, itemcallnumber', ); if ($layout_id) { # if a label_id was passed in, this is an update to an existing layout $layout = C4::Labels::Layout->retrieve(layout_id => $layout_id); @@ -152,17 +136,19 @@ my $barcode_types = _set_selected(get_barcode_types(), $layout, 'barcode_type'); my $label_types = _set_selected(get_label_types(), $layout, 'printing_type'); my $font_types = _set_selected(get_font_types(), $layout, 'font'); my $text_justification_types = _set_selected(get_text_justification_types(), $layout, 'text_justify'); -my $select_text_fields = _select_format_string($layout->get_attr('format_string')); +my ($select_text_fields, $select_text_fields_cnt) = _select_format_string($layout->get_attr('format_string')); $template->param( barcode_types => $barcode_types, label_types => $label_types, font_types => $font_types, text_justification_types => $text_justification_types, - field_table => $select_text_fields, + fields => $select_text_fields, + field_count => $select_text_fields_cnt, layout_id => $layout->get_attr('layout_id') > -1 ? $layout->get_attr('layout_id') : '', layout_name => $layout->get_attr('layout_name'), guidebox => $layout->get_attr('guidebox'), + oblique_title => $layout->get_attr('oblique_title'), font_size => $layout->get_attr('font_size'), callnum_split => $layout->get_attr('callnum_split'), format_string => $layout->get_attr('format_string'),