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

AbstractHafasClientInterfaceProvider: Fix handling of 'err' in header.

Browse source
This commit is contained in:
Andreas Schildbach 2018-10-27 17:39:43 +02:00
parent fe86c0498c
commit 59e6438882
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
enabler/src/de/schildbach/pte/AbstractHafasClientInterfaceProvider.java
View file

@ -175,8 +175,10 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
try { try {
final JSONObject head = new JSONObject(page.toString()); final JSONObject head = new JSONObject(page.toString());
final String headErr = head.optString("err", null); final String headErr = head.optString("err", null);
if (headErr != null) if (headErr != null && !"OK".equals(headErr)) {
throw new RuntimeException(headErr); final String headErrTxt = head.getString("errTxt");
throw new RuntimeException(headErr + " " + headErrTxt);
}
final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT, head.getString("ver"), null, 0, null); final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT, head.getString("ver"), null, 0, null);
final JSONArray svcResList = head.getJSONArray("svcResL"); final JSONArray svcResList = head.getJSONArray("svcResL");
@ -243,8 +245,10 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
try { try {
final JSONObject head = new JSONObject(page.toString()); final JSONObject head = new JSONObject(page.toString());
final String headErr = head.optString("err", null); final String headErr = head.optString("err", null);
if (headErr != null) if (headErr != null && !"OK".equals(headErr)) {
throw new RuntimeException(headErr); final String headErrTxt = head.getString("errTxt");
throw new RuntimeException(headErr + " " + headErrTxt);
}
final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT, head.getString("ver"), null, 0, null); final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT, head.getString("ver"), null, 0, null);
final QueryDeparturesResult result = new QueryDeparturesResult(header); final QueryDeparturesResult result = new QueryDeparturesResult(header);
@ -351,8 +355,10 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
try { try {
final JSONObject head = new JSONObject(page.toString()); final JSONObject head = new JSONObject(page.toString());
final String headErr = head.optString("err", null); final String headErr = head.optString("err", null);
if (headErr != null) if (headErr != null && !"OK".equals(headErr)) {
throw new RuntimeException(headErr); final String headErrTxt = head.getString("errTxt");
throw new RuntimeException(headErr + " " + headErrTxt);
}
final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT, head.getString("ver"), null, 0, null); final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT, head.getString("ver"), null, 0, null);
final JSONArray svcResList = head.getJSONArray("svcResL"); final JSONArray svcResList = head.getJSONArray("svcResL");
@ -454,8 +460,10 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
try { try {
final JSONObject head = new JSONObject(page.toString()); final JSONObject head = new JSONObject(page.toString());
final String headErr = head.optString("err", null); final String headErr = head.optString("err", null);
if (headErr != null) if (headErr != null && !"OK".equals(headErr)) {
throw new RuntimeException(headErr); final String headErrTxt = head.getString("errTxt");
throw new RuntimeException(headErr + " " + headErrTxt);
}
final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT, head.getString("ver"), null, 0, null); final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT, head.getString("ver"), null, 0, null);
final JSONArray svcResList = head.getJSONArray("svcResL"); final JSONArray svcResList = head.getJSONArray("svcResL");