Skip to content

Commit

Permalink
Fix DMR ID lookup
Browse files Browse the repository at this point in the history
  • Loading branch information
nonoo committed Dec 28, 2016
1 parent b41dd93 commit 82bdd74
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
config.inc.php
*.log
*.log.*.gz
14 changes: 10 additions & 4 deletions aprs.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -199,14 +199,20 @@ function aprs_process_received_line($line) {

$dst_id = sql_get_dmr_id_for_callsign($sql, aprs_remove_ssid_from_callsign($dst_callsign), aprs_get_ssid_from_callsign($dst_callsign));
if (!$dst_id) {
echo " dst dmr id can't be resolved\n";
return;
$dst_id = sql_get_dmr_id_for_callsign($sql, aprs_remove_ssid_from_callsign($dst_callsign));
if (!$dst_id) {
echo " dst dmr id can't be resolved\n";
return;
}
}
echo " dst dmr id: $dst_id\n";
$src_id = sql_get_dmr_id_for_callsign($sql, aprs_remove_ssid_from_callsign($src_callsign), aprs_get_ssid_from_callsign($src_callsign));
if (!$src_id) {
echo " src dmr id can't be resolved\n";
return;
$src_id = sql_get_dmr_id_for_callsign($sql, aprs_remove_ssid_from_callsign($src_callsign));
if (!$src_id) {
echo " src dmr id can't be resolved\n";
return;
}
}
echo " src dmr id: $src_id\n";

Expand Down
2 changes: 1 addition & 1 deletion mqtt.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function db_clean() {

foreach ($db as $db_entry_key => $db_entry) {
if (time()-$db_entry['ts'] > 6) {
echo "db clean: removing $db_entry_key\n";
echo '[' . date('H:i:s') . "]db clean: removing $db_entry_key\n";
unset($db[$db_entry_key]);
}
}
Expand Down

0 comments on commit 82bdd74

Please sign in to comment.