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

get rid of unused line in connection top-level DTO

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@457 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-01-16 13:01:24 +00:00
parent 91d310b1dd
commit c6815f3f21
7 changed files with 19 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1330,8 +1330,8 @@ public abstract class AbstractEfaProvider implements NetworkProvider
}
XmlPullUtil.exit(pp, "itdFare");
}
connections.add(new Connection(id, uri, firstDepartureTime, lastArrivalTime, null, 0, firstDeparture, 0, lastArrival, parts,
fares.isEmpty() ? null : fares));
connections.add(new Connection(id, uri, firstDepartureTime, lastArrivalTime, 0, firstDeparture, 0, lastArrival, parts, fares
.isEmpty() ? null : fares));
XmlPullUtil.exit(pp, "itdRoute");
}

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

@ -450,8 +450,8 @@ public abstract class AbstractHafasProvider implements NetworkProvider
XmlPullUtil.exit(pp);
connections.add(new Connection(id, null, firstDepartureTime, lastArrivalTime, null, departure.id, departure.name, arrival.id,
arrival.name, parts, null));
connections.add(new Connection(id, null, firstDepartureTime, lastArrivalTime, departure.id, departure.name, arrival.id, arrival.name,
parts, null));
}
XmlPullUtil.exit(pp);

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

@ -266,13 +266,8 @@ public final class BahnProvider extends AbstractHafasProvider
Date arrivalTime = ParserUtils.joinDateTime(currentDate, ParserUtils.parseTime(mConFine.group(3)));
if (departureTime.after(arrivalTime))
arrivalTime = ParserUtils.addDays(arrivalTime, 1);
String line = ParserUtils.resolveEntities(mConFine.group(4));
if (line != null && !line.contains(","))
line = normalizeLine(line);
else
line = null;
final Connection connection = new Connection(AbstractHafasProvider.extractConnectionId(link), link, departureTime, arrivalTime,
line, 0, from.name, 0, to.name, null, null);
0, from.name, 0, to.name, null, null);
connections.add(connection);
}
else
@ -420,7 +415,7 @@ public final class BahnProvider extends AbstractHafasProvider
throw new IllegalStateException("could not parse all parts of:\n" + mHead.group(1) + "\n" + parts);
return new GetConnectionDetailsResult(new Date(), new Connection(AbstractHafasProvider.extractConnectionId(uri), uri, firstDepartureTime,
lastArrivalTime, null, 0, firstDeparture, 0, lastArrival, parts, null));
lastArrivalTime, 0, firstDeparture, 0, lastArrival, parts, null));
}
else
{

8
src/de/schildbach/pte/BvgProvider.java
View file

@ -341,7 +341,8 @@ public final class BvgProvider extends AbstractHafasProvider
private static final Pattern P_CONNECTIONS_COARSE = Pattern.compile("<p class=\"con(?:L|D)\">(.+?)</p>", Pattern.DOTALL);
private static final Pattern P_CONNECTIONS_FINE = Pattern.compile(".*?" //
+ "<a href=\"(/Fahrinfo/bin/query\\.bin/dox[^\"]*?)\">" // link
+ "(\\d\\d:\\d\\d)-(\\d\\d:\\d\\d)</a>&nbsp;&nbsp;(?:\\d+ Umst\\.|([\\w\\d ]+)).*?" //
+ "(\\d\\d:\\d\\d)-(\\d\\d:\\d\\d)</a>&nbsp;&nbsp;" // departureTime, arrivalTime
+ "(?:\\d+ Umst\\.|([\\w\\d ]+)).*?" // line
, Pattern.DOTALL);
private QueryConnectionsResult queryConnections(final String uri, final CharSequence page) throws IOException
@ -390,9 +391,8 @@ public final class BvgProvider extends AbstractHafasProvider
Date arrivalTime = ParserUtils.joinDateTime(currentDate, ParserUtils.parseTime(mConFine.group(3)));
if (departureTime.after(arrivalTime))
arrivalTime = ParserUtils.addDays(arrivalTime, 1);
final String line = normalizeLine(ParserUtils.resolveEntities(mConFine.group(4)));
final Connection connection = new Connection(AbstractHafasProvider.extractConnectionId(link), link, departureTime, arrivalTime,
line, 0, from.name, 0, to.name, null, null);
0, from.name, 0, to.name, null, null);
connections.add(connection);
}
else
@ -540,7 +540,7 @@ public final class BvgProvider extends AbstractHafasProvider
if (firstDepartureTime != null && lastArrivalTime != null)
return new GetConnectionDetailsResult(currentDate, new Connection(AbstractHafasProvider.extractConnectionId(uri), uri,
firstDepartureTime, lastArrivalTime, null, firstDepartureId, firstDeparture, lastArrivalId, lastArrival, parts, null));
firstDepartureTime, lastArrivalTime, firstDepartureId, firstDeparture, lastArrivalId, lastArrival, parts, null));
else
return new GetConnectionDetailsResult(currentDate, null);
}

4
src/de/schildbach/pte/OebbProvider.java
View file

@ -409,8 +409,8 @@ public class OebbProvider extends AbstractHafasProvider
: overviewDepartureDate, ParserUtils.parseTime(mConFine.group(4)));
final String link = allDetailsUri; // TODO use print link?
final Connection connection = new Connection(id, link, overviewDepartureTime, overviewArrivalTime, null, 0, from.name, 0,
to.name, new ArrayList<Connection.Part>(1), null);
final Connection connection = new Connection(id, link, overviewDepartureTime, overviewArrivalTime, 0, from.name, 0, to.name,
new ArrayList<Connection.Part>(1), null);
connections.add(connection);
final Matcher mDetCoarse = P_CONNECTION_DETAILS_COARSE.matcher(details);

15
src/de/schildbach/pte/RmvProvider.java
View file

@ -228,8 +228,8 @@ public class RmvProvider extends AbstractHafasProvider
private static final Pattern P_CONNECTIONS_COARSE = Pattern.compile("<p class=\"con(?:L|D)\">(.+?)</p>", Pattern.DOTALL);
private static final Pattern P_CONNECTIONS_FINE = Pattern.compile(".*?" //
+ "<a href=\"(http://www.rmv.de/auskunft/bin/jp/query.exe/dox[^\"]*?)\">" // link
+ "(\\d+:\\d+)-(\\d+:\\d+)</a>" //
+ "(?:&nbsp;(.+?))?" //
+ "(\\d+:\\d+)-(\\d+:\\d+)</a>" // departureTime, arrivalTime
+ "(?:&nbsp;(.+?))?" // line
, Pattern.DOTALL);
@Override
@ -271,12 +271,7 @@ public class RmvProvider extends AbstractHafasProvider
Date arrivalTime = ParserUtils.joinDateTime(currentDate, ParserUtils.parseTime(mConFine.group(3)));
if (departureTime.after(arrivalTime))
arrivalTime = ParserUtils.addDays(arrivalTime, 1);
String line = mConFine.group(4);
if (line != null && !line.endsWith("Um."))
line = normalizeLine(line);
else
line = null;
final Connection connection = new Connection(extractConnectionId(link), link, departureTime, arrivalTime, line, 0, from.name, 0,
final Connection connection = new Connection(extractConnectionId(link), link, departureTime, arrivalTime, 0, from.name, 0,
to.name, null, null);
connections.add(connection);
}
@ -390,8 +385,8 @@ public class RmvProvider extends AbstractHafasProvider
}
}
return new GetConnectionDetailsResult(currentDate, new Connection(extractConnectionId(uri), uri, firstDepartureTime, lastArrivalTime,
null, 0, firstDeparture, 0, lastArrival, parts, null));
return new GetConnectionDetailsResult(currentDate, new Connection(extractConnectionId(uri), uri, firstDepartureTime, lastArrivalTime, 0,
firstDeparture, 0, lastArrival, parts, null));
}
else
{

6
src/de/schildbach/pte/dto/Connection.java
View file

@ -31,7 +31,6 @@ public final class Connection implements Serializable
public final String link;
public final Date departureTime;
public final Date arrivalTime;
public final String line;
public final int fromId;
public final String from;
public final int toId;
@ -39,14 +38,13 @@ public final class Connection implements Serializable
public final List<Part> parts;
public final List<Fare> fares;
public Connection(final String id, final String link, final Date departureTime, final Date arrivalTime, final String line, final int fromId,
final String from, final int toId, final String to, final List<Part> parts, final List<Fare> fares)
public Connection(final String id, final String link, final Date departureTime, final Date arrivalTime, final int fromId, final String from,
final int toId, final String to, final List<Part> parts, final List<Fare> fares)
{
this.id = id;
this.link = link;
this.departureTime = departureTime;
this.arrivalTime = arrivalTime;
this.line = line;
this.fromId = fromId;
this.from = from;
this.toId = toId;