Loading share/xml2json +31 −17 Original line number Diff line number Diff line Loading @@ -9,6 +9,9 @@ use JSON; use List::Util qw(any); use XML::LibXML; # old / new / renamed / reappeared / missing my $mode = shift; my $json = JSON->new->utf8; my $json_str = read_file('stations.json'); my $stations = $json->decode($json_str); Loading Loading @@ -161,9 +164,11 @@ for my $station ( $tree->findnodes('//station') ) { { printf( "%8s has been renamed: %30s -> %30s\n", $ds100, $station_by_ds100{$ds100}{name}, $name ); if ( not $mode or $mode eq 'renamed' ) { $renamed{ $station_by_ds100{$ds100}{name} } = $name; $station_by_ds100{$ds100}{name} = $name; } } elsif ( $station_by_eva{$eva} and $station_by_eva{$eva}{name} ne $name ) { printf( "%d mismatch: (%s -> %s), (%s -> %s)\n", Loading @@ -176,15 +181,19 @@ for my $station ( $tree->findnodes('//station') ) { and $is_db ) { printf( "%30s has a new DS100 alias: %8s\n", $name, $ds100 ); if ( not $mode or $mode eq 'new' ) { add_station( $name, $ds100, $eva ); } } elsif ( $station_by_name{$name} and not any { $_->{eva} == $eva } @{ $station_by_name{$name} } and $is_db ) { printf( "%30s has a new EVA alias: %d\n", $name, $eva ); if ( not $mode or $mode eq 'new' ) { add_station( $name, $ds100, $eva ); } } if ( $name !~ m{Betriebsstelle nicht bekannt} Loading @@ -195,6 +204,7 @@ for my $station ( $tree->findnodes('//station') ) { ) { printf( "%30s has re-appeared as %s %d\n", $name, $ds100, $eva ); if ( not $mode or $mode eq 'reappeared' ) { if ( ref($old) eq 'ARRAY' ) { for my $o ( @{$old} ) { delete_old_station( $o->{name}, $o->{ds100}, $o->{eva} ); Loading @@ -205,19 +215,21 @@ for my $station ( $tree->findnodes('//station') ) { } add_station( $name, $ds100, $eva ); } } if ( not $found and any { $_ eq $name } @missing ) { say "missing $eva $ds100 \"$name\""; # TODO remove from old_stations if ( not $mode or $mode eq 'missing' ) { add_station( $name, $ds100, $eva ); if ( $old_station_by_name{$name} ) { delete_old_station( $name, $ds100, $eva ); } } } } my @to_delete; Loading @@ -230,10 +242,12 @@ for my $i ( 0 .. $#{$stations} ) { if ( not( $xml_by_name{$j_name} or $xml_by_eva{$j_eva} ) ) { say "station no longer exists: $j_eva $j_ds100 \"$j_name\""; if ( not $mode or $mode eq 'old' ) { unshift( @to_delete, $i ); add_old_station( $j_name, $j_ds100, $j_eva, $j_station->{latlong} ); } } } for my $i ( 0 .. $#{$old_stations} ) { $old_stations->[$i]{eva} = 0 + $old_stations->[$i]{eva}; Loading Loading
share/xml2json +31 −17 Original line number Diff line number Diff line Loading @@ -9,6 +9,9 @@ use JSON; use List::Util qw(any); use XML::LibXML; # old / new / renamed / reappeared / missing my $mode = shift; my $json = JSON->new->utf8; my $json_str = read_file('stations.json'); my $stations = $json->decode($json_str); Loading Loading @@ -161,9 +164,11 @@ for my $station ( $tree->findnodes('//station') ) { { printf( "%8s has been renamed: %30s -> %30s\n", $ds100, $station_by_ds100{$ds100}{name}, $name ); if ( not $mode or $mode eq 'renamed' ) { $renamed{ $station_by_ds100{$ds100}{name} } = $name; $station_by_ds100{$ds100}{name} = $name; } } elsif ( $station_by_eva{$eva} and $station_by_eva{$eva}{name} ne $name ) { printf( "%d mismatch: (%s -> %s), (%s -> %s)\n", Loading @@ -176,15 +181,19 @@ for my $station ( $tree->findnodes('//station') ) { and $is_db ) { printf( "%30s has a new DS100 alias: %8s\n", $name, $ds100 ); if ( not $mode or $mode eq 'new' ) { add_station( $name, $ds100, $eva ); } } elsif ( $station_by_name{$name} and not any { $_->{eva} == $eva } @{ $station_by_name{$name} } and $is_db ) { printf( "%30s has a new EVA alias: %d\n", $name, $eva ); if ( not $mode or $mode eq 'new' ) { add_station( $name, $ds100, $eva ); } } if ( $name !~ m{Betriebsstelle nicht bekannt} Loading @@ -195,6 +204,7 @@ for my $station ( $tree->findnodes('//station') ) { ) { printf( "%30s has re-appeared as %s %d\n", $name, $ds100, $eva ); if ( not $mode or $mode eq 'reappeared' ) { if ( ref($old) eq 'ARRAY' ) { for my $o ( @{$old} ) { delete_old_station( $o->{name}, $o->{ds100}, $o->{eva} ); Loading @@ -205,19 +215,21 @@ for my $station ( $tree->findnodes('//station') ) { } add_station( $name, $ds100, $eva ); } } if ( not $found and any { $_ eq $name } @missing ) { say "missing $eva $ds100 \"$name\""; # TODO remove from old_stations if ( not $mode or $mode eq 'missing' ) { add_station( $name, $ds100, $eva ); if ( $old_station_by_name{$name} ) { delete_old_station( $name, $ds100, $eva ); } } } } my @to_delete; Loading @@ -230,10 +242,12 @@ for my $i ( 0 .. $#{$stations} ) { if ( not( $xml_by_name{$j_name} or $xml_by_eva{$j_eva} ) ) { say "station no longer exists: $j_eva $j_ds100 \"$j_name\""; if ( not $mode or $mode eq 'old' ) { unshift( @to_delete, $i ); add_old_station( $j_name, $j_ds100, $j_eva, $j_station->{latlong} ); } } } for my $i ( 0 .. $#{$old_stations} ) { $old_stations->[$i]{eva} = 0 + $old_stations->[$i]{eva}; Loading