From d7c3ba543a3f50adae6e3631d6522061434c50a7 Mon Sep 17 00:00:00 2001
From: "andreas.schildbach"
 <andreas.schildbach@0924bc21-9374-b0fa-ee44-9ff1593b38f0>
Date: Mon, 16 Aug 2010 10:51:19 +0000
Subject: [PATCH] fixed another footway variant

git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@88 0924bc21-9374-b0fa-ee44-9ff1593b38f0
---
 src/de/schildbach/pte/MvvProvider.java      |  4 +--
 test/de/schildbach/pte/MvvProviderTest.java | 40 +++++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/de/schildbach/pte/MvvProvider.java b/src/de/schildbach/pte/MvvProvider.java
index 5fdc0753..6ede1a69 100644
--- a/src/de/schildbach/pte/MvvProvider.java
+++ b/src/de/schildbach/pte/MvvProvider.java
@@ -365,9 +365,9 @@ public class MvvProvider implements NetworkProvider
 			+ "<td>\\s*(.*?)\\s*<br />Richtung\\s*(.*?)\\s*</td>.*?" //
 			+ "an (\\d+:\\d+)\\s+(.*?)\\s*<" //
 			+ "|" //
-			+ "ab\\s+(.*?)\\s*<a.*?" //
+			+ "ab\\s+(.*?)\\s*<.*?" //
 			+ "Fußweg[\\xa0\\s]+\\(ca\\.[\\xa0\\s]+(\\d+)[\\xa0\\s]+Minute.*?" //
-			+ "an\\s+(.*?)\\s*<a" //
+			+ "an\\s+(.*?)\\s*<" //
 			+ ").*?", Pattern.DOTALL);
 	private static final Pattern P_CONNECTION_DETAILS_ERRORS = Pattern.compile("(session has expired)", Pattern.CASE_INSENSITIVE);
 	private static final String SITZENBLEIBER = "Sitzenbleiber";
diff --git a/test/de/schildbach/pte/MvvProviderTest.java b/test/de/schildbach/pte/MvvProviderTest.java
index aa0617ff..526b3edf 100644
--- a/test/de/schildbach/pte/MvvProviderTest.java
+++ b/test/de/schildbach/pte/MvvProviderTest.java
@@ -84,6 +84,46 @@ public class MvvProviderTest
 				+ "</td>\n");
 	}
 
+	@Test
+	public void footway()
+	{
+		assertFineConnectionDetails("\n" //
+				+ "<td colspan=\"4\">ab München Infanteriestraße 7  <a class=\"imgLink\" href=\"XSLT_TRIP_REQUEST2?language=de&amp;tripSelector5=on&amp;sessionID=MVV2_3994525266&amp;requestID=1&amp;tripSelection=on&amp;itdLPxx_view=map_5&amp;itdLPxx_img=FILELOAD?Filename=mvv2_4C6916821.png&amp;itdLPxx_partialRoute=1&amp;imageFormat=PNG&amp;imageWidth=400&amp;imageHeight=300&amp;imageOnly=1&amp;imageNoTiles=1&amp;itdLPxx_usage=departure\"><img src=\"images/pdf.gif\" border=\"0\" alt=\"Karte\" /></a>\n" //
+				+ "<br />\n" //
+				+ "</td>\n" //
+				+ "\n" //
+				+ "<td width=\"15\" valign=\"middle\">\n" //
+				+ "<img src=\"images/means/fuss.gif\" alt=\"Fussweg\" />\n" //
+				+ "</td>\n" //
+				+ "<td width=\"1\" valign=\"middle\" />\n" //
+				+ "<td>Fußweg\n" //
+				+ "											(ca. 3 Minuten)\n" //
+				+ "												</td>\n" //
+				+ "<td width=\"1\"> </td>\n" //
+				+ "\n" //
+				+ "<td colspan=\"4\">an Infanteriestraße Süd  <a class=\"imgLink\" href=\"XSLT_TRIP_REQUEST2?language=de&amp;tripSelector5=on&amp;sessionID=MVV2_3994525266&amp;requestID=1&amp;tripSelection=on&amp;itdLPxx_view=map_5&amp;itdLPxx_img=FILELOAD?Filename=mvv2_4C6916822.png&amp;itdLPxx_partialRoute=1&amp;imageFormat=PNG&amp;imageWidth=400&amp;imageHeight=300&amp;imageOnly=1&amp;imageNoTiles=1&amp;command=nop&amp;itdLPxx_usage=arrival\"><img src=\"images/pdf.gif\" border=\"0\" alt=\"Karte\" /></a>\n" //
+				+ "</td>\n");
+	}
+
+	@Test
+	public void footway2()
+	{
+		assertFineConnectionDetails("\n" //
+				+ "<td colspan=\"4\">ab Weimar Gleis 1<br />\n" //
+				+ "</td>\n" //
+				+ "\n" //
+				+ "<td width=\"15\" valign=\"middle\">\n" //
+				+ "<img src=\"images/means/fuss.gif\" alt=\"Fussweg\" />\n" //
+				+ "</td>\n" //
+				+ "<td width=\"1\" valign=\"middle\" />\n" //
+				+ "<td>Fußweg\n" //
+				+ "(ca. 2 Minuten)\n" //
+				+ "</td>\n" //
+				+ "<td width=\"1\"> </td>\n" //
+				+ "\n" //
+				+ "<td colspan=\"4\">an Weimar Gleis 2</td>\n");
+	}
+
 	private void assertFineConnectionDetails(String s)
 	{
 		Matcher m = MvvProvider.P_CONNECTION_DETAILS_FINE.matcher(s);