bitlair/revbank
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Silence warnings for single-field line in revbank.products

Browse source
This commit is contained in:
Juerd Waalboer 2025-01-04 06:55:29 +01:00
parent e644526496
commit 5e8f905a7d
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/RevBank/Products.pm
View file

@ -71,13 +71,13 @@ sub read_products($filename = "revbank.products", $default_contra = "+sales/prod
unshift @addon_ids, $1 while $desc =~ s/\s+ \+ (\S+)$//x; unshift @addon_ids, $1 while $desc =~ s/\s+ \+ (\S+)$//x;
} }
my $canonical = join " ", map RevBank::Prompt::reconstruct($_), $ids, $p, $desc, @extra;
my @ids = split /,/, $ids; my @ids = split /,/, $ids;
$p ||= "invalid"; $p //= 0;
$desc ||= "(no description)"; $desc ||= "(no description)";
my $canonical = join " ", map RevBank::Prompt::reconstruct($_), $ids, $p, $desc, @extra;
my ($price, $contra) = split /\@/, $p, 2; my ($price, $contra) = split /\@/, $p, 2;
my $sign = $price =~ s/^-// ? -1 : 1; my $sign = $price =~ s/^-// ? -1 : 1;
@ -91,11 +91,12 @@ sub read_products($filename = "revbank.products", $default_contra = "+sales/prod
$percent = $sign * (0 + $price); $percent = $sign * (0 + $price);
$price = undef; # calculated later $price = undef; # calculated later
} else { } else {
$price = $sign * eval { parse_amount($price) }; $price = eval { parse_amount($price) };
if (not defined $price) { if (not defined $price) {
warn "Invalid price for '$ids[0]' at $filename line $linenr.\n"; warn "Invalid price for '$ids[0]' at $filename line $linenr.\n";
next; next;
} }
$price *= $sign;
} }
for my $id (@ids) { for my $id (@ids) {
warn "Product '$id' redefined at $filename line $linenr (original at line $products{$id}{line}).\n" if exists $products{$id}; warn "Product '$id' redefined at $filename line $linenr (original at line $products{$id}{line}).\n" if exists $products{$id};