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

parse multiple messages

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@150 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-09-08 08:19:24 +00:00
parent 138be61f7f
commit d7aa7aa4f1
2 changed files with 46 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -446,12 +446,17 @@ public final class BahnProvider implements NetworkProvider
, 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);
static final Pattern P_DEPARTURES_FINE = Pattern.compile(".*?" // static final Pattern P_DEPARTURES_FINE = Pattern.compile(".*?" //
+ "<span class=\"bold\">(.*?)</span>.*?" // line + "<a href=\"http://mobile\\.bahn\\.de/bin/mobil/traininfo.exe/dox[^\"]*\">\n" //
+ "&gt;&gt;\n\\s*(.+?)\\s*\n<br />\n" // destination + "<span class=\"bold\">(.*?)</span>\n" // line
+ "</a>\n" //
+ "&gt;&gt;\n" //
+ "\\s*(.+?)\\s*\n" // destination
+ "<br />\n" //
+ "<span class=\"bold\">(\\d{1,2}:\\d{2})</span>" // time + "<span class=\"bold\">(\\d{1,2}:\\d{2})</span>" // time
+ "(?:&nbsp;<span class=\"[\\w ]*\">(?:(p&#252;nktl\\.)|ca. \\+(\\d+))</span>)?" // ontime, delay + "(?:&nbsp;<span class=\"[\\w ]*\">(?:(p&#252;nktl\\.)|ca. \\+(\\d+))</span>)?" // ontime, delay
+ "(?:&nbsp;k\\.A\\.)?" // + "(?:&nbsp;k\\.A\\.)?" //
+ "(?:, <span class=\"red\">([^<]*)</span>)?" // message + "(?:, <span class=\"red\">([^<]*)</span>)?" // message
+ "(?:,<br/><a[^>]*><span class=\"red\">[^<]*</a></span>)?" // (ersatzzug message)
+ "(?:(?:,&nbsp;)?(?:<span class=\"red\">heute )?(Gl\\. " + ParserUtils.P_PLATFORM + ")(?:\\s*</span>)?)?" // position + "(?:(?:,&nbsp;)?(?:<span class=\"red\">heute )?(Gl\\. " + ParserUtils.P_PLATFORM + ")(?:\\s*</span>)?)?" // 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+)");

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

@ -42,7 +42,7 @@ public class BahnProviderTest
@Test @Test
public void departureWithPlatform() public void departureWithPlatform()
{ {
assertFineDepartures("" // final Matcher m = 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" // + "<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" // + "<span class=\"bold\">S 1</span>\n" //
+ "</a>\n" // + "</a>\n" //
@ -50,12 +50,14 @@ public class BahnProviderTest
+ "G&#228;nserndorf\n" // + "G&#228;nserndorf\n" //
+ "<br />\n" // + "<br />\n" //
+ "<span class=\"bold\">10:42</span>Gl. 1"); + "<span class=\"bold\">10:42</span>Gl. 1");
assertNotNull(m.group(7)); // position
} }
@Test @Test
public void departureWithOnTime() public void departureWithOnTime()
{ {
assertFineDepartures("" // final Matcher m = assertFineDepartures("" //
+ "<a href=\"http://mobile.bahn.de/bin/mobil/traininfo.exe/dox/438441/245165/958/145668/80/si=8011160&amp;bt=dep&amp;ti=21:47&amp;pt=21:47&amp;p=1111101&amp;date=05.09.10&amp;max=10&amp;rt=1&amp;&amp;\">\n" // + "<a href=\"http://mobile.bahn.de/bin/mobil/traininfo.exe/dox/438441/245165/958/145668/80/si=8011160&amp;bt=dep&amp;ti=21:47&amp;pt=21:47&amp;p=1111101&amp;date=05.09.10&amp;max=10&amp;rt=1&amp;&amp;\">\n" //
+ "<span class=\"bold\">RE 38148</span>\n" // + "<span class=\"bold\">RE 38148</span>\n" //
+ "</a>\n" // + "</a>\n" //
@ -63,12 +65,14 @@ public class BahnProviderTest
+ "Rathenow\n" // + "Rathenow\n" //
+ "<br />\n" // + "<br />\n" //
+ "<span class=\"bold\">21:58</span>&nbsp;<span class=\"green bold\">p&#252;nktl.</span>,&nbsp;Gl. 13"); + "<span class=\"bold\">21:58</span>&nbsp;<span class=\"green bold\">p&#252;nktl.</span>,&nbsp;Gl. 13");
assertNotNull(m.group(7)); // position
} }
@Test @Test
public void departureWithMessage() public void departureWithMessage()
{ {
assertFineDepartures("" // final Matcher m = assertFineDepartures("" //
+ "<a href=\"http://mobile.bahn.de/bin/mobil/traininfo.exe/dox/551037/330609/12448/177455/80/si=405341&amp;bt=dep&amp;ti=07:08&amp;pt=07:08&amp;p=1111111111&amp;date=06.09.10&amp;max=10&amp;rt=1&amp;&amp;\">\n" // + "<a href=\"http://mobile.bahn.de/bin/mobil/traininfo.exe/dox/551037/330609/12448/177455/80/si=405341&amp;bt=dep&amp;ti=07:08&amp;pt=07:08&amp;p=1111111111&amp;date=06.09.10&amp;max=10&amp;rt=1&amp;&amp;\">\n" //
+ "<span class=\"bold\">ICE 824</span>\n" // + "<span class=\"bold\">ICE 824</span>\n" //
+ "</a>\n" // + "</a>\n" //
@ -76,12 +80,15 @@ public class BahnProviderTest
+ "Dortmund Hbf\n" // + "Dortmund Hbf\n" //
+ "<br />\n" // + "<br />\n" //
+ "<span class=\"bold\">07:02</span>&nbsp;<span class=\"red\">ca. +5</span>, <span class=\"red\">F&#228;hrt heute nur bis&nbsp;D&#252;sseldorf Hbf</span>,&nbsp;Gl. 10"); + "<span class=\"bold\">07:02</span>&nbsp;<span class=\"red\">ca. +5</span>, <span class=\"red\">F&#228;hrt heute nur bis&nbsp;D&#252;sseldorf Hbf</span>,&nbsp;Gl. 10");
assertNotNull(m.group(6)); // message
assertNotNull(m.group(7)); // position
} }
@Test @Test
public void departureUpdatedPosition() public void departureUpdatedPosition()
{ {
assertFineDepartures("" // final Matcher m = assertFineDepartures("" //
+ "<a href=\"http://mobile.bahn.de/bin/mobil/traininfo.exe/dox/492282/296365/292060/18065/80/si=8000320&amp;bt=dep&amp;ti=17:08&amp;pt=17:08&amp;p=1111111111&amp;date=07.09.10&amp;max=10&amp;rt=1&amp;&amp;\">\n" // + "<a href=\"http://mobile.bahn.de/bin/mobil/traininfo.exe/dox/492282/296365/292060/18065/80/si=8000320&amp;bt=dep&amp;ti=17:08&amp;pt=17:08&amp;p=1111111111&amp;date=07.09.10&amp;max=10&amp;rt=1&amp;&amp;\">\n" //
+ "<span class=\"bold\">RB 30240</span>\n" // + "<span class=\"bold\">RB 30240</span>\n" //
+ "</a>\n" // + "</a>\n" //
@ -89,12 +96,14 @@ public class BahnProviderTest
+ "Holzkirchen\n" // + "Holzkirchen\n" //
+ "<br />\n" // + "<br />\n" //
+ "<span class=\"bold\">17:10</span>&nbsp;<span class=\"green bold\">p&#252;nktl.</span>,&nbsp;<span class=\"red\">heute Gl. 7 </span>"); + "<span class=\"bold\">17:10</span>&nbsp;<span class=\"green bold\">p&#252;nktl.</span>,&nbsp;<span class=\"red\">heute Gl. 7 </span>");
assertNotNull(m.group(7)); // position
} }
@Test @Test
public void departureMessageAndUpdatedPosition() public void departureMessageAndUpdatedPosition()
{ {
assertFineDepartures("" // final Matcher m = assertFineDepartures("" //
+ "<a href=\"http://mobile.bahn.de/bin/mobil/traininfo.exe/dox/220206/221797/157782/5489/80/si=727269&amp;bt=dep&amp;ti=19:56&amp;pt=19:56&amp;p=1111111111&amp;date=06.09.10&amp;max=10&amp;rt=1&amp;&amp;\">\n" // + "<a href=\"http://mobile.bahn.de/bin/mobil/traininfo.exe/dox/220206/221797/157782/5489/80/si=727269&amp;bt=dep&amp;ti=19:56&amp;pt=19:56&amp;p=1111111111&amp;date=06.09.10&amp;max=10&amp;rt=1&amp;&amp;\">\n" //
+ "<span class=\"bold\">CNL 450</span>\n" // + "<span class=\"bold\">CNL 450</span>\n" //
+ "</a>\n" // + "</a>\n" //
@ -102,12 +111,15 @@ public class BahnProviderTest
+ "Paris Est\n" // + "Paris Est\n" //
+ "<br />\n" // + "<br />\n" //
+ "<span class=\"bold\">19:57</span>&nbsp;<span class=\"green bold\">p&#252;nktl.</span>, <span class=\"red\">&#196;nderung im Zuglauf!</span>,&nbsp;<span class=\"red\">heute Gl. 7 </span>"); + "<span class=\"bold\">19:57</span>&nbsp;<span class=\"green bold\">p&#252;nktl.</span>, <span class=\"red\">&#196;nderung im Zuglauf!</span>,&nbsp;<span class=\"red\">heute Gl. 7 </span>");
assertNotNull(m.group(6)); // message
assertNotNull(m.group(7)); // position
} }
@Test @Test
public void departureWithWeirdMessage() public void departureWithWeirdMessage()
{ {
assertFineDepartures("" // final Matcher m = assertFineDepartures("" //
+ "<a href=\"http://mobile.bahn.de/bin/mobil/traininfo.exe/dox/760983/402261/557174/24926/80/si=808093&amp;bt=dep&amp;ti=02:41&amp;pt=02:41&amp;p=1111111111&amp;date=06.09.10&amp;max=10&amp;rt=1&amp;&amp;\">\n" // + "<a href=\"http://mobile.bahn.de/bin/mobil/traininfo.exe/dox/760983/402261/557174/24926/80/si=808093&amp;bt=dep&amp;ti=02:41&amp;pt=02:41&amp;p=1111111111&amp;date=06.09.10&amp;max=10&amp;rt=1&amp;&amp;\">\n" //
+ "<span class=\"bold\">ICE 609</span>\n" // + "<span class=\"bold\">ICE 609</span>\n" //
+ "</a>\n" // + "</a>\n" //
@ -115,6 +127,23 @@ public class BahnProviderTest
+ "Basel SBB\n" // + "Basel SBB\n" //
+ "<br />\n" // + "<br />\n" //
+ "<span class=\"bold\">04:52</span>&nbsp;k.A.,&nbsp;Gl. 3"); + "<span class=\"bold\">04:52</span>&nbsp;k.A.,&nbsp;Gl. 3");
assertNotNull(m.group(7)); // position
}
@Test
public void departureWithMultipleMessages()
{
final Matcher m = assertFineDepartures("" //
+ "<a href=\"http://mobile.bahn.de/bin/mobil/traininfo.exe/dox/208035/206616/13568/62563/80/si=624141&amp;bt=dep&amp;ti=09:34&amp;pt=09:34&amp;p=1111111111&amp;date=08.09.10&amp;max=10&amp;rt=1&amp;&amp;\">\n" //
+ "<span class=\"bold\">S 1</span>\n" //
+ "</a>\n" //
+ "&gt;&gt;\n" //
+ "M&#252;nchen Ost\n" //
+ "<br />\n" //
+ "<span class=\"bold\">10:27</span>, <span class=\"red\">Zug f&#228;llt aus</span>,<br/><a class=\"red underline\" href=\"http://mobile.bahn.de/bin/mobil/traininfo.exe/dox/144627/793698/280606/92094/80?ld=96159&amp;rt=1&amp;use_realtime_filter=1&amp;date=08.09.10&amp;time=10:27&amp;station_evaId=8001647&amp;station_type=dep&amp;\"><span class=\"red\">Ersatzzug&nbsp;S </a></span>");
assertNotNull(m.group(6)); // message
} }
private void assertFineConnectionDetails(String s) private void assertFineConnectionDetails(String s)
@ -125,16 +154,17 @@ public class BahnProviderTest
// ParserUtils.printGroups(m); // ParserUtils.printGroups(m);
} }
private void assertFineDepartures(String s) private Matcher assertFineDepartures(String s)
{ {
Matcher m = BahnProvider.P_DEPARTURES_FINE.matcher(s); Matcher m = BahnProvider.P_DEPARTURES_FINE.matcher(s);
assertTrue(m.matches()); assertTrue(m.matches());
// ParserUtils.printGroups(m); ParserUtils.printGroups(m);
assertNotNull(m.group(1)); // line assertNotNull(m.group(1)); // line
assertNotNull(m.group(2)); // destination assertNotNull(m.group(2)); // destination
assertNotNull(m.group(3)); // time assertNotNull(m.group(3)); // time
assertNotNull(m.group(7)); // departure
return m;
} }
} }