klaute/MMDVMHost-Dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #96 from pjao/master

Browse source 
Speedup functions with grep and egrep
This commit is contained in:
Kim - DG9VH 2017-02-28 06:27:35 +01:00 committed by GitHub
commit 0f21b3cacc
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
include/functions.php
View file

@ -24,7 +24,7 @@ function getMMDVMHostFileVersion() {
function getFirmwareVersion() { function getFirmwareVersion() {
$logPath = MMDVMLOGPATH."/".MMDVMLOGPREFIX."-".date("Y-m-d").".log"; $logPath = MMDVMLOGPATH."/".MMDVMLOGPREFIX."-".date("Y-m-d").".log";
$logLines = explode("\n", `grep "MMDVM protocol version" $logPath`); $logLines = explode("\n", `egrep "MMDVM protocol version" $logPath`);
$firmware = "n/a"; $firmware = "n/a";
if (count($logLines) >= 2) { if (count($logLines) >= 2) {
$firmware = substr($logLines[count($logLines)-2], strpos($logLines[count($logLines)-2], "description")+13, strlen($logLines[count($logLines)-2])-strpos($logLines[count($logLines)-2], "description")+13); $firmware = substr($logLines[count($logLines)-2], strpos($logLines[count($logLines)-2], "description")+13, strlen($logLines[count($logLines)-2])-strpos($logLines[count($logLines)-2], "description")+13);
@ -781,20 +781,41 @@ function getName($callsign) {
return "---"; return "---";
} }
$TMP_CALL_NAME = "/tmp/Callsign_Name.txt";
if (file_exists($TMP_CALL_NAME)) {
$callsign = trim($callsign);
if (strpos($callsign,"-")) {
$callsign = substr($callsign,0,strpos($callsign,"-"));
}
$delimiter =" ";
exec("egrep -m1 '".$callsign.$delimiter."' ".$TMP_CALL_NAME, $output);
if (count($output) !== 0) {
$name = substr($output[0], strpos($output[0],$delimiter));
$name = substr($name, strpos($name,$delimiter));
return $name;
}
}
if (file_exists(DMRIDDATPATH)) { if (file_exists(DMRIDDATPATH)) {
$callsign = trim($callsign); $callsign = trim($callsign);
if (strpos($callsign,"-")) { if (strpos($callsign,"-")) {
$callsign = substr($callsign,0,strpos($callsign,"-")); $callsign = substr($callsign,0,strpos($callsign,"-"));
} }
$delimiter =" "; $delimiter =" ";
exec("grep -P '".$callsign.$delimiter."' ".DMRIDDATPATH, $output); exec("egrep -m1 '".$callsign.$delimiter."' ".DMRIDDATPATH, $output);
if (count($output) == 0) { if (count($output) == 0) {
$delimiter = "\t"; $delimiter = "\t";
exec("grep -P '".$callsign.$delimiter."' ".DMRIDDATPATH, $output); exec("egrep -m1 '".$callsign.$delimiter."' ".DMRIDDATPATH, $output);
} }
if (count($output) !== 0) { if (count($output) !== 0) {
$name = substr($output[0], strpos($output[0],$delimiter)+1); $name = substr($output[0], strpos($output[0],$delimiter)+1);
$name = substr($name, strpos($name,$delimiter)+1); $name = substr($name, strpos($name,$delimiter)+1);
$fp = fopen($TMP_CALL_NAME .'.TMP', 'a');
$TMP_STRING = $callsign .' ' .$name;
fwrite($fp, $TMP_STRING.PHP_EOL);
fclose($fp);
exec('sort ' .$TMP_CALL_NAME.'.TMP' .' ' .$TMP_CALL_NAME .' | uniq > ' .$TMP_CALL_NAME);
return $name; return $name;
} else } else
return "---"; return "---";