Add commodclasses even for un-ordval'd commods

[ypp-sc-tools.db-live.git] / yarrg / db-idempotent-populate

diff --git a/yarrg/db-idempotent-populate b/yarrg/db-idempotent-populate
index 6ca83829355fc6f9504cbd41694e934bfd156c69..5e0a8d5059d3f4ccc2d719257c8e76d7113430d0 100755 (executable)
--- a/yarrg/db-idempotent-populate
+++ b/yarrg/db-idempotent-populate
@@ -117,7 +117,6 @@ $fields );
 
  DROP TABLE aside_$table;
 END
-    $dbh->commit;
 }
 
 table('commods', <<END);
@@ -176,7 +175,7 @@ db_doall(<<END)
 END
     ;
 
-$dbh->commit;
+db_chkcommit();
 
 #---------- commodity list ----------
 
@@ -239,6 +238,8 @@ END
        if (defined $c->{Ordval} and defined $cl) {
            $incl{$cl}++;
            $setinclass->execute($incl{$cl}, $commod);
+       } elsif (defined $cl) {
+           $incl{$cl} += 0;
        }
     }
     db_doall(<<END);
@@ -253,7 +254,7 @@ END
     foreach my $cl (sort keys %incl) {
        $addclass->execute($cl, $incl{$cl});    
     }
-    $dbh->commit;
+    db_chkcommit();
 }
 
 #---------- vessel types ----------
@@ -271,5 +272,5 @@ END
        my @qa= ($name, $shotdamage, map { $v->{$_} } qw(Mass Volume));
        $idempotent->execute(@qa);
     }
-    $dbh->commit;
+    db_chkcommit();
 }