Compare commits

...

3 Commits

2 changed files with 28 additions and 3 deletions

View File

@@ -3,3 +3,7 @@ CONFIG += ordered
SUBDIRS = library main SUBDIRS = library main
main.depends = library main.depends = library
contains( CONFIG, PTU5_YOCTO ) {
SUBDIRS = library
}

View File

@@ -16,7 +16,10 @@ int CALCULATE_LIBRARY_API get_zone_nr() {
QFileInfo finfo(zone); QFileInfo finfo(zone);
if (finfo.size() <= 4) { // decimal 000\n if (finfo.size() <= 4) { // decimal 000\n
if (zone.open(QIODevice::ReadOnly | QIODevice::Text)) { if (zone.open(QIODevice::ReadOnly | QIODevice::Text)) {
return zone.readLine().toInt();
QTextStream in(&zone);
return in.readLine(100).toInt();
} }
} }
} }
@@ -27,7 +30,12 @@ bool CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *co
*tariff = new Configuration(); *tariff = new Configuration();
int const zone = get_zone_nr(); int const zone = get_zone_nr();
if (zone == -1) {
// DEBUG
qCritical() << "init_tariff:";
qCritical() << " ... zone = " << zone;
if (zone <= 0) {
return false; return false;
} }
@@ -36,19 +44,32 @@ bool CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *co
confFile += "/"; confFile += "/";
} }
char buffer[16]; char buffer[32];
memset(buffer, 0x00, sizeof(buffer)); memset(buffer, 0x00, sizeof(buffer));
snprintf(buffer, sizeof(buffer)-1, "tariff%02d.json", zone); snprintf(buffer, sizeof(buffer)-1, "tariff%02d.json", zone);
confFile += buffer; confFile += buffer;
// DEBUG
qCritical() << " ... confFile = " << confFile;
QFile fname(confFile); QFile fname(confFile);
if (fname.exists()) { if (fname.exists()) {
// DEBUG
qCritical() << " ... confFile exists";
if (fname.open(QIODevice::ReadOnly | QIODevice::Text)) { if (fname.open(QIODevice::ReadOnly | QIODevice::Text)) {
// DEBUG
qCritical() << " ... confFile is open";
QString json = fname.readAll(); QString json = fname.readAll();
return (*tariff)->ParseJson(*tariff, json.toStdString().c_str()); return (*tariff)->ParseJson(*tariff, json.toStdString().c_str());
} }
} }
qCritical() << "init_tariff: Parsing tariff config (" << confFile << ") failed!";
return false; return false;
} }