Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
|
bufr.pm:bufrread.pl [2019-02-16 07:09:56] pals |
bufr.pm:bufrread.pl [2025-11-05 09:22:06] (current) pals |
||
|---|---|---|---|
| Line 1: | Line 1: | ||
| - | < | + | < |
| # | # | ||
| - | # (C) Copyright 2010-2019 MET Norway | + | # (C) Copyright 2010-2025 MET Norway |
| # | # | ||
| # This program is free software; you can redistribute it and/or modify | # This program is free software; you can redistribute it and/or modify | ||
| Line 34: | Line 34: | ||
| use constant DEFAULT_TABLE_PATH_BUFRDC => '/ | use constant DEFAULT_TABLE_PATH_BUFRDC => '/ | ||
| use constant DEFAULT_TABLE_PATH_ECCODES => '/ | use constant DEFAULT_TABLE_PATH_ECCODES => '/ | ||
| - | # Ought to be your most up-to-date code table(s) | ||
| - | use constant DEFAULT_CTABLE_BUFRDC => ' | ||
| - | use constant DEFAULT_CTABLE_ECCODES => ' | ||
| # Parse command line options | # Parse command line options | ||
| Line 43: | Line 40: | ||
| | | ||
| ' | ' | ||
| - | ' | + | ' |
| + | # | ||
| ' | ' | ||
| ' | ' | ||
| Line 105: | Line 103: | ||
| eval { $ahl_regexp = qr/ | eval { $ahl_regexp = qr/ | ||
| die " | die " | ||
| - | # When filtering on ahl we assume file is composed of GTS bulletins only | ||
| - | Geo:: | ||
| } | } | ||
| Line 124: | Line 120: | ||
| # Arrays over filter criteria, used if option --filter is set | # Arrays over filter criteria, used if option --filter is set | ||
| - | my @fid; # Filter descriptors, | + | my @fid; # Filter descriptors, |
| my @fiv; # Filter values, e.g. $fiv[1] = [ [ 3, 895 ], [ 6 252 ] ] | my @fiv; # Filter values, e.g. $fiv[1] = [ [ 3, 895 ], [ 6 252 ] ] | ||
| my @num_desc; # Number of filter descriptors for each criterion, e.g. $num_desc[1] = 2 | my @num_desc; # Number of filter descriptors for each criterion, e.g. $num_desc[1] = 2 | ||
| Line 199: | Line 195: | ||
| # Load C table, trying first to use same table version as | # Load C table, trying first to use same table version as | ||
| # the B and D tables loaded in next_observation, | # the B and D tables loaded in next_observation, | ||
| - | # this C table file does not exist, loads DEFAULT_CTABLE | + | # this C table file does not exist, loads C table for latest |
| - | # instead. | + | # master table in table path found instead. |
| my $table_version = $bufr-> | my $table_version = $bufr-> | ||
| my $tableformat = Geo:: | my $tableformat = Geo:: | ||
| if ($tableformat eq ' | if ($tableformat eq ' | ||
| - | $bufr-> | + | $bufr-> |
| } elsif ($tableformat eq ' | } elsif ($tableformat eq ' | ||
| - | $bufr-> | + | $bufr-> |
| } | } | ||
| } | } | ||
| Line 332: | Line 328: | ||
| # Read in contents of $filter_file into variables @fid, @fiv, | # Read in contents of $filter_file into variables @fid, @fiv, | ||
| # @num_desc, @num_val and $num_criteria, | # @num_desc, @num_val and $num_criteria, | ||
| + | # Note that index 0 of the arrays is not used. | ||
| sub read_filter_file { | sub read_filter_file { | ||
| my $filter_file = shift; | my $filter_file = shift; | ||
| Line 357: | Line 354: | ||
| } else { | } else { | ||
| my @values = split; | my @values = split; | ||
| + | # Check that value line contains correct number of values | ||
| + | die " | ||
| + | . " for line $. in filter file ' | ||
| + | if scalar @values != scalar @{$fid[$num_criteria]}; | ||
| # Remove leading 0's in numerical values (to prepare for string comparison) | # Remove leading 0's in numerical values (to prepare for string comparison) | ||
| for $_ (@values) { s/ | for $_ (@values) { s/ | ||
| Line 375: | Line 376: | ||
| my ($data, $descriptors) = @_; | my ($data, $descriptors) = @_; | ||
| - | my $num_ordinary_criteria = @fid - $num_required_criteria; | + | my $num_ordinary_criteria = $#fid - $num_required_criteria; |
| my $num_success_req_criteria = 0; # Number of required criteria successfully fulfilled | my $num_success_req_criteria = 0; # Number of required criteria successfully fulfilled | ||
| my $num_success_ord_criteria = 0; # Number of ordinary criteria successfully fulfilled | my $num_success_ord_criteria = 0; # Number of ordinary criteria successfully fulfilled | ||
| Line 433: | Line 434: | ||
| or $num_success_ord_criteria > 0)) { | or $num_success_ord_criteria > 0)) { | ||
| return 0; # Don't filter this observation | return 0; # Don't filter this observation | ||
| + | } else { | ||
| + | next DESC; | ||
| } | } | ||
| } else { | } else { | ||
| Line 500: | Line 503: | ||
| --ahl < | --ahl < | ||
| | | ||
| - | | + | |
| + | when printing section 4 | ||
| | | ||
| | | ||
| Line 552: | Line 556: | ||
| Using C< | Using C< | ||
| - | the criteria in <filter file> | + | the criteria in <filter file> |
| - | D!). Comments (starting with #) are ignored. An example of a filter | + | marked |
| - | file is | + | filter |
| D: 001001 | D: 001001 | ||
| Line 598: | Line 602: | ||
| =head1 COPYRIGHT | =head1 COPYRIGHT | ||
| - | Copyright (C) 2010-2019 MET Norway | + | Copyright (C) 2010-2025 MET Norway |
| =cut | =cut | ||
| </ | </ | ||