X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fweb%2Fcheck_capacitystring;h=321d7540fcf31e9bf953c8574e30015de32351d4;hp=4fd20546a4b3008b4140de42826cda1b019896dd;hb=02dade0af9916f9ab2102312900443a4f1c3a6fb;hpb=2193f00e651a9c9cfc1130e1ba4d32dd050b437f diff --git a/yarrg/web/check_capacitystring b/yarrg/web/check_capacitystring index 4fd2054..321d754 100644 --- a/yarrg/web/check_capacitystring +++ b/yarrg/web/check_capacitystring @@ -85,7 +85,7 @@ my $parse_values= sub { elsif (s/^( $fqtyrex ) \s* t \s+ //xo) { $def->(0, $1 * 1000.0 ); } elsif (s/^( $fqtyrex ) \s* l \s+ //xo) { $def->(1, $1 ); } elsif (s/^( $fqtyrex ) \s* kl \s+ //xo) { $def->(1, $1 * 1000.0 ); } - elsif (s/^( $iqtyrex ) \s* ([a-z ]+) \s+ //xo) { + elsif (s/^( $iqtyrex ) \s* ([a-z ]+) \s+ //ixo) { my ($qty,$spec) = ($1,$2); $debugf->("VALUE COMMOD $qty '$spec'"); expected_error("Capacity specification must start with". @@ -129,7 +129,7 @@ my $parse_term= sub { $_ *= $pct / 100.0; } push @canon, sprintf "%g%%", $pct; - } elsif (!m/[^a-z]/) { + } elsif (!m/[^a-z]/i) { $debugf->("TERM NAME"); expected_error("Name (should be unit or commodity) \`$_'". " without preceding quantity")