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

Hafas: Handle invalid station ID when querying for nearby stations by ID.

Browse source
This commit is contained in:
Andreas Schildbach 2015-08-26 13:27:12 +02:00
parent 4877bf1da3
commit 26199d7ec3
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
enabler/src/de/schildbach/pte/AbstractHafasProvider.java
View file

@ -2519,9 +2519,10 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
private Pattern htmlNearbyStationsPattern = Pattern.compile("<tr class=\"(zebra[^\"]*)\">(.*?)</tr>", Pattern.DOTALL); private Pattern htmlNearbyStationsPattern = Pattern.compile("<tr class=\"(zebra[^\"]*)\">(.*?)</tr>", Pattern.DOTALL);
private final static Pattern P_NEARBY_FINE_COORDS = Pattern private static final Pattern P_HTML_NEARBY_FINE_COORDS = Pattern
.compile("REQMapRoute0\\.Location0\\.X=(-?\\d+)&(?:amp;)?REQMapRoute0\\.Location0\\.Y=(-?\\d+)&"); .compile("REQMapRoute0\\.Location0\\.X=(-?\\d+)&(?:amp;)?REQMapRoute0\\.Location0\\.Y=(-?\\d+)&");
private final static Pattern P_NEARBY_FINE_LOCATION = Pattern.compile("[\\?&;]input=(\\d+)&[^\"]*\">([^<]*)<"); private static final Pattern P_HTML_NEARBY_STATIONS_FINE_LOCATION = Pattern.compile("[\\?&;]input=(\\d+)&[^\"]*\">([^<]*)<");
private static final Pattern P_HTML_NEARBY_STATIONS_MESSAGES = Pattern.compile("(Ihre Eingabe kann nicht interpretiert werden)");
protected final NearbyLocationsResult htmlNearbyStations(final String uri) throws IOException protected final NearbyLocationsResult htmlNearbyStations(final String uri) throws IOException
{ {
@ -2532,6 +2533,13 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
final Matcher mCoarse = htmlNearbyStationsPattern.matcher(page); final Matcher mCoarse = htmlNearbyStationsPattern.matcher(page);
final Matcher mMessage = P_HTML_NEARBY_STATIONS_MESSAGES.matcher(page);
if (mMessage.find())
{
if (mMessage.group(1) != null)
return new NearbyLocationsResult(null, NearbyLocationsResult.Status.INVALID_ID);
}
while (mCoarse.find()) while (mCoarse.find())
{ {
final String zebra = mCoarse.group(1); final String zebra = mCoarse.group(1);
@ -2540,7 +2548,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
else else
oldZebra = zebra; oldZebra = zebra;
final Matcher mFineLocation = P_NEARBY_FINE_LOCATION.matcher(mCoarse.group(2)); final Matcher mFineLocation = P_HTML_NEARBY_STATIONS_FINE_LOCATION.matcher(mCoarse.group(2));
if (mFineLocation.find()) if (mFineLocation.find())
{ {
@ -2549,7 +2557,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
final String parsedId = mFineLocation.group(1); final String parsedId = mFineLocation.group(1);
final String parsedName = ParserUtils.resolveEntities(mFineLocation.group(2)); final String parsedName = ParserUtils.resolveEntities(mFineLocation.group(2));
final Matcher mFineCoords = P_NEARBY_FINE_COORDS.matcher(mCoarse.group(2)); final Matcher mFineCoords = P_HTML_NEARBY_FINE_COORDS.matcher(mCoarse.group(2));
if (mFineCoords.find()) if (mFineCoords.find())
{ {