better handling of 'Sitzenbleiber'

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

src/de/schildbach/pte/MvvProvider.java

@@ -468,8 +468,8 @@ public class MvvProvider implements NetworkProvider
 		}
 	}
 
-	private static final Pattern P_CONNECTION_DETAILS_HEAD = Pattern.compile(".*<b>Detailansicht</b>.*?" //
+	private static final Pattern P_CONNECTION_DETAILS_HEAD = Pattern.compile(".*?<b>Detailansicht</b>.*?" //
-			+ "<b>Datum:[\\xa0\\s]+</b>\\w{2}\\.,\\s(\\d+)\\.\\s(\\w{3,4})\\.[\\xa0\\s]+(\\d{4}).*", Pattern.DOTALL);
+			+ "<b>Datum:[\\xa0\\s]+</b>\\w{2}\\.,\\s(\\d+)\\.\\s(\\w{3,4})\\.[\\xa0\\s]+(\\d{4}).*?", Pattern.DOTALL);
 	private static final Pattern P_CONNECTION_DETAILS_COARSE = Pattern.compile("" //
 			+ "<tr bgcolor=\"#(\\w{6})\">\r\\x0a(.+?)</tr>.*?" //
 			+ "<tr bgcolor=\"#\\1\">\r\\x0a(.+?)</tr>.*?" //
@@ -477,15 +477,16 @@ public class MvvProvider implements NetworkProvider
 	static final Pattern P_CONNECTION_DETAILS_FINE = Pattern.compile("(?:" //
 			+ "<td colspan=\"\\d+\">ab (\\d{1,2}:\\d{2})\\s(.*?)\\s*<.*?" // departureTime, departure
 			+ "(?:<img src=\"images/means.*?\" alt=\"(.*?)\" />.*?)?" // product
-			+ "<td>\\s*(.*?)\\s*<br />Richtung\\s*(.*?)\\s*</td>.*?" //
+			+ "<td>\\s*(.*?)\\s*<br />Richtung\\s*(.*?)\\s*</td>.*?" // line, destination
-			+ "<td colspan=\"\\d+\">an (\\d{1,2}:\\d{2})\\s(.*?)\\s*<" //
+			+ "<td colspan=\"\\d+\">an (\\d{1,2}:\\d{2})\\s(.*?)\\s*<" // arrivalTime, arrival
 			+ "|" //
 			+ "<td colspan=\"\\d+\">ab (.*?)\\s*<.*?" // departure
-			+ "Fußweg[\\xa0\\s]+\\(ca\\.[\\xa0\\s]+(\\d+)[\\xa0\\s]+Minute.*?" //
+			+ "Fußweg[\\xa0\\s]+\\(ca\\.[\\xa0\\s]+(\\d+)[\\xa0\\s]+Minute.*?" // min
-			+ "<td colspan=\"\\d+\">an (.*?)\\s*<" //
+			+ "<td colspan=\"\\d+\">an (.*?)\\s*<" // arrival
+			+ "|" //
+			+ ".*?<img src=\"images/means/seat.gif\" alt=\"Sitzenbleiber\" />" //
 			+ ").*?", Pattern.DOTALL);
 	private static final Pattern P_CONNECTION_DETAILS_ERRORS = Pattern.compile("(session has expired)", Pattern.CASE_INSENSITIVE);
-	private static final String SITZENBLEIBER = "Sitzenbleiber";
 
 	public GetConnectionDetailsResult getConnectionDetails(final String uri) throws IOException
 	{
@@ -515,68 +516,64 @@ public class MvvProvider implements NetworkProvider
 					oldZebra = zebra;
 
 				final String set = mDetCoarse.group(2) + mDetCoarse.group(3) + mDetCoarse.group(4);
-				if (!set.contains(SITZENBLEIBER))
+				final Matcher mDetFine = P_CONNECTION_DETAILS_FINE.matcher(set);
+				if (mDetFine.matches())
 				{
-					final Matcher mDetFine = P_CONNECTION_DETAILS_FINE.matcher(set);
+					if (mDetFine.group(1) != null)
-					if (mDetFine.matches())
 					{
-						if (mDetFine.group(8) == null)
+						final Date departureTime = upTime(lastTime, ParserUtils.joinDateTime(currentDate, ParserUtils.parseTime(mDetFine.group(1))));
+
+						final String departure = ParserUtils.resolveEntities(mDetFine.group(2));
+						if (departure != null && firstDeparture == null)
+							firstDeparture = departure;
+
+						final String product = ParserUtils.resolveEntities(mDetFine.group(3));
+
+						final String line = ParserUtils.resolveEntities(mDetFine.group(4));
+
+						final String destination = ParserUtils.resolveEntities(mDetFine.group(5));
+
+						final Date arrivalTime = upTime(lastTime, ParserUtils.joinDateTime(currentDate, ParserUtils.parseTime(mDetFine.group(6))));
+
+						final String arrival = ParserUtils.resolveEntities(mDetFine.group(7));
+
+						final String normalizedLine = normalizeLine(product, line);
+
+						parts.add(new Connection.Trip(normalizedLine, LINES.get(normalizedLine), destination, departureTime, null, 0, departure,
+								arrivalTime, null, 0, arrival));
+
+						if (firstDepartureTime == null)
+							firstDepartureTime = departureTime;
+
+						lastArrival = arrival;
+						lastArrivalTime = arrivalTime;
+					}
+					else if (mDetFine.group(8) != null)
+					{
+						final String departure = ParserUtils.resolveEntities(mDetFine.group(8));
+						if (departure != null && firstDeparture == null)
+							firstDeparture = departure;
+
+						final String min = mDetFine.group(9);
+
+						final String arrival = ParserUtils.resolveEntities(mDetFine.group(10));
+
+						if (parts.size() > 0 && parts.get(parts.size() - 1) instanceof Connection.Footway)
 						{
-							final Date departureTime = upTime(lastTime, ParserUtils.joinDateTime(currentDate, ParserUtils
+							final Connection.Footway lastFootway = (Connection.Footway) parts.remove(parts.size() - 1);
-									.parseTime(mDetFine.group(1))));
+							parts.add(new Connection.Footway(lastFootway.min + Integer.parseInt(min), 0, lastFootway.departure, 0, arrival));
-
-							final String departure = ParserUtils.resolveEntities(mDetFine.group(2));
-							if (departure != null && firstDeparture == null)
-								firstDeparture = departure;
-
-							final String product = ParserUtils.resolveEntities(mDetFine.group(3));
-
-							final String line = ParserUtils.resolveEntities(mDetFine.group(4));
-
-							final String destination = ParserUtils.resolveEntities(mDetFine.group(5));
-
-							final Date arrivalTime = upTime(lastTime, ParserUtils.joinDateTime(currentDate, ParserUtils.parseTime(mDetFine.group(6))));
-
-							final String arrival = ParserUtils.resolveEntities(mDetFine.group(7));
-
-							final String normalizedLine = normalizeLine(product, line);
-
-							parts.add(new Connection.Trip(normalizedLine, LINES.get(normalizedLine), destination, departureTime, null, 0, departure,
-									arrivalTime, null, 0, arrival));
-
-							if (firstDepartureTime == null)
-								firstDepartureTime = departureTime;
-
-							lastArrival = arrival;
-							lastArrivalTime = arrivalTime;
 						}
 						else
 						{
-							final String departure = ParserUtils.resolveEntities(mDetFine.group(8));
+							parts.add(new Connection.Footway(Integer.parseInt(min), 0, departure, 0, arrival));
-							if (departure != null && firstDeparture == null)
-								firstDeparture = departure;
-
-							final String min = mDetFine.group(9);
-
-							final String arrival = ParserUtils.resolveEntities(mDetFine.group(10));
-
-							if (parts.size() > 0 && parts.get(parts.size() - 1) instanceof Connection.Footway)
-							{
-								final Connection.Footway lastFootway = (Connection.Footway) parts.remove(parts.size() - 1);
-								parts.add(new Connection.Footway(lastFootway.min + Integer.parseInt(min), 0, lastFootway.departure, 0, arrival));
-							}
-							else
-							{
-								parts.add(new Connection.Footway(Integer.parseInt(min), 0, departure, 0, arrival));
-							}
-
-							lastArrival = arrival;
 						}
+
+						lastArrival = arrival;
 					}
-					else
+				}
-					{
+				else
-						throw new IllegalArgumentException("cannot parse '" + set + "' on " + uri);
+				{
-					}
+					throw new IllegalArgumentException("cannot parse '" + set + "' on " + uri);
 				}
 			}
 

test/de/schildbach/pte/MvvProviderTest.java

@@ -17,13 +17,12 @@
 
 package de.schildbach.pte;
 
-import static junit.framework.Assert.assertNull;
 import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertNull;
 import static junit.framework.Assert.assertTrue;
 
 import java.util.regex.Matcher;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -71,8 +70,7 @@ public class MvvProviderTest
 	}
 
 	@Test
-	@Ignore("deactivated because there is no time")
+	public void tripSitzenbleiber()
-	public void tripWithoutTime()
 	{
 		final Matcher m = assertFineConnectionDetails("" //
 				+ "<td colspan=\"4\">ab Neufahrn  <a class=\"imgLink\" href=\"XSLT_TRIP_REQUEST2?language=de&amp;tripSelector2=on&amp;sessionID=MVV2_1678243657&amp;requestID=1&amp;tripSelection=on&amp;itdLPxx_view=map_2&amp;itdLPxx_img=FILELOAD?Filename=mvv2_4C45BE6910.png&amp;itdLPxx_partialRoute=2&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" //
@@ -87,8 +85,8 @@ public class MvvProviderTest
 				+ "<td colspan=\"4\">an Neufahrn  <a class=\"imgLink\" href=\"XSLT_TRIP_REQUEST2?language=de&amp;tripSelector2=on&amp;sessionID=MVV2_1678243657&amp;requestID=1&amp;tripSelection=on&amp;itdLPxx_view=map_2&amp;itdLPxx_img=FILELOAD?Filename=mvv2_4C45BE6911.png&amp;itdLPxx_partialRoute=2&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");
 
-		assertNotNull(m.group(2)); // departure
+		assertNull(m.group(1));
-		assertNotNull(m.group(3)); // product
+		assertNull(m.group(8));
 	}
 
 	@Test