Merge pull request #15 from poetaster/sbb

Sbb parser
poetaster · Jun 10, 2022 · 505d57c · 505d57c
2 parents aa3ef6d + b148302
commit 505d57c
Show file tree

Hide file tree

Showing 8 changed files with 1,262 additions and 22 deletions.
diff --git a/fahrplan2.pro b/fahrplan2.pro
@@ -2,7 +2,7 @@
 APP_NAME = Fahrplan
 
 # Define Version
-VERSION = 2.0.40-1
+VERSION = 2.0.41-1
 
 #CONFIG+= openrepos
 
@@ -102,26 +102,21 @@ INCLUDEPATH += src
 unix:!symbian: LIBS += -lz
 
 HEADERS += \
-    src/parser/parser_hafasxml.h \
-    src/parser/parser_abstract.h \
-    src/parser/parser_definitions.h \
-    src/parser/parser_xmlrejseplanendk.h \
-    src/parser/parser_xmloebbat.h \
-    src/parser/parser_xmlvasttrafikse.h \
     src/fahrplan.h \
     src/fahrplan_backend_manager.h \
-    src/parser/parser_mobilebahnde.h \
     src/calendarthreadwrapper.h \
     src/calendar_sfos_wrapper.h \
-    src/parser/parser_xmlnri.h \
-    src/parser/parser_hafasbinary.h \
     src/fahrplan_parser_thread.h \
     src/fahrplan_calendar_manager.h \
+    src/models/backends.h \
     src/models/stationslistmodel.h \
     src/models/favorites.h \
     src/models/stationsearchresults.h \
     src/models/timetable.h \
     src/models/trainrestrictions.h \
+    src/parser/parser_xmlnri.h \
+    src/parser/parser_hafasbinary.h \
+    src/parser/parser_mobilebahnde.h \
     src/parser/parser_ptvvicgovau.h \
     src/parser/parser_efa.h \
     src/parser/parser_ireland_efa.h \
@@ -132,29 +127,30 @@ HEADERS += \
     src/parser/parser_resrobot.h \
     src/parser/parser_finland_matka.h \
     src/parser/parser_vrr_efa.h \
-    src/models/backends.h
+    src/parser/parser_hafasxml.h \
+    src/parser/parser_abstract.h \
+    src/parser/parser_definitions.h \
+    src/parser/parser_xmlrejseplanendk.h \
+    src/parser/parser_xmloebbat.h \
+    src/parser/parser_xmlvasttrafikse.h \
+    src/parser/parser_search_ch.h 
 
 SOURCES += src/main.cpp \
-    src/parser/parser_hafasxml.cpp \
-    src/parser/parser_abstract.cpp \
-    src/parser/parser_definitions.cpp \
-    src/parser/parser_xmlrejseplanendk.cpp \
-    src/parser/parser_xmloebbat.cpp \
-    src/parser/parser_xmlvasttrafikse.cpp \
     src/fahrplan.cpp \
     src/fahrplan_backend_manager.cpp \
-    src/parser/parser_mobilebahnde.cpp \
     src/calendarthreadwrapper.cpp \
     src/calendar_sfos_wrapper.cpp \
-    src/parser/parser_xmlnri.cpp \
-    src/parser/parser_hafasbinary.cpp \
     src/fahrplan_parser_thread.cpp \
     src/fahrplan_calendar_manager.cpp \
+    src/models/backends.cpp \
     src/models/stationslistmodel.cpp \
     src/models/favorites.cpp \
     src/models/stationsearchresults.cpp \
     src/models/timetable.cpp \
     src/models/trainrestrictions.cpp \
+    src/parser/parser_mobilebahnde.cpp \
+    src/parser/parser_xmlnri.cpp \
+    src/parser/parser_hafasbinary.cpp \
     src/parser/parser_ptvvicgovau.cpp \
     src/parser/parser_efa.cpp \
     src/parser/parser_ireland_efa.cpp \
@@ -165,7 +161,14 @@ SOURCES += src/main.cpp \
     src/parser/parser_resrobot.cpp \
     src/parser/parser_finland_matka.cpp \
     src/parser/parser_vrr_efa.cpp \
-    src/models/backends.cpp
+    src/parser/parser_hafasxml.cpp \
+    src/parser/parser_abstract.cpp \
+    src/parser/parser_definitions.cpp \
+    src/parser/parser_xmlrejseplanendk.cpp \
+    src/parser/parser_xmloebbat.cpp \
+    src/parser/parser_xmlvasttrafikse.cpp \
+    src/parser/parser_search_ch.cpp
+
 
 LIBS += $$PWD/3rdparty/gauss-kruger-cpp/gausskruger.cpp
 

diff --git a/rpm/harbour-fahrplan2.spec b/rpm/harbour-fahrplan2.spec
@@ -13,7 +13,7 @@ Name:       harbour-fahrplan2
 %{!?qtc_make:%define qtc_make make}
 %{?qtc_builddir:%define _builddir %qtc_builddir}
 Summary:    Public transportation application
-Version:    2.0.40
+Version:    2.0.41
 Release:    1
 Group:      Location/Location Adaptation
 License:    GPLv2

diff --git a/src/fahrplan_backend_manager.cpp b/src/fahrplan_backend_manager.cpp
@@ -43,6 +43,7 @@ QStringList FahrplanBackendManager::getParserList()
     result.append(ParserResRobot::getName());
     result.append(ParserFinlandMatka::getName());
     result.append(ParserVRREFA::getName());
+    result.append(ParserSearchCH::getName());
 
     // Make sure the index is in bounds
     if (currentParserIndex > (result.count() - 1) || currentParserIndex < 0) {

diff --git a/src/fahrplan_parser_thread.cpp b/src/fahrplan_parser_thread.cpp
@@ -164,6 +164,9 @@ void FahrplanParserThread::run()
         case 13:
             m_parser = new ParserVRREFA();
             break;
+        case 14:
+            m_parser = new ParserSearchCH();
+            break;
     }
 
     m_name = m_parser->name();

diff --git a/src/fahrplan_parser_thread.h b/src/fahrplan_parser_thread.h
@@ -38,6 +38,7 @@
 #include "parser/parser_resrobot.h"
 #include "parser/parser_finland_matka.h"
 #include "parser/parser_vrr_efa.h"
+#include "parser/parser_search_ch.h"
 
 class FahrplanParserThread : public QThread
 {