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

several sanity checks

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@256 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-10-09 12:22:19 +00:00
parent 6f7938a2d1
commit 237c9b0397
1 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -310,6 +310,8 @@ public abstract class AbstractEfaProvider implements NetworkProvider
return 'R' + str;
if (type.equals("RE")) // Regional-Express
return 'R' + str;
if (type.equals("R-Bahn")) // Regional-Express, VRR
return 'R' + str;
if (P_LINE_RE.matcher(type).matches())
return 'R' + str;
if (type.equals("RB")) // Regionalbahn
@ -487,7 +489,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider
if (P_LINE_NUMBER.matcher(type).matches())
return "?";
throw new IllegalArgumentException("cannot normalize: " + longName);
throw new IllegalArgumentException("cannot normalize: long '" + longName + "' type '" + type + "'");
}
if (t == 1)
return 'S' + name;
@ -650,16 +652,19 @@ public abstract class AbstractEfaProvider implements NetworkProvider
final XmlPullParser pp = factory.newPullParser();
pp.setInput(new StringReader(page.toString()));
XmlPullUtil.jumpToStartTag(pp, null, "itdRequest");
if (!XmlPullUtil.jumpToStartTag(pp, null, "itdRequest"))
throw new IllegalStateException("cannot find <itdRequest />");
final String sessionId = pp.getAttributeValue(null, "sessionID");
if (!XmlPullUtil.jumpToStartTag(pp, null, "itdTripRequest"))
throw new IllegalStateException("cannot find <itdTripRequest />");
// parse odv name elements
List<Location> ambiguousFrom = null, ambiguousTo = null, ambiguousVia = null;
Location from = null, via = null, to = null;
XmlPullUtil.jumpToStartTag(pp, null, "itdOdv");
if (!"origin".equals(pp.getAttributeValue(null, "usage")))
throw new IllegalStateException();
if (!XmlPullUtil.jumpToStartTag(pp, null, "itdOdv") || !"origin".equals(pp.getAttributeValue(null, "usage")))
throw new IllegalStateException("cannot find <itdOdv usage=\"origin\" />");
XmlPullUtil.nextStartTagInsideTree(pp, null, "itdOdvName");
final String originState = pp.getAttributeValue(null, "state");
if ("list".equals(originState))
@ -674,9 +679,8 @@ public abstract class AbstractEfaProvider implements NetworkProvider
from = processOdvNameElem(pp);
}
XmlPullUtil.jumpToStartTag(pp, null, "itdOdv");
if (!"destination".equals(pp.getAttributeValue(null, "usage")))
throw new IllegalStateException();
if (!XmlPullUtil.jumpToStartTag(pp, null, "itdOdv") || !"destination".equals(pp.getAttributeValue(null, "usage")))
throw new IllegalStateException("cannot find <itdOdv usage=\"destination\" />");
XmlPullUtil.nextStartTagInsideTree(pp, null, "itdOdvName");
final String destinationState = pp.getAttributeValue(null, "state");
if ("list".equals(destinationState))
@ -691,9 +695,8 @@ public abstract class AbstractEfaProvider implements NetworkProvider
to = processOdvNameElem(pp);
}
XmlPullUtil.jumpToStartTag(pp, null, "itdOdv");
if (!"via".equals(pp.getAttributeValue(null, "usage")))
throw new IllegalStateException();
if (!XmlPullUtil.jumpToStartTag(pp, null, "itdOdv") || !"via".equals(pp.getAttributeValue(null, "usage")))
throw new IllegalStateException("cannot find <itdOdv usage=\"via\" />");
XmlPullUtil.nextStartTagInsideTree(pp, null, "itdOdvName");
final String viaState = pp.getAttributeValue(null, "state");
if ("list".equals(viaState))
@ -711,6 +714,9 @@ public abstract class AbstractEfaProvider implements NetworkProvider
if (ambiguousFrom != null || ambiguousTo != null || ambiguousVia != null)
return new QueryConnectionsResult(ambiguousFrom, ambiguousVia, ambiguousTo);
if (!XmlPullUtil.jumpToStartTag(pp, null, "itdTripDateTime"))
throw new IllegalStateException("cannot find <itdTripDateTime />");
final Calendar departureTime = new GregorianCalendar(), arrivalTime = new GregorianCalendar();
final List<Connection> connections = new ArrayList<Connection>();