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

Fix extxml handling

Browse source
This commit is contained in:
Andreas Schildbach 2013-11-08 17:02:14 +01:00
parent 29dc8482f6
commit 229e88eaf4
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -92,6 +92,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
private boolean dominantPlanStopTime = false; private boolean dominantPlanStopTime = false;
private boolean canDoEquivs = true; private boolean canDoEquivs = true;
private boolean useIso8601 = false; private boolean useIso8601 = false;
private String extXmlEndpoint = null;
private static class Context implements QueryTripsContext private static class Context implements QueryTripsContext
{ {
@ -195,6 +196,11 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
this.useIso8601 = useIso8601; this.useIso8601 = useIso8601;
} }
protected void setExtXmlEndpoint(final String extXmlEndpoint)
{
this.extXmlEndpoint = extXmlEndpoint;
}
protected TimeZone timeZone() protected TimeZone timeZone()
{ {
return TimeZone.getTimeZone("CET"); return TimeZone.getTimeZone("CET");
@ -1058,7 +1064,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
try try
{ {
reader = new InputStreamReader(ParserUtils.scrapeInputStream(queryEndpoint, wrap(request, null), null, null, null, 3), ISO_8859_1); final String endpoint = extXmlEndpoint != null ? extXmlEndpoint : queryEndpoint;
reader = new InputStreamReader(ParserUtils.scrapeInputStream(endpoint, wrap(request, null), null, null, null, 3), ISO_8859_1);
final XmlPullParserFactory factory = XmlPullParserFactory.newInstance(System.getProperty(XmlPullParserFactory.PROPERTY_NAME), null); final XmlPullParserFactory factory = XmlPullParserFactory.newInstance(System.getProperty(XmlPullParserFactory.PROPERTY_NAME), null);
final XmlPullParser pp = factory.newPullParser(); final XmlPullParser pp = factory.newPullParser();

3
enabler/src/de/schildbach/pte/InvgProvider.java
View file

@ -54,9 +54,10 @@ public class InvgProvider extends AbstractHafasProvider
public InvgProvider() public InvgProvider()
{ {
super(API_BASE + "stboard.exe/dn", null, API_BASE + "extxml.exe", 10); super(API_BASE + "stboard.exe/dn", null, API_BASE + "query.exe/dn", 10);
setStyles(STYLES); setStyles(STYLES);
setExtXmlEndpoint(API_BASE + "extxml.exe");
} }
public NetworkId id() public NetworkId id()

3
enabler/src/de/schildbach/pte/SbbProvider.java
View file

@ -37,9 +37,10 @@ public class SbbProvider extends AbstractHafasProvider
public SbbProvider(final String accessId) public SbbProvider(final String accessId)
{ {
super(API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "extxml.exe", 10); super(API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", 10);
setAccessId(accessId); setAccessId(accessId);
setExtXmlEndpoint(API_BASE + "extxml.exe");
} }
public NetworkId id() public NetworkId id()