Add commodclasses even for un-ordval'd commods

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index 5161af2e8a05a121ca690d41662ebd9012bb8c63..c6ed2536399a8e713efce419bf04e3d052678b68 100644 (file)
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -37,7 +37,7 @@ BEGIN {
     @ISA         = qw(Exporter);
     @EXPORT      = qw(&parse_info_clientside &fetch_with_rsync
                      &parse_info_serverside &parse_info_serverside_ocean
     @ISA         = qw(Exporter);
     @EXPORT      = qw(&parse_info_clientside &fetch_with_rsync
                      &parse_info_serverside &parse_info_serverside_ocean

-                     %oceans %commods %clients
+                     %oceans %commods %clients %commodclasses

                      %vessels %shotname2damage
                      &parse_pctb_commodmap %pctb_commodmap @pctb_commodmap
                      &get_our_version &check_tsv_line
                      %vessels %shotname2damage
                      &parse_pctb_commodmap %pctb_commodmap @pctb_commodmap
                      &get_our_version &check_tsv_line

diff --git a/yarrg/db-idempotent-populate b/yarrg/db-idempotent-populate
index 2e0b0ae5155d41d0128fb788d7b4eefca74d1040..5e0a8d5059d3f4ccc2d719257c8e76d7113430d0 100755 (executable)
--- a/yarrg/db-idempotent-populate
+++ b/yarrg/db-idempotent-populate
@@ -238,6 +238,8 @@ END
        if (defined $c->{Ordval} and defined $cl) {
            $incl{$cl}++;
            $setinclass->execute($incl{$cl}, $commod);
        if (defined $c->{Ordval} and defined $cl) {
            $incl{$cl}++;
            $setinclass->execute($incl{$cl}, $commod);

+       } elsif (defined $cl) {
+           $incl{$cl} += 0;

        }
     }
     db_doall(<<END);
        }
     }
     db_doall(<<END);