Compare commits
3 Commits
adce2983ce
...
0.0.1
Author | SHA1 | Date | |
---|---|---|---|
b422f82dea
|
|||
30af400779
|
|||
db1b64649b |
@@ -3,3 +3,7 @@ CONFIG += ordered
|
||||
SUBDIRS = library main
|
||||
|
||||
main.depends = library
|
||||
|
||||
contains( CONFIG, PTU5_YOCTO ) {
|
||||
SUBDIRS = library
|
||||
}
|
@@ -16,7 +16,10 @@ int CALCULATE_LIBRARY_API get_zone_nr() {
|
||||
QFileInfo finfo(zone);
|
||||
if (finfo.size() <= 4) { // decimal 000\n
|
||||
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();
|
||||
|
||||
int const zone = get_zone_nr();
|
||||
if (zone == -1) {
|
||||
|
||||
// DEBUG
|
||||
qCritical() << "init_tariff:";
|
||||
qCritical() << " ... zone = " << zone;
|
||||
|
||||
if (zone <= 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -36,19 +44,32 @@ bool CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *co
|
||||
confFile += "/";
|
||||
}
|
||||
|
||||
char buffer[16];
|
||||
char buffer[32];
|
||||
memset(buffer, 0x00, sizeof(buffer));
|
||||
snprintf(buffer, sizeof(buffer)-1, "tariff%02d.json", zone);
|
||||
confFile += buffer;
|
||||
|
||||
// DEBUG
|
||||
qCritical() << " ... confFile = " << confFile;
|
||||
|
||||
QFile fname(confFile);
|
||||
if (fname.exists()) {
|
||||
|
||||
// DEBUG
|
||||
qCritical() << " ... confFile exists";
|
||||
|
||||
if (fname.open(QIODevice::ReadOnly | QIODevice::Text)) {
|
||||
|
||||
// DEBUG
|
||||
qCritical() << " ... confFile is open";
|
||||
|
||||
QString json = fname.readAll();
|
||||
return (*tariff)->ParseJson(*tariff, json.toStdString().c_str());
|
||||
}
|
||||
}
|
||||
|
||||
qCritical() << "init_tariff: Parsing tariff config (" << confFile << ") failed!";
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user