summaryrefslogtreecommitdiff
path: root/lib/Travelynx
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2023-02-04 22:17:57 +0100
committerDaniel Friesel <derf@finalrewind.org>2023-02-04 22:17:57 +0100
commit3da22fc8f99fcfc910090a9b99b2b690e6269bda (patch)
treec41dcb54e14bb98120367545c658505dab85c101 /lib/Travelynx
parent16cdc3d10a5483a7b7005d57590f6059a8433806 (diff)
improve inconsistency list1.29.18
Diffstat (limited to 'lib/Travelynx')
-rw-r--r--lib/Travelynx/Command/database.pm12
-rwxr-xr-xlib/Travelynx/Model/Journeys.pm25
2 files changed, 32 insertions, 5 deletions
diff --git a/lib/Travelynx/Command/database.pm b/lib/Travelynx/Command/database.pm
index a42f2f5..407d50a 100644
--- a/lib/Travelynx/Command/database.pm
+++ b/lib/Travelynx/Command/database.pm
@@ -1300,6 +1300,18 @@ my @migrations = (
}
);
},
+
+ # v31 -> v32
+ # travelynx v1.29.18 improves above-mentioned conflict links.
+ sub {
+ my ($db) = @_;
+ $db->query(
+ qq{
+ truncate journey_stats;
+ update schema_version set version = 32;
+ }
+ );
+ },
);
sub sync_stations {
diff --git a/lib/Travelynx/Model/Journeys.pm b/lib/Travelynx/Model/Journeys.pm
index 1239266..2c84181 100755
--- a/lib/Travelynx/Model/Journeys.pm
+++ b/lib/Travelynx/Model/Journeys.pm
@@ -1458,6 +1458,8 @@ sub compute_stats {
my @inconsistencies;
my $next_departure = 0;
+ my $next_id;
+ my $next_train;
for my $journey (@journeys) {
$num_trains++;
@@ -1488,11 +1490,21 @@ sub compute_stats {
if ( $next_departure - $journey->{rt_arr_ts} < 0 ) {
push(
@inconsistencies,
- [
- epoch_to_dt($next_departure)
- ->strftime('%d.%m.%Y %H:%M'),
- $journey->{id}
- ]
+ {
+ conflict => {
+ train => $journey->{type} . ' '
+ . ( $journey->{line} // $journey->{no} ),
+ arr => epoch_to_dt( $journey->{rt_arr_ts} )
+ ->strftime('%d.%m.%Y %H:%M'),
+ id => $journey->{id},
+ },
+ ignored => {
+ train => $next_train,
+ dep => epoch_to_dt($next_departure)
+ ->strftime('%d.%m.%Y %H:%M'),
+ id => $next_id,
+ },
+ }
);
}
else {
@@ -1504,6 +1516,9 @@ sub compute_stats {
$num_journeys++;
}
$next_departure = $journey->{rt_dep_ts};
+ $next_id = $journey->{id};
+ $next_train
+ = $journey->{type} . ' ' . ( $journey->{line} // $journey->{no} ),;
}
my $ret = {
km_route => $km_route,