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

remove superfluous departureQueryUri() method from interface

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@304 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-10-17 15:50:02 +00:00
parent 1e49dd0e46
commit 4d4355ac4f
36 changed files with 126 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/de/schildbach/pte/SbbProvider.java
View file

@ -367,7 +367,7 @@ public class SbbProvider extends AbstractHafasProvider
}
public String departuresQueryUri(final String stationId, final int maxDepartures)
private String departuresQueryUri(final String stationId, final int maxDepartures)
{
final StringBuilder uri = new StringBuilder();
uri.append(API_BASE).append("bhftafel.exe/dox");
@ -407,9 +407,9 @@ public class SbbProvider extends AbstractHafasProvider
+ ".*?" //
, Pattern.DOTALL);
public QueryDeparturesResult queryDepartures(final String uri) throws IOException
public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures) throws IOException
{
final CharSequence page = ParserUtils.scrape(uri);
final CharSequence page = ParserUtils.scrape(departuresQueryUri(stationId, maxDepartures));
// parse page
final Matcher mHeadCoarse = P_DEPARTURES_HEAD_COARSE.matcher(page);
@ -417,11 +417,11 @@ public class SbbProvider extends AbstractHafasProvider
{
// messages
if (mHeadCoarse.group(3) != null)
return new QueryDeparturesResult(uri, Status.NO_INFO);
return new QueryDeparturesResult( Status.NO_INFO, Integer.parseInt(stationId));
else if (mHeadCoarse.group(5) != null)
return new QueryDeparturesResult(uri, Status.INVALID_STATION);
return new QueryDeparturesResult( Status.INVALID_STATION, Integer.parseInt(stationId));
else if (mHeadCoarse.group(6) != null)
return new QueryDeparturesResult(uri, Status.SERVICE_DOWN);
return new QueryDeparturesResult( Status.SERVICE_DOWN, Integer.parseInt(stationId));
final String head = mHeadCoarse.group(1) + mHeadCoarse.group(4);
final Matcher mHeadFine = P_DEPARTURES_HEAD_FINE.matcher(head);
@ -469,20 +469,20 @@ public class SbbProvider extends AbstractHafasProvider
}
else
{
throw new IllegalArgumentException("cannot parse '" + mDepCoarse.group(1) + "' on " + uri);
throw new IllegalArgumentException("cannot parse '" + mDepCoarse.group(1) + "' on " + stationId);
}
}
return new QueryDeparturesResult(uri, locationId, location, departures);
return new QueryDeparturesResult(locationId, location, departures);
}
else
{
throw new IllegalArgumentException("cannot parse '" + head + "' on " + uri);
throw new IllegalArgumentException("cannot parse '" + head + "' on " + stationId);
}
}
else
{
throw new IllegalArgumentException("cannot parse '" + page + "' on " + uri);
throw new IllegalArgumentException("cannot parse '" + page + "' on " + stationId);
}
}