From 3ed1a3324601ebd38b7763d04cdb16f3a576448e Mon Sep 17 00:00:00 2001 From: Andreas Grois Date: Wed, 5 Jan 2022 22:19:58 +0100 Subject: [PATCH 1/2] Update URLs for OEBB parser to use HTTPS The website made https mandatory now. With the old http URLs the queries don't work any more. --- src/parser/parser_xmloebbat.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/parser/parser_xmloebbat.cpp b/src/parser/parser_xmloebbat.cpp index 30b0687c..fd80edc4 100644 --- a/src/parser/parser_xmloebbat.cpp +++ b/src/parser/parser_xmloebbat.cpp @@ -22,10 +22,10 @@ ParserXmlOebbAt::ParserXmlOebbAt(QObject *parent) : ParserHafasBinary(parent) { - baseXmlUrl = "http://fahrplan.oebb.at/bin/query.exe"; - baseSTTableUrl = "http://fahrplan.oebb.at/bin/stboard.exe/en"; - baseUrl = "http://fahrplan.oebb.at/bin/query.exe"; - baseBinaryUrl = "http://fahrplan.oebb.at/bin/query.exe/en"; + baseXmlUrl = "https://fahrplan.oebb.at/bin/query.exe"; + baseSTTableUrl = "https://fahrplan.oebb.at/bin/stboard.exe/en"; + baseUrl = "https://fahrplan.oebb.at/bin/query.exe"; + baseBinaryUrl = "https://fahrplan.oebb.at/bin/query.exe/en"; STTableMode = 1; } From 749ebd96fe88de4299f2c695336ba16d79367f8c Mon Sep 17 00:00:00 2001 From: Andreas Grois Date: Wed, 5 Jan 2022 23:09:29 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Make=20=C3=96BB=20parser=20use=20XML=20quer?= =?UTF-8?q?ies.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Seems to work around the issue that connectionDetailsVersion in the binary data is now more modern than what Fahrplan currently supports. --- src/parser/parser_xmloebbat.cpp | 3 +-- src/parser/parser_xmloebbat.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/parser/parser_xmloebbat.cpp b/src/parser/parser_xmloebbat.cpp index fd80edc4..0170b8b7 100644 --- a/src/parser/parser_xmloebbat.cpp +++ b/src/parser/parser_xmloebbat.cpp @@ -20,12 +20,11 @@ #include "parser_xmloebbat.h" ParserXmlOebbAt::ParserXmlOebbAt(QObject *parent) - : ParserHafasBinary(parent) + : ParserHafasXml(parent) { baseXmlUrl = "https://fahrplan.oebb.at/bin/query.exe"; baseSTTableUrl = "https://fahrplan.oebb.at/bin/stboard.exe/en"; baseUrl = "https://fahrplan.oebb.at/bin/query.exe"; - baseBinaryUrl = "https://fahrplan.oebb.at/bin/query.exe/en"; STTableMode = 1; } diff --git a/src/parser/parser_xmloebbat.h b/src/parser/parser_xmloebbat.h index 157d2df6..09c539d4 100644 --- a/src/parser/parser_xmloebbat.h +++ b/src/parser/parser_xmloebbat.h @@ -22,7 +22,7 @@ #include "parser_hafasbinary.h" -class ParserXmlOebbAt: public ParserHafasBinary +class ParserXmlOebbAt: public ParserHafasXml { Q_OBJECT