From 1315484d074eba1d145298f03eadb1cd92098e55 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach" Date: Tue, 20 Jul 2010 12:47:10 +0000 Subject: [PATCH] support 'no connections' git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@16 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/VbbProvider.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/de/schildbach/pte/VbbProvider.java b/src/de/schildbach/pte/VbbProvider.java index ab832636..5e00531d 100644 --- a/src/de/schildbach/pte/VbbProvider.java +++ b/src/de/schildbach/pte/VbbProvider.java @@ -128,14 +128,20 @@ public final class VbbProvider implements NetworkProvider private static final Pattern P_CHECK_ADDRESS = Pattern.compile("\\s*(.*?)\\s*", Pattern.DOTALL); private static final Pattern P_CHECK_FROM = Pattern.compile("Von:"); private static final Pattern P_CHECK_TO = Pattern.compile("Nach:"); - private static final Pattern P_CHECK_TOO_CLOSE = Pattern.compile("zu dicht beieinander"); + private static final Pattern P_CHECK_CONNECTIONS_ERROR = Pattern.compile("(zu dicht beieinander)|(keine Verbindung gefunden)"); public CheckConnectionsQueryResult checkConnectionsQuery(final String uri) throws IOException { final CharSequence page = ParserUtils.scrape(uri); - if (P_CHECK_TOO_CLOSE.matcher(page).find()) - return CheckConnectionsQueryResult.TOO_CLOSE; + final Matcher mError = P_CHECK_CONNECTIONS_ERROR.matcher(page); + if (mError.find()) + { + if (mError.group(1) != null) + return CheckConnectionsQueryResult.TOO_CLOSE; + if (mError.group(2) != null) + return CheckConnectionsQueryResult.NO_CONNECTIONS; + } final Matcher mAddress = P_CHECK_ADDRESS.matcher(page);