From 45724ce9744d7ae5ef2b3195add6dc4902128e8d Mon Sep 17 00:00:00 2001 From: "andreas.schildbach" Date: Thu, 9 Sep 2010 13:22:22 +0000 Subject: [PATCH] fixed ordering of messages git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@155 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/BahnProvider.java | 2 +- test/de/schildbach/pte/BahnProviderTest.java | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java index 3949b4bc..97f1ec35 100644 --- a/src/de/schildbach/pte/BahnProvider.java +++ b/src/de/schildbach/pte/BahnProvider.java @@ -456,8 +456,8 @@ public final class BahnProvider implements NetworkProvider + "(?: (?:(pünktl\\.)|ca. \\+(\\d+)))?" // ontime, delay + "(?: k\\.A\\.)?" // + "(?:, ([^<]*))?" // message - + "(?:,
]*>[^<]*)?" // (ersatzzug message) + "(?:(?:, )?(?:heute )?(Gl\\. " + ParserUtils.P_PLATFORM + ")(?:\\s*)?)?" // position + + "(?:,
]*>[^<]*)?" // (ersatzzug message) , Pattern.DOTALL); private static final Pattern P_DEPARTURES_URI_STATION_ID = Pattern.compile("input=(\\d+)"); diff --git a/test/de/schildbach/pte/BahnProviderTest.java b/test/de/schildbach/pte/BahnProviderTest.java index e024d7bf..1c935c94 100644 --- a/test/de/schildbach/pte/BahnProviderTest.java +++ b/test/de/schildbach/pte/BahnProviderTest.java @@ -146,6 +146,22 @@ public class BahnProviderTest assertNotNull(m.group(6)); // message } + @Test + public void departureWithPositionAndMessages() + { + final Matcher m = assertFineDepartures("" // + + "\n" // + + "RB 34075\n" // + + "\n" // + + ">>\n" // + + "Nürnberg Hbf\n" // + + "
\n" // + + "00:18, Zug fällt aus, Gl. 4,
Ersatzzug RB 30535"); + + assertNotNull(m.group(6)); // message + assertNotNull(m.group(7)); // position + } + private void assertFineConnectionDetails(String s) { Matcher m = BahnProvider.P_CONNECTION_DETAILS_FINE.matcher(s);