comparison: bmsd/mysql.c
bmsd/mysql.c
- changeset 844
- a6ee7b5b036b
- parent 843
- 29e7223e37ae
- child 849
- 16079aef4c4c
equal
deleted
inserted
replaced
| 843:29e7223e37ae | 844:a6ee7b5b036b |
|---|---|
| 504 "temperature='%.3f', humidity='%.3f', barometer='%.3f', gps_latitude='%.8f', gps_longitude='%.8f', gps_altitude='%.8f', " \ | 504 "temperature='%.3f', humidity='%.3f', barometer='%.3f', gps_latitude='%.8f', gps_longitude='%.8f', gps_altitude='%.8f', " \ |
| 505 "net_address='%s', net_ifname='%s', net_rssi='%d', up_interval='%d', net_ssid='%s'", | 505 "net_address='%s', net_ifname='%s', net_rssi='%d', up_interval='%d', net_ssid='%s'", |
| 506 node->uuid, node->node, node->online ?1:0, node->group_id, | 506 node->uuid, node->node, node->online ?1:0, node->group_id, |
| 507 node->hardwaremake, node->hardwaremodel, node->os, node->os_version, node->firmware, first, last, | 507 node->hardwaremake, node->hardwaremodel, node->os, node->os_version, node->firmware, first, last, |
| 508 node->temperature, node->humidity, node->barometer, node->gps_latitude, node->gps_longitude, node->gps_altitude, | 508 node->temperature, node->humidity, node->barometer, node->gps_latitude, node->gps_longitude, node->gps_altitude, |
| 509 node->net_address, node->net_ifname, node->net_rssi, node->interval, node->net_ssid); | 509 node->net_address, node->net_ifname, node->net_rssi, node->interval, (node->net_ssid) ? node->net_ssid:""); |
| 510 | 510 |
| 511 if (bms_mysql_query(query) == 0) { | 511 if (bms_mysql_query(query) == 0) { |
| 512 syslog(LOG_NOTICE, "MySQL: insert new node %s", node->node); | 512 syslog(LOG_NOTICE, "MySQL: insert new node %s", node->node); |
| 513 } | 513 } |
| 514 | 514 |
| 530 "UPDATE mon_nodes SET online='%d', hardwaremake='%s', hardwaremodel='%s', os='%s', os_version='%s', firmware='%s', lastseen='%s', " \ | 530 "UPDATE mon_nodes SET online='%d', hardwaremake='%s', hardwaremodel='%s', os='%s', os_version='%s', firmware='%s', lastseen='%s', " \ |
| 531 "temperature='%.3f', humidity='%.3f', barometer='%.3f', gps_latitude='%.8f', gps_longitude='%.8f', gps_altitude='%.8f', " \ | 531 "temperature='%.3f', humidity='%.3f', barometer='%.3f', gps_latitude='%.8f', gps_longitude='%.8f', gps_altitude='%.8f', " \ |
| 532 "net_address='%s', net_ifname='%s', net_rssi='%d', up_interval='%d', net_ssid='%s' WHERE uuid='%s'", | 532 "net_address='%s', net_ifname='%s', net_rssi='%d', up_interval='%d', net_ssid='%s' WHERE uuid='%s'", |
| 533 node->online ? 1:0, node->hardwaremake, node->hardwaremodel, node->os, node->os_version, node->firmware, last, | 533 node->online ? 1:0, node->hardwaremake, node->hardwaremodel, node->os, node->os_version, node->firmware, last, |
| 534 node->temperature, node->humidity, node->barometer, node->gps_latitude, node->gps_longitude, node->gps_altitude, | 534 node->temperature, node->humidity, node->barometer, node->gps_latitude, node->gps_longitude, node->gps_altitude, |
| 535 node->net_address, node->net_ifname, node->net_rssi, node->interval, node->net_ssid, node->uuid); | 535 node->net_address, node->net_ifname, node->net_rssi, node->interval, (node->net_ssid) ? node->net_ssid:"", node->uuid); |
| 536 | 536 |
| 537 bms_mysql_query(query); | 537 bms_mysql_query(query); |
| 538 free(query); | 538 free(query); |
| 539 } | 539 } |
| 540 | 540 |
