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

'invalid station' detection

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@416 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2010-12-26 10:24:00 +00:00
parent f50951a8e3
commit a26e762a6b
1 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/de/schildbach/pte/BvgProvider.java
View file

@ -118,6 +118,7 @@ public final class BvgProvider extends AbstractHafasProvider
private final static Pattern P_NEARBY_PAGE = Pattern.compile("<table class=\"ivuTableOverview\".*?<tbody>(.*?)</tbody>", Pattern.DOTALL);
private final static Pattern P_NEARBY_COARSE = Pattern.compile("<tr>(.*?)</tr>", Pattern.DOTALL);
private final static Pattern P_NEARBY_FINE_LOCATION = Pattern.compile("input=(\\d+)&[^\"]*\">([^<]*)<");
private static final Pattern P_NEARBY_ERRORS = Pattern.compile("(derzeit leider nicht bearbeitet werden)");
@Override
public NearbyStationsResult nearbyStations(final String stationId, final int lat, final int lon, final int maxDistance, final int maxStations)
@ -131,6 +132,13 @@ public final class BvgProvider extends AbstractHafasProvider
final String uri = nearbyStationUri(stationId);
final CharSequence page = ParserUtils.scrape(uri);
final Matcher mError = P_NEARBY_ERRORS.matcher(page);
if (mError.find())
{
if (mError.group(1) != null)
return new NearbyStationsResult(NearbyStationsResult.Status.INVALID_STATION);
}
final Matcher mOwn = P_NEARBY_OWN.matcher(page);
if (mOwn.find())
{
@ -550,14 +558,21 @@ public final class BvgProvider extends AbstractHafasProvider
+ "<a href=\"/Fahrinfo/bin/stboard\\.bin/dox/dox.*?evaId=(\\d+)&[^>]*>" // destinationId
+ "\\s*(.*?)\\s*</a>.*?" // destination
, Pattern.DOTALL);
private static final Pattern P_DEPARTURES_SERVICE_DOWN = Pattern.compile("Wartungsarbeiten");
private static final Pattern P_DEPARTURES_ERRORS = Pattern.compile("(derzeit leider nicht bearbeitet werden)|(Wartungsarbeiten)");
public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures) throws IOException
{
final CharSequence page = ParserUtils.scrape(departuresQueryUri(stationId, maxDepartures));
final String uri = departuresQueryUri(stationId, maxDepartures);
final CharSequence page = ParserUtils.scrape(uri);
if (P_DEPARTURES_SERVICE_DOWN.matcher(page).find())
final Matcher mError = P_DEPARTURES_ERRORS.matcher(page);
if (mError.find())
{
if (mError.group(1) != null)
return new QueryDeparturesResult(Status.INVALID_STATION, Integer.parseInt(stationId));
if (mError.group(2) != null)
return new QueryDeparturesResult(Status.SERVICE_DOWN, Integer.parseInt(stationId));
}
final boolean live = stationId.length() == 6;
@ -610,7 +625,7 @@ public final class BvgProvider extends AbstractHafasProvider
}
else
{
throw new IllegalArgumentException("cannot parse '" + mDepCoarse.group(1) + "' on " + stationId);
throw new IllegalArgumentException("cannot parse '" + mDepCoarse.group(1) + "' on " + uri);
}
}
@ -618,7 +633,7 @@ public final class BvgProvider extends AbstractHafasProvider
}
else
{
return new QueryDeparturesResult(Status.NO_INFO, Integer.parseInt(stationId));
throw new IllegalArgumentException("cannot parse '" + page + "' on " + uri);
}
}