--- smsdaemon/plugins/TogPlugin.cpp 2009/09/14 07:29:59 322 +++ smsdaemon/plugins/TogPlugin.cpp 2009/09/16 09:08:40 323 @@ -13,9 +13,9 @@ using namespace std; -StationInfo::StationInfo(std::string c, std::string n) +StationInfo::StationInfo(int i, std::string n) { - code = Util::str_characters(c); + id = i; name = Util::str_characters(n); } @@ -23,26 +23,26 @@ TogPlugin::TogPlugin() : Plugin("tog", "Henter tog info fra bane.dk") { - _stationInfo["ar"] = StationInfo("AR","Århus"); - _stationInfo["la"] = StationInfo("LG","Langå"); - _stationInfo["ul"] = StationInfo("UP","Ulstrup"); - _stationInfo["bj"] = StationInfo("BJ","Bjerringbro"); - _stationInfo["vi"] = StationInfo("VG","Viborg"); - _stationInfo["ho"] = StationInfo("HØ","Højslev"); - _stationInfo["sk"] = StationInfo("SK","Skive"); + _stationInfo["ar"] = StationInfo(278, "Århus"); + _stationInfo["la"] = StationInfo(122, "Langå"); + _stationInfo["ul"] = StationInfo(240, "Ulstrup"); + _stationInfo["bj"] = StationInfo(10, "Bjerringbro"); + _stationInfo["vi"] = StationInfo(253, "Viborg"); + _stationInfo["ho"] = StationInfo(94, "Højslev"); + _stationInfo["sk"] = StationInfo(190, "Skive"); } -string TogPlugin::GetRealStationCode(string code, string &stationName) +int TogPlugin::GetStationId(string code, string &stationName) { map::iterator it = _stationInfo.find(code); if (it != _stationInfo.end()) { stationName = (*it).second.name; - return (*it).second.code; + return (*it).second.id; } - return ""; + return -1; } string TogPlugin::CreateStationList() @@ -81,9 +81,9 @@ } string stationName; - string code = GetRealStationCode(data, stationName); + int id = GetStationId(data, stationName); - if (code == "") + if (id < 0) { modem.SendSms(sms.GetSender(), "Unknown station", false); return; @@ -92,7 +92,7 @@ vector infos; try { - infos = GetTrainInfo( code , "" ); + infos = GetTrainInfo( id ); } catch (std::exception& e) {