From 7952578dc707d4958a5b34e6f713193d790f785a Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Fri, 25 Feb 2011 16:10:18 +0000 Subject: [PATCH] switch to new server git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@505 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/NasaProvider.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/de/schildbach/pte/NasaProvider.java b/src/de/schildbach/pte/NasaProvider.java index 34053375..760f5aa5 100644 --- a/src/de/schildbach/pte/NasaProvider.java +++ b/src/de/schildbach/pte/NasaProvider.java @@ -46,7 +46,7 @@ public class NasaProvider extends AbstractHafasProvider { public static final NetworkId NETWORK_ID = NetworkId.NASA; public static final String OLD_NETWORK_ID = "www.nasa.de"; - private static final String API_BASE = "http://www.nasa.de/delfi52/"; + private static final String API_BASE = "http://reiseauskunft.insa.de/bin/"; private static final long PARSER_DAY_ROLLOVER_THRESHOLD_MS = 12 * 60 * 60 * 1000; @@ -125,9 +125,9 @@ public class NasaProvider extends AbstractHafasProvider + "(?:\n" // + "(?: |(pünktlich|\\d{1,2}:\\d{2}))\n\n" // predictedTime + ")?.*?" // - + "]*>\\s*(.*?)\\s*]*>\\s*(.*?)\\s*\n" // - + "]*>" // destinationId + + "]*>" // destinationId + "\\s*(.*?)\\s*\n" // destination + ".*?" // + "(?:\n(" + ParserUtils.P_PLATFORM + ").*?)?" // position @@ -248,6 +248,8 @@ public class NasaProvider extends AbstractHafasProvider if (ucType.equals("D")) // Rußland Schlafwagenzug return 'I'; + if (ucType.equals("ECW")) + return 'I'; if (ucType.equals("DPF")) // mit Dampflok bespannter Zug return 'R';