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

In mobile trips query (EFA), skip parsing of <seqroutes> and make <tcs> optional.

Browse source
This commit is contained in:
Andreas Schildbach 2014-10-12 19:43:56 +02:00
parent bae806d5cc
commit 05b5a56cd5
1 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

36
enabler/src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -3057,30 +3057,36 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
XmlPullUtil.skipExit(pp, "ls"); XmlPullUtil.skipExit(pp, "ls");
XmlPullUtil.require(pp, "tcs"); XmlPullUtil.optSkip(pp, "seqroutes");
final List<Fare> fares; final List<Fare> fares;
if (XmlPullUtil.test(pp, "tcs"))
if (!pp.isEmptyElementTag())
{ {
XmlPullUtil.enter(pp, "tcs"); if (!pp.isEmptyElementTag())
fares = new ArrayList<Fare>(2);
while (XmlPullUtil.test(pp, "tc"))
{ {
XmlPullUtil.enter(pp, "tc"); XmlPullUtil.enter(pp, "tcs");
// TODO fares
XmlPullUtil.skipExit(pp, "tc");
}
XmlPullUtil.skipExit(pp, "tcs"); fares = new ArrayList<Fare>(2);
while (XmlPullUtil.test(pp, "tc"))
{
XmlPullUtil.enter(pp, "tc");
// TODO fares
XmlPullUtil.skipExit(pp, "tc");
}
XmlPullUtil.skipExit(pp, "tcs");
}
else
{
fares = null;
XmlPullUtil.next(pp);
}
} }
else else
{ {
fares = null; fares = null;
XmlPullUtil.next(pp);
} }
final Trip trip = new Trip(tripId, firstDepartureLocation, lastArrivalLocation, legs, fares, null, numChanges); final Trip trip = new Trip(tripId, firstDepartureLocation, lastArrivalLocation, legs, fares, null, numChanges);