mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-07 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed special case of position

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@121 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-09-01 09:18:41 +00:00
parent 9458f487bf
commit 4f174fe3f9
2 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/de/schildbach/pte/BahnProvider.java
View file

@ -442,12 +442,12 @@ public final class BahnProvider implements NetworkProvider
+ "Abfahrt (\\d+:\\d+)\\n?Uhr, (\\d+\\.\\d+\\.\\d+).*?" // currentTime + "Abfahrt (\\d+:\\d+)\\n?Uhr, (\\d+\\.\\d+\\.\\d+).*?" // currentTime
, Pattern.DOTALL); , Pattern.DOTALL);
private static final Pattern P_DEPARTURES_COARSE = Pattern.compile("<div class=\"sqdetailsDep trow\">\n(.+?)</div>", Pattern.DOTALL); private static final Pattern P_DEPARTURES_COARSE = Pattern.compile("<div class=\"sqdetailsDep trow\">\n(.+?)</div>", Pattern.DOTALL);
private static final Pattern P_DEPARTURES_FINE = Pattern.compile(".*?" // static final Pattern P_DEPARTURES_FINE = Pattern.compile(".*?" //
+ "<span class=\"bold\">(.*?)</span>.*?" // line + "<span class=\"bold\">(.*?)</span>.*?" // line
+ "&gt;&gt;\n\\s*(.+?)\\s*\n<br />\n" // destination + "&gt;&gt;\n\\s*(.+?)\\s*\n<br />\n" // destination
+ "<span class=\"bold\">(\\d{1,2}:\\d{2})</span>" // time + "<span class=\"bold\">(\\d{1,2}:\\d{2})</span>" // time
+ "(?:&nbsp;<span class=\"red\">ca. ([+-]?\\d+)</span>)?" // delay + "(?:&nbsp;<span class=\"red\">ca. ([+-]?\\d+)</span>)?" // delay
+ "(?:,&nbsp;(Gl\\. " + ParserUtils.P_PLATFORM + "))?" // position + "(?:(?:,&nbsp;)?(Gl\\. " + ParserUtils.P_PLATFORM + "))?" // position
, Pattern.DOTALL); , Pattern.DOTALL);
private static final Pattern P_DEPARTURES_URI_STATION_ID = Pattern.compile("input=(\\d+)"); private static final Pattern P_DEPARTURES_URI_STATION_ID = Pattern.compile("input=(\\d+)");
@ -770,6 +770,8 @@ public final class BahnProvider implements NetworkProvider
return "RZr" + number; return "RZr" + number;
if (type.equals("N")) // Frankreich, Tours, Orléans if (type.equals("N")) // Frankreich, Tours, Orléans
return "RN" + number; return "RN" + number;
if (type.equals("VE")) // Lutherstadt Wittenberg
return "RVE" + number;
if (type.equals("S")) if (type.equals("S"))
return "SS" + number; return "SS" + number;

21
test/de/schildbach/pte/BahnProviderTest.java
View file

@ -29,7 +29,7 @@ import org.junit.Test;
public class BahnProviderTest public class BahnProviderTest
{ {
@Test @Test
public void uebergang() public void connectionUebergang()
{ {
assertFineConnectionDetails("<span class=\"bold\">Berlin Hbf</span><br />\n" // assertFineConnectionDetails("<span class=\"bold\">Berlin Hbf</span><br />\n" //
+ "&#220;bergang\n" // + "&#220;bergang\n" //
@ -37,10 +37,29 @@ public class BahnProviderTest
+ "<span class=\"bold\">Berlin-Lichtenberg</span><br />"); + "<span class=\"bold\">Berlin-Lichtenberg</span><br />");
} }
@Test
public void departureWithPlatform()
{
assertFineDepartures("<a href=\"http://mobile.bahn.de/bin/mobil/traininfo.exe/dox/731061/244203/590672/51649/80/si=8100352&amp;bt=dep&amp;ti=10:42&amp;pt=10:42&amp;p=1111111111&amp;date=01.09.10&amp;max=10&amp;rt=1&amp;&amp;\">\n" //
+ "<span class=\"bold\">S 1</span>\n" //
+ "</a>\n" //
+ "&gt;&gt;\n" //
+ "G&#228;nserndorf\n" //
+ "<br />\n" //
+ "<span class=\"bold\">10:42</span>Gl. 1");
}
private void assertFineConnectionDetails(String s) private void assertFineConnectionDetails(String s)
{ {
Matcher m = BahnProvider.P_CONNECTION_DETAILS_FINE.matcher(s); Matcher m = BahnProvider.P_CONNECTION_DETAILS_FINE.matcher(s);
assertTrue(m.matches()); assertTrue(m.matches());
// ParserUtils.printGroups(m); // ParserUtils.printGroups(m);
} }
private void assertFineDepartures(String s)
{
Matcher m = BahnProvider.P_DEPARTURES_FINE.matcher(s);
assertTrue(m.matches());
// ParserUtils.printGroups(m);
}
} }