From c80b71743d96bbb7c9537556a4b24ce295067a5e Mon Sep 17 00:00:00 2001 From: "andreas.schildbach" Date: Wed, 25 Aug 2010 09:05:37 +0000 Subject: [PATCH] fixed LF in arrival git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@104 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/OebbProvider.java | 4 ++-- test/de/schildbach/pte/live/OebbProviderLiveTest.java | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/de/schildbach/pte/OebbProvider.java b/src/de/schildbach/pte/OebbProvider.java index a3553736..f8541e3d 100644 --- a/src/de/schildbach/pte/OebbProvider.java +++ b/src/de/schildbach/pte/OebbProvider.java @@ -193,7 +193,7 @@ public class OebbProvider implements NetworkProvider private static final Pattern P_CONNECTION_DETAILS_FINE = Pattern.compile(".*?" // + "\n" // + "(?:)?" // departureId - + "([^<]*?)<.*?" // departure + + "([^\n<]*).*?" // departure + "\n(?:(\\d{2}\\.\\d{2}\\.\\d{2})| )\n.*?" // departureDate + "(?:(\\d{2}:\\d{2})| ).*?" // departureTime + "\\s*(?: |(.*?))\\s*.*?" // departurePosition @@ -201,7 +201,7 @@ public class OebbProvider implements NetworkProvider + "(?:(.*?).*?)?" // line + "\n" // + "(?:)?" // arrivalId - + "([^<]*?)<.*?" // arrival + + "([^\n<]*).*?" // arrival + "\n(?:(\\d{2}\\.\\d{2}\\.\\d{2})| )\n.*?" // arrivalDate + "(?:(\\d{2}:\\d{2})| ).*?" // arrivalTime + "\\s*(?: |(.*?))\\s*.*?" // arrivalPosition diff --git a/test/de/schildbach/pte/live/OebbProviderLiveTest.java b/test/de/schildbach/pte/live/OebbProviderLiveTest.java index f978b56e..8c9ba169 100644 --- a/test/de/schildbach/pte/live/OebbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/OebbProviderLiveTest.java @@ -61,4 +61,14 @@ public class OebbProviderLiveTest final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.linkLater); System.out.println(moreResult); } + + @Test + public void connectionWithFootway2() throws Exception + { + final QueryConnectionsResult result = provider.queryConnections(LocationType.ANY, "Wien, Krottenbachstraße 110!", null, null, + LocationType.ANY, "Wien, Meidlinger Hauptstraße 1!", new Date(), true); + System.out.println(result); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.linkLater); + System.out.println(moreResult); + } }