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

fixed missing connection parts

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@722 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-06-25 09:46:39 +00:00
parent 96f5e79413
commit b582708020
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/de/schildbach/pte/BahnProvider.java
View file

@ -388,7 +388,8 @@ public final class BahnProvider extends AbstractHafasProvider
private static final Pattern P_CONNECTION_DETAILS_HEAD = Pattern.compile(".*?" // private static final Pattern P_CONNECTION_DETAILS_HEAD = Pattern.compile(".*?" //
+ "<span class=\"bold\">Verbindungsdetails</span>(.*?)<div class=\"rline\"></div>.*?", Pattern.DOTALL); + "<span class=\"bold\">Verbindungsdetails</span>(.*?)<div class=\"rline\"></div>.*?", Pattern.DOTALL);
private static final Pattern P_CONNECTION_DETAILS_COARSE = Pattern.compile("<div class=\"rline haupt(?: rline)?\"\\s*>\n(.+?>\n)</div>", Pattern.DOTALL); private static final Pattern P_CONNECTION_DETAILS_COARSE = Pattern.compile("<div class=\"rline haupt(?: rline)?\"\\s*>\n(.+?>\n)</div>",
Pattern.DOTALL);
static final Pattern P_CONNECTION_DETAILS_FINE = Pattern.compile("<span class=\"bold\">\\s*(.+?)\\s*</span>.*?" // departure static final Pattern P_CONNECTION_DETAILS_FINE = Pattern.compile("<span class=\"bold\">\\s*(.+?)\\s*</span>.*?" // departure
+ "(?:" // + "(?:" //
+ "<span class=\"bold\">\\s*(.+?)\\s*</span>.*?" // line + "<span class=\"bold\">\\s*(.+?)\\s*</span>.*?" // line
@ -431,7 +432,6 @@ public final class BahnProvider extends AbstractHafasProvider
Location firstDeparture = null; Location firstDeparture = null;
Date lastArrivalTime = null; Date lastArrivalTime = null;
Location lastArrival = null; Location lastArrival = null;
Connection.Trip lastTrip = null;
final Matcher mDetCoarse = P_CONNECTION_DETAILS_COARSE.matcher(mHead.group(1)); final Matcher mDetCoarse = P_CONNECTION_DETAILS_COARSE.matcher(mHead.group(1));
while (mDetCoarse.find()) while (mDetCoarse.find())
@ -471,9 +471,8 @@ public final class BahnProvider extends AbstractHafasProvider
final String arrivalPosition = ParserUtils.resolveEntities(mDetFine.group(8)); final String arrivalPosition = ParserUtils.resolveEntities(mDetFine.group(8));
lastTrip = new Connection.Trip(line, null, departureTime.getTime(), departurePosition, departure, arrivalTime.getTime(), parts.add(new Connection.Trip(line, null, departureTime.getTime(), departurePosition, departure, arrivalTime.getTime(),
arrivalPosition, arrival, null, null); arrivalPosition, arrival, null, null));
parts.add(lastTrip);
if (firstDepartureTime == null) if (firstDepartureTime == null)
firstDepartureTime = departureTime.getTime(); firstDepartureTime = departureTime.getTime();