pass on requestID

git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@521 0924bc21-9374-b0fa-ee44-9ff1593b38f0

src/de/schildbach/pte/AbstractEfaProvider.java

@@ -1146,10 +1146,11 @@ public abstract class AbstractEfaProvider implements NetworkProvider
 			pp.setInput(is, null);
 			assertItdRequest(pp);
 
-			final String sessionId = pp.getAttributeValue(null, "sessionID");
+			final String sessionId = XmlPullUtil.attr(pp, "sessionID");
 
 			if (!XmlPullUtil.jumpToStartTag(pp, null, "itdTripRequest"))
 				throw new IllegalStateException("cannot find <itdTripRequest />");
+			final String requestId = XmlPullUtil.attr(pp, "requestID");
 			XmlPullUtil.enter(pp, "itdTripRequest");
 
 			if (XmlPullUtil.test(pp, "itdMessage"))
@@ -1457,7 +1458,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider
 
 				XmlPullUtil.exit(pp, "itdRouteList");
 
-				return new QueryConnectionsResult(uri, from, via, to, commandLink(sessionId, "tripNext"), connections);
+				return new QueryConnectionsResult(uri, from, via, to, commandLink(sessionId, requestId, "tripNext"), connections);
 			}
 			else
 			{
@@ -1597,7 +1598,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider
 	protected abstract String connectionsQueryUri(Location from, Location via, Location to, Date date, boolean dep, String products,
 			WalkSpeed walkSpeed);
 
-	protected abstract String commandLink(String sessionId, String command);
+	protected abstract String commandLink(String sessionId, String requestId, String command);
 
 	protected static final void appendCommonConnectionParams(final StringBuilder uri)
 	{

src/de/schildbach/pte/AtcProvider.java

@@ -116,12 +116,13 @@ public class AtcProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/AvvProvider.java

@@ -117,12 +117,13 @@ public class AvvProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/BsagProvider.java

@@ -116,12 +116,13 @@ public class BsagProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/BsvagProvider.java

@@ -117,12 +117,13 @@ public class BsvagProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/BvbProvider.java

@@ -117,12 +117,13 @@ public class BvbProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/DingProvider.java

@@ -117,12 +117,13 @@ public class DingProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/DubProvider.java

@@ -124,12 +124,13 @@ public class DubProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/GvhProvider.java

@@ -115,12 +115,13 @@ public class GvhProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/IvbProvider.java

@@ -117,12 +117,13 @@ public class IvbProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/KvvProvider.java

@@ -116,12 +116,13 @@ public class KvvProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/LinzProvider.java

@@ -121,12 +121,13 @@ public class LinzProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/MariborProvider.java

@@ -116,12 +116,13 @@ public class MariborProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/MetProvider.java

@@ -123,12 +123,13 @@ public class MetProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/MvvProvider.java

@@ -120,12 +120,13 @@ public class MvvProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/NaldoProvider.java

@@ -116,12 +116,13 @@ public class NaldoProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/SfProvider.java

@@ -138,12 +138,13 @@ public class SfProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/StvProvider.java

@@ -116,12 +116,13 @@ public class StvProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/SvvProvider.java

@@ -115,12 +115,13 @@ public class SvvProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/SydneyProvider.java

@@ -123,12 +123,13 @@ public class SydneyProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/TflProvider.java

@@ -126,12 +126,13 @@ public class TflProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/TleaProvider.java

@@ -124,12 +124,13 @@ public class TleaProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/TlemProvider.java

@@ -124,12 +124,13 @@ public class TlemProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/TlseProvider.java

@@ -124,12 +124,13 @@ public class TlseProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/TlswProvider.java

@@ -123,12 +123,13 @@ public class TlswProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/VagfrProvider.java

@@ -116,7 +116,7 @@ public class VagfrProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);

src/de/schildbach/pte/VblProvider.java

@@ -116,12 +116,13 @@ public class VblProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/VmsProvider.java

@@ -116,12 +116,13 @@ public class VmsProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/VmvProvider.java

@@ -131,12 +131,13 @@ public class VmvProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/VorProvider.java

@@ -116,12 +116,13 @@ public class VorProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/VrnProvider.java

@@ -116,12 +116,13 @@ public class VrnProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/VrrProvider.java

@@ -122,12 +122,13 @@ public class VrrProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/VrtProvider.java

@@ -116,12 +116,13 @@ public class VrtProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/VvmProvider.java

@@ -116,12 +116,13 @@ public class VvmProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/VvoProvider.java

@@ -115,12 +115,13 @@ public class VvoProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();

src/de/schildbach/pte/VvsProvider.java

@@ -132,12 +132,13 @@ public class VvsProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	protected String commandLink(final String sessionId, final String command)
+	protected String commandLink(final String sessionId, final String requestId, final String command)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE);
 		uri.append("XSLT_TRIP_REQUEST2");
 		uri.append("?sessionID=").append(sessionId);
+		uri.append("&requestID=").append(requestId);
 		appendCommonConnectionParams(uri);
 		uri.append("&command=").append(command);
 		return uri.toString();