Parse old master info files too

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index 27e06e867e39bf56d5cfd9ed65f49a37b881b726..dff539d87166a7e3b7e114d6a0d9d68be6c0f06c 100644 (file)
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -122,13 +122,13 @@ sub parse_info1 ($$) {
 #print "ca($s)\n";
        if ($s !~ m/\%(\w+)/) {
            my ($name, $props) = $s =~
-               /^(\S[^\t]*\S)\t+(\S[^\t]*\S)$/
+               /^(\S[^\t]*\S)(?:\t+(\S[^\t]*\S))?$/
                or die "bad commodspec $s";
            my $ucname= ucfirst $name;
            $commods{$ucname}{Srcs} .= $ss;
            my $c= $commods{$ucname};
            $c->{Volume}= 1000;
-           foreach my $prop (split /\s+/, $props) {
+           foreach my $prop (defined $props ? split /\s+/, $props : ()) {
                if ($prop =~ m/^([1-9]\d*)(k?)g$/) {
                    $c->{Mass}= $1 * ($2 ? 1000 : 1);
                } elsif ($prop =~m/^([1-9]\d*)l$/) {
@@ -137,7 +137,6 @@ sub parse_info1 ($$) {
                    die "unknown property $prop for $ucname";
                }
            }
-           die "no mass for $ucname" unless defined $c->{Mass};
            return;
        }
        die "unknown $&" unless defined $colours{$1};

diff --git a/yarrg/db-idempotent-populate b/yarrg/db-idempotent-populate
index 80ded466aefeb4ab89899fae5218dd7da2537e72..9d7bab06a426193a15ed073473d6fb85a0bee203 100755 (executable)
--- a/yarrg/db-idempotent-populate
+++ b/yarrg/db-idempotent-populate
@@ -120,6 +120,8 @@ END
     ;
     foreach my $commod (sort keys %commods) {
        my $c= $commods{$commod};
+        die "no mass for $commod" unless defined $c->{Mass};
+        die "no colume for $commod" unless defined $c->{Volume};
        my @qa= ($c->{Mass}, $c->{Volume}, $commod);
        $insert->execute(@qa);
        $update->execute(@qa);