From 943f1c60163d56ba9ad96192ebfec4964d404067 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Mon, 28 Feb 2011 10:17:43 +0000 Subject: [PATCH] stricter patterns git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@510 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/BvgProvider.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/de/schildbach/pte/BvgProvider.java b/src/de/schildbach/pte/BvgProvider.java index b31732ab..6385131c 100644 --- a/src/de/schildbach/pte/BvgProvider.java +++ b/src/de/schildbach/pte/BvgProvider.java @@ -440,7 +440,7 @@ public final class BvgProvider extends AbstractHafasProvider private static final Pattern P_CONNECTION_DETAILS_HEAD = Pattern.compile(".*(?:Datum|Abfahrt): (\\d\\d\\.\\d\\d\\.\\d\\d).*", Pattern.DOTALL); private static final Pattern P_CONNECTION_DETAILS_COARSE = Pattern.compile("

\n(.+?)

", Pattern.DOTALL); - static final Pattern P_CONNECTION_DETAILS_FINE = Pattern.compile("(?:(?:\n)?" // departureId + static final Pattern P_CONNECTION_DETAILS_FINE = Pattern.compile("(?:(?:\n)?" // departureId + "(.+?)(?:\n)?)?.*?" // departure + "(?:" // + "ab (\\d+:\\d+)\n" // departureTime @@ -449,13 +449,13 @@ public final class BvgProvider extends AbstractHafasProvider + "Ri\\. (.*?)[\n\\.]*<.*?" // destination + "an (\\d+:\\d+)\n" // arrivalTime + "(Gl\\. \\d+)?.*?" // arrivalPosition - + "\n" // arrivalId + + "\n" // arrivalId + "([^<]*)" // arrival + "|" // + "(\\d+) Min\\.\n" // footway + "(?:Fussweg|Übergang)\n" // + "
\n" // - + "(?:\n" // arrivalId + + "(?:\n" // arrivalId + "([^<]*)|([^<]*)|([^<]*)).*?" // arrival + ").*?", Pattern.DOTALL);