diff options
| -rw-r--r-- | lib/DBInfoscreen.pm | 18 | ||||
| -rw-r--r-- | share/dbdb_wagen.json | 2 |
2 files changed, 15 insertions, 5 deletions
diff --git a/lib/DBInfoscreen.pm b/lib/DBInfoscreen.pm index 52b1383..94b4d5b 100644 --- a/lib/DBInfoscreen.pm +++ b/lib/DBInfoscreen.pm @@ -191,11 +191,16 @@ sub startup { elsif ( $train_type =~ m{ICE [12]} and $wagon_type !~ m{^I} ) { $ret = substr( $uic, 5, 4 ); } + elsif ( $train_type =~ m{ICE 3 403.1} ) { + $ret = '31_' . substr( $uic, 5, 4 ); + } + elsif ( $train_type =~ m{ICE 3 403.2} ) { + $ret = '32_' . substr( $uic, 5, 4 ); + } elsif ( $train_type =~ m{ICE 3 Redesign} ) { $ret = '3r_' . substr( $uic, 5, 4 ); } - elsif ( $train_type =~ m{ICE 3} and substr( $uic, 5, 3 ) eq '406' ) - { + elsif ( $train_type =~ m{ICE 3 406} ) { $ret = '3_' . substr( $uic, 5, 4 ); } elsif ( $train_type eq 'ICE 3 Velaro' ) { @@ -204,8 +209,13 @@ sub startup { elsif ( $train_type =~ m{ICE 4} ) { $ret = substr( $uic, 4, 5 ); } - elsif ( $train_type =~ m{ICE T} and substr( $uic, 5, 3 ) eq '415' ) - { + elsif ( $train_type =~ m{ICE T 411.1} ) { + $ret = 't1_' . substr( $uic, 5, 4 ); + } + elsif ( $train_type =~ m{ICE T 411.2} ) { + $ret = 't2_' . substr( $uic, 5, 4 ); + } + elsif ( $train_type =~ m{ICE T 415} ) { $ret = substr( $uic, 5, 4 ); } elsif ( $train_type =~ m{IC2 KISS} ) { diff --git a/share/dbdb_wagen.json b/share/dbdb_wagen.json index 628032a..a2063c8 100644 --- a/share/dbdb_wagen.json +++ b/share/dbdb_wagen.json @@ -1 +1 @@ -{"08120":"true","1101":"true","1104":"true","1105":"true","1106":"true","14120":"true","18120":"true","24120":"true","24123":"true","24125":"true","24128":"true","31_4030":"true","31_4031":"true","31_4032":"true","31_4033":"true","31_4035":"true","31_4036":"true","31_4037":"true","31_4038":"true","32_4030":"true","32_4031":"true","32_4032":"true","32_4033":"true","32_4035":"true","32_4036":"true","32_4037":"true","32_4038":"true","3_4060":"true","3_4061":"true","3_4062":"true","3_4063":"true","3_4065":"true","3_4066":"true","3_4067":"true","3_4068":"true","3r_4030":"true","3r_4031":"true","3r_4032":"true","3r_4033":"true","3r_4035":"true","3r_4036":"true","3r_4037":"true","3r_4038":"true","3r_4060":"true","3r_4061":"true","3r_4062":"true","3r_4063":"true","3r_4065":"true","3r_4066":"true","3r_4067":"true","3r_4068":"true","4070":"true","4071":"true","4072":"true","4073":"true","4075":"true","4076":"true","4077":"true","4078":"true","48120":"true","58120":"true","64120":"true","8010":"true","8014":"true","8018":"true","8020":"true","8023":"true","8026":"true","8027":"true","8028":"true","8029":"true","8031":"true","8040":"true","8050":"true","8053":"true","8060":"true","8063":"true","8066":"true","8070":"true","8080":"true","88120":"true","98120":"true","ARkimbz":"true","ARkimmbz":"true","Apmmz":"true","Avmmz":"true","Avmz":"true","Bimmdzf":"true","Bpmbz":"true","Bpmmbdz":"true","Bpmmbdzf":"true","Bpmmbz":"true","Bpmmdz":"true","Bpmmz":"true","Bvmmsz":"true","Bvmmz":"true","Bvmsz":"true","DApza":"true","DBpbzfa":"true","DBpza":"true"} +{"08120":"true","1101":"true","1104":"true","1105":"true","1106":"true","14120":"true","18120":"true","24120":"true","24123":"true","24125":"true","24128":"true","31_4030":"true","31_4031":"true","31_4032":"true","31_4033":"true","31_4035":"true","31_4036":"true","31_4037":"true","31_4038":"true","32_4030":"true","32_4031":"true","32_4032":"true","32_4033":"true","32_4035":"true","32_4036":"true","32_4037":"true","32_4038":"true","3_4060":"true","3_4061":"true","3_4062":"true","3_4063":"true","3_4065":"true","3_4066":"true","3_4067":"true","3_4068":"true","3r_4030":"true","3r_4031":"true","3r_4032":"true","3r_4033":"true","3r_4035":"true","3r_4036":"true","3r_4037":"true","3r_4038":"true","3r_4060":"true","3r_4061":"true","3r_4062":"true","3r_4063":"true","3r_4065":"true","3r_4066":"true","3r_4067":"true","3r_4068":"true","4070":"true","4071":"true","4072":"true","4073":"true","4075":"true","4076":"true","4077":"true","4078":"true","4150":"true","4151":"true","4155":"true","4156":"true","4157":"true","48120":"true","58120":"true","64120":"true","8010":"true","8014":"true","8018":"true","8020":"true","8023":"true","8026":"true","8027":"true","8028":"true","8029":"true","8031":"true","8040":"true","8050":"true","8053":"true","8060":"true","8063":"true","8066":"true","8070":"true","8080":"true","88120":"true","98120":"true","ARkimbz":"true","ARkimmbz":"true","Apmmz":"true","Avmmz":"true","Avmz":"true","Bimmdzf":"true","Bpmbz":"true","Bpmmbdz":"true","Bpmmbdzf":"true","Bpmmbz":"true","Bpmmdz":"true","Bpmmz":"true","Bvmmsz":"true","Bvmmz":"true","Bvmsz":"true","COPYING":"true","DApza":"true","DBpbzfa":"true","DBpza":"true","t1_4110":"true","t1_4111":"true","t1_4112":"true","t1_4115":"true","t1_4116":"true","t1_4117":"true","t1_4118":"true","t2_4110":"true","t2_4111":"true","t2_4112":"true","t2_4115":"true","t2_4116":"true","t2_4117":"true","t2_4118":"true","wagons":"true"} |