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

moved product filter from network providers to task

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@10 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-07-15 11:07:45 +00:00
parent d416fd35b0
commit 0388466320
5 changed files with 11 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/de/schildbach/pte/VbbProvider.java
View file

@ -377,7 +377,7 @@ public final class VbbProvider implements NetworkProvider
+ "<td>\\s*<a.*?>\\s*(.*?)\\s*</a>\\s*</td>", Pattern.DOTALL);
private static final Pattern P_DEPARTURES_SERVICE_DOWN = Pattern.compile("Wartungsarbeiten");
public QueryDeparturesResult queryDepartures(final String uri, final Product[] products, final int maxDepartures) throws IOException
public QueryDeparturesResult queryDepartures(final String uri, final int maxDepartures) throws IOException
{
final CharSequence page = ParserUtils.scrape(uri);
@ -401,9 +401,8 @@ public final class VbbProvider implements NetworkProvider
if (mDepFine.matches())
{
final Departure dep = parseDeparture(mDepFine, currentTime);
if (products == null || filter(dep.line.charAt(0), products))
if (!departures.contains(dep))
departures.add(dep);
if (!departures.contains(dep))
departures.add(dep);
}
else
{
@ -460,17 +459,6 @@ public final class VbbProvider implements NetworkProvider
}
}
private boolean filter(final char line, final Product[] products)
{
final Product lineProduct = Product.fromCode(line);
for (final Product p : products)
if (lineProduct == p)
return true;
return false;
}
private static final Pattern P_NORMALIZE_LINE = Pattern.compile("([A-Za-zÄÖÜäöüß]+)[\\s-]*(.*)");
private static final Pattern P_NORMALIZE_LINE_SPECIAL_NUMBER = Pattern.compile("\\d{4,}");
private static final Pattern P_NORMALIZE_LINE_SPECIAL_BUS = Pattern.compile("Bus[A-Z]");