From 0d2becaf709fba5aa26c774821690f38840ba830 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Sun, 12 Dec 2010 12:05:34 +0000 Subject: [PATCH] adapt to changes to connection details page git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@387 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/BahnProvider.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java index 141fc55d..6e145b53 100644 --- a/src/de/schildbach/pte/BahnProvider.java +++ b/src/de/schildbach/pte/BahnProvider.java @@ -294,7 +294,7 @@ public final class BahnProvider extends AbstractHafasProvider } private static final Pattern P_CONNECTION_DETAILS_HEAD = Pattern.compile(".*?" // - + "Verbindungsdetails.*", Pattern.DOTALL); + + "Verbindungsdetails(.*?)
.*?", Pattern.DOTALL); private static final Pattern P_CONNECTION_DETAILS_COARSE = Pattern.compile("
\n(.+?>\n)
", Pattern.DOTALL); static final Pattern P_CONNECTION_DETAILS_FINE = Pattern.compile("\\s*(.+?)\\s*.*?" // departure + "(?:" // @@ -340,7 +340,7 @@ public final class BahnProvider extends AbstractHafasProvider String lastArrival = null; Connection.Trip lastTrip = null; - final Matcher mDetCoarse = P_CONNECTION_DETAILS_COARSE.matcher(page); + final Matcher mDetCoarse = P_CONNECTION_DETAILS_COARSE.matcher(mHead.group(1)); while (mDetCoarse.find()) { final String section = mDetCoarse.group(1); @@ -421,7 +421,7 @@ public final class BahnProvider extends AbstractHafasProvider // verify if (firstDepartureTime == null || lastArrivalTime == null) - throw new IllegalStateException("could not parse all parts of:\n" + page + "\n" + parts); + throw new IllegalStateException("could not parse all parts of:\n" + mHead.group(1) + "\n" + parts); return new GetConnectionDetailsResult(new Date(), new Connection(AbstractHafasProvider.extractConnectionId(uri), uri, firstDepartureTime, lastArrivalTime, null, null, 0, firstDeparture, 0, lastArrival, parts, null));