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

parse disableTrainInfo attribute in xmlQueryDepartures

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@659 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-05-25 15:26:27 +00:00
parent 5d6d496a35
commit a373d599db
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/de/schildbach/pte/AbstractHafasProvider.java
View file

@ -421,15 +421,16 @@ public abstract class AbstractHafasProvider implements NetworkProvider
+ "(?:e_delay\\s*=\"\\d+\"\\s*)?" // (???) + "(?:e_delay\\s*=\"\\d+\"\\s*)?" // (???)
+ "(?:newpl\\s*=\"([^\"]*)\"\\s*)?" // + "(?:newpl\\s*=\"([^\"]*)\"\\s*)?" //
+ "(?:platform\\s*=\"([^\"]*)\"\\s*)?" // position + "(?:platform\\s*=\"([^\"]*)\"\\s*)?" // position
+ "targetLoc\\s*=\"([^\"]*)\"\\s*" // destination + "(?:targetLoc\\s*=\"([^\"]*)\"\\s*)?" // destination
+ "(?:hafasname\\s*=\"([^\"]*)\"\\s*)?" // line + "(?:hafasname\\s*=\"([^\"]*)\"\\s*)?" // line
+ "prod\\s*=\"([^\"]*)\"\\s*" // line + "prod\\s*=\"([^\"]*)\"\\s*" // line
+ "(?:class\\s*=\"([^\"]*)\"\\s*)?" // class + "(?:class\\s*=\"([^\"]*)\"\\s*)?" // class
+ "(?:dir\\s*=\"[^\"]*\"\\s*)?" // (destination) + "(?:dir\\s*=\"([^\"]*)\"\\s*)?" // destination
+ "(?:capacity\\s*=\"[^\"]*\"\\s*)?" // (???) + "(?:capacity\\s*=\"[^\"]*\"\\s*)?" // (???)
+ "(?:depStation\\s*=\"(.*?)\"\\s*)?" // + "(?:depStation\\s*=\"(.*?)\"\\s*)?" //
+ "(?:delayReason\\s*=\"([^\"]*)\"\\s*)?" // message + "(?:delayReason\\s*=\"([^\"]*)\"\\s*)?" // message
+ "(?:is_reachable\\s*=\"([^\"]*)\"\\s*)?" // (???) + "(?:is_reachable\\s*=\"[^\"]*\"\\s*)?" // (???)
+ "(?:disableTrainInfo\\s*=\"[^\"]*\"\\s*)?" // (???)
); );
private static final Pattern P_XML_QUERY_DEPARTURES_MESSAGES = Pattern.compile("<Err code=\"([^\"]*)\" text=\"([^\"]*)\""); private static final Pattern P_XML_QUERY_DEPARTURES_MESSAGES = Pattern.compile("<Err code=\"([^\"]*)\" text=\"([^\"]*)\"");
@ -468,7 +469,7 @@ public abstract class AbstractHafasProvider implements NetworkProvider
final Matcher mFine = P_XML_QUERY_DEPARTURES_FINE.matcher(mCoarse.group(1)); final Matcher mFine = P_XML_QUERY_DEPARTURES_FINE.matcher(mCoarse.group(1));
if (mFine.matches()) if (mFine.matches())
{ {
if (mFine.group(10) == null) if (mFine.group(11) == null)
{ {
final Calendar plannedTime = new GregorianCalendar(timeZone()); final Calendar plannedTime = new GregorianCalendar(timeZone());
plannedTime.clear(); plannedTime.clear();
@ -495,7 +496,13 @@ public abstract class AbstractHafasProvider implements NetworkProvider
final String position = mFine.group(5) != null ? "Gl. " + ParserUtils.resolveEntities(mFine.group(5)) : null; final String position = mFine.group(5) != null ? "Gl. " + ParserUtils.resolveEntities(mFine.group(5)) : null;
final String destination = ParserUtils.resolveEntities(mFine.group(6)).trim(); final String destination;
if (mFine.group(10) != null)
destination = ParserUtils.resolveEntities(mFine.group(10)).trim();
else if (mFine.group(6) != null)
destination = ParserUtils.resolveEntities(mFine.group(6)).trim();
else
destination = null;
final String hafasName = ParserUtils.resolveEntities(mFine.group(7)); final String hafasName = ParserUtils.resolveEntities(mFine.group(7));
@ -509,9 +516,9 @@ public abstract class AbstractHafasProvider implements NetworkProvider
final String line = product != 0 ? product + prod : normalizeLine(prod); final String line = product != 0 ? product + prod : normalizeLine(prod);
final String message; final String message;
if (mFine.group(11) != null) if (mFine.group(12) != null)
{ {
final String msg = ParserUtils.resolveEntities(mFine.group(11)).trim(); final String msg = ParserUtils.resolveEntities(mFine.group(12)).trim();
message = msg.length() > 0 ? msg : null; message = msg.length() > 0 ? msg : null;
} }
else else