- $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};