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

server product and server time in results

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@772 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-09-11 12:12:14 +00:00
parent df12d363da
commit 0458890f5c
13 changed files with 169 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -35,6 +35,7 @@ import de.schildbach.pte.dto.LocationType;
import de.schildbach.pte.dto.NearbyStationsResult;
import de.schildbach.pte.dto.QueryConnectionsResult;
import de.schildbach.pte.dto.QueryDeparturesResult;
import de.schildbach.pte.dto.ResultHeader;
import de.schildbach.pte.exception.SessionExpiredException;
import de.schildbach.pte.util.ParserUtils;
@ -290,7 +291,7 @@ public final class BahnProvider extends AbstractHafasProvider
}
if (fromAddresses != null || viaAddresses != null || toAddresses != null)
return new QueryConnectionsResult(fromAddresses, viaAddresses, toAddresses);
return new QueryConnectionsResult(new ResultHeader(SERVER_PRODUCT), fromAddresses, viaAddresses, toAddresses);
else
return queryConnections(uri, page);
}
@ -322,13 +323,13 @@ public final class BahnProvider extends AbstractHafasProvider
if (mError.find())
{
if (mError.group(1) != null)
return QueryConnectionsResult.TOO_CLOSE;
return new QueryConnectionsResult(null, QueryConnectionsResult.Status.TOO_CLOSE);
if (mError.group(2) != null)
return QueryConnectionsResult.UNRESOLVABLE_ADDRESS;
return new QueryConnectionsResult(null, QueryConnectionsResult.Status.UNRESOLVABLE_ADDRESS);
if (mError.group(3) != null)
return QueryConnectionsResult.NO_CONNECTIONS;
return new QueryConnectionsResult(null, QueryConnectionsResult.Status.NO_CONNECTIONS);
if (mError.group(4) != null)
return QueryConnectionsResult.INVALID_DATE;
return new QueryConnectionsResult(null, QueryConnectionsResult.Status.INVALID_DATE);
if (mError.group(5) != null)
throw new SessionExpiredException();
}
@ -378,7 +379,7 @@ public final class BahnProvider extends AbstractHafasProvider
}
}
return new QueryConnectionsResult(uri, from, null, to, linkLater, connections);
return new QueryConnectionsResult(new ResultHeader(SERVER_PRODUCT), uri, from, null, to, linkLater, connections);
}
else
{