parse 'Übergang'

git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@87 0924bc21-9374-b0fa-ee44-9ff1593b38f0

src/de/schildbach/pte/BahnProvider.java

@@ -290,7 +290,7 @@ public final class BahnProvider implements NetworkProvider
 
 	private static final Pattern P_CONNECTION_DETAILS_HEAD = Pattern.compile(".*<span class=\"bold\">Verbindungsdetails</span>.*", Pattern.DOTALL);
 	private static final Pattern P_CONNECTION_DETAILS_COARSE = Pattern.compile("<div class=\"haupt rline\">\n?(.+?)\n?</div>", Pattern.DOTALL);
-	private static final Pattern P_CONNECTION_DETAILS_FINE = Pattern.compile("<span class=\"bold\">\\s*(.+?)\\s*</span>.*?" // departure
+	static final Pattern P_CONNECTION_DETAILS_FINE = Pattern.compile("<span class=\"bold\">\\s*(.+?)\\s*</span>.*?" // departure
 			+ "(?:" //
 			+ "<span class=\"bold\">\\s*(.+?)\\s*</span>.*?" // line
 			+ "ab\\s+(?:<span.*?>.*?</span>)?\\s*(\\d+:\\d+)\\s*(?:<span.*?>.*?</span>)?" // departureTime
@@ -303,6 +303,8 @@ public final class BahnProvider implements NetworkProvider
 			+ "|" //
 			+ "(\\d+) Min\\..*?" // footway
 			+ "<span class=\"bold\">\\s*(.+?)\\s*</span><br />" // arrival
+			+ "|" //
+			+ "&#220;bergang.*?" + "<span class=\"bold\">\\s*(.+?)\\s*</span><br />" // arrival
 			+ ")", Pattern.DOTALL);
 	private static final Pattern P_CONNECTION_DETAILS_MESSAGES = Pattern
 			.compile("Dauer: \\d+:\\d+|(Anschlusszug nicht mehr rechtzeitig)|(Anschlusszug jedoch erreicht werden)|(nur teilweise dargestellt)|(L&#228;ngerer Aufenthalt)|(&#228;quivalentem Bahnhof)|(Bahnhof wird mehrfach durchfahren)");
@@ -339,8 +341,7 @@ public final class BahnProvider implements NetworkProvider
 						if (departure != null && firstDeparture == null)
 							firstDeparture = departure;
 
-						final String min = mDetFine.group(10);
+						if (mDetFine.group(2) != null)
-						if (min == null)
 						{
 							final String line = normalizeLine(ParserUtils.resolveEntities(mDetFine.group(2)));
 
@@ -370,8 +371,10 @@ public final class BahnProvider implements NetworkProvider
 							lastArrival = arrival;
 							lastArrivalTime = arrivalDateTime;
 						}
-						else
+						else if (mDetFine.group(10) != null)
 						{
+							final String min = mDetFine.group(10);
+
 							final String arrival = ParserUtils.resolveEntities(mDetFine.group(11));
 
 							if (parts.size() > 0 && parts.get(parts.size() - 1) instanceof Connection.Footway)
@@ -386,6 +389,12 @@ public final class BahnProvider implements NetworkProvider
 
 							lastArrival = arrival;
 						}
+						else
+						{
+							final String arrival = ParserUtils.resolveEntities(mDetFine.group(12));
+
+							parts.add(new Connection.Footway(0, departure, arrival));
+						}
 					}
 					else
 					{

test/de/schildbach/pte/BahnProviderTest.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2010 the original author or authors.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.schildbach.pte;
+
+import static junit.framework.Assert.assertTrue;
+
+import java.util.regex.Matcher;
+
+import org.junit.Test;
+
+/**
+ * @author Andreas Schildbach
+ */
+public class BahnProviderTest
+{
+	@Test
+	public void uebergang()
+	{
+		assertFineConnectionDetails("<span class=\"bold\">Berlin Hbf</span><br />\n" //
+				+ "&#220;bergang\n" //
+				+ "<br />\n" //
+				+ "<span class=\"bold\">Berlin-Lichtenberg</span><br />");
+	}
+
+	private void assertFineConnectionDetails(String s)
+	{
+		Matcher m = BahnProvider.P_CONNECTION_DETAILS_FINE.matcher(s);
+		assertTrue(m.matches());
+		// ParserUtils.printGroups(m);
+	}
+}