From dfc14e382f97c6d2255afe566b2c84b19d733e65 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach" Date: Sat, 25 Sep 2010 08:39:34 +0000 Subject: [PATCH] remove indicators in brackets git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@191 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/OebbProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/de/schildbach/pte/OebbProvider.java b/src/de/schildbach/pte/OebbProvider.java index 9aa972f8..6dc09bbe 100644 --- a/src/de/schildbach/pte/OebbProvider.java +++ b/src/de/schildbach/pte/OebbProvider.java @@ -161,8 +161,8 @@ public class OebbProvider implements NetworkProvider private static final Pattern P_QUERY_CONNECTIONS_ERROR = Pattern .compile("(keine Verbindung gefunden|kein Weg gefunden)|(liegt nach dem Ende der Fahrplanperiode|liegt vor Beginn der Fahrplanperiode)|(zwischenzeitlich nicht mehr gespeichert)"); private static final Pattern P_PRE_ADDRESS = Pattern.compile( - "]*>(.*?)", Pattern.DOTALL); - private static final Pattern P_ADDRESSES = Pattern.compile("]*>\\s*(.*?)\\s*", Pattern.DOTALL); + "]*>\n(.*?)", Pattern.DOTALL); + private static final Pattern P_ADDRESSES = Pattern.compile("]*>\\s*([^<\\[]*)(?:\\[[^\\[]*\\])?\\s*", Pattern.DOTALL); public QueryConnectionsResult queryConnections(final LocationType fromType, final String from, final LocationType viaType, final String via, final LocationType toType, final String to, final Date date, final boolean dep, final WalkSpeed walkSpeed) throws IOException