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

introduce query uri in QueryDeparturesResult and

Browse source 
remove maxDepartures parameter from queryDepartures()

git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@11 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-07-15 15:46:08 +00:00
parent 0388466320
commit c92b4f73e8
6 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -414,7 +414,7 @@ public final class BahnProvider implements NetworkProvider
private static final Pattern P_DEPARTURES_FINE = Pattern.compile(".*?<span class=\"bold\">(.*?)</span>.*?"
+ "&gt;&gt;\\n?\\s*(.+?)\\s*\\n?<br />\\n?<span class=\"bold\">(\\d+:\\d+)</span>.*?", Pattern.DOTALL);
public QueryDeparturesResult queryDepartures(final String uri, final int maxDepartures) throws IOException
public QueryDeparturesResult queryDepartures(final String uri) throws IOException
{
final CharSequence page = ParserUtils.scrape(uri);
@ -424,11 +424,11 @@ public final class BahnProvider implements NetworkProvider
{
final String location = ParserUtils.resolveEntities(mHead.group(1));
final Date currentTime = ParserUtils.joinDateTime(ParserUtils.parseDate(mHead.group(3)), ParserUtils.parseTime(mHead.group(2)));
final List<Departure> departures = new ArrayList<Departure>(maxDepartures);
final List<Departure> departures = new ArrayList<Departure>(8);
// choose matcher
final Matcher mDepCoarse = P_DEPARTURES_COARSE.matcher(page);
while (mDepCoarse.find() && (maxDepartures == 0 || departures.size() < maxDepartures))
while (mDepCoarse.find())
{
final Matcher mDepFine = P_DEPARTURES_FINE.matcher(mDepCoarse.group(1));
if (mDepFine.matches())
@ -443,7 +443,7 @@ public final class BahnProvider implements NetworkProvider
}
}
return new QueryDeparturesResult(location, currentTime, departures);
return new QueryDeparturesResult(uri, location, currentTime, departures);
}
else
{