diff --git a/scripts/play.php b/scripts/play.php index 6d83b05..48cecd5 100644 --- a/scripts/play.php +++ b/scripts/play.php @@ -137,7 +137,7 @@ if(isset($_GET['bydate'])){ session_start(); $_SESSION['date'] = $date; if(isset($_GET['sort']) && $_GET['sort'] == "occurrences") { - $statement = $db->prepare("SELECT DISTINCT(Com_Name) FROM detections WHERE Date == \"$date\" GROUP BY Com_Name ORDER BY COUNT(*) DESC"); + $statement = $db->prepare("SELECT DISTINCT(Com_Name), COUNT(Com_Name) AS Count FROM detections WHERE Date == \"$date\" GROUP BY Com_Name ORDER BY COUNT(*) DESC"); } elseif(isset($_GET['sort']) && $_GET['sort'] == "confidence") { $statement = $db->prepare("SELECT Com_Name, Sci_Name, MAX(Confidence) as MaxConfidence FROM detections WHERE Date == \"$date\" GROUP BY Com_Name ORDER BY MaxConfidence DESC"); } else { @@ -150,7 +150,7 @@ if(isset($_GET['bydate'])){ #By Species } elseif(isset($_GET['byspecies'])) { if(isset($_GET['sort']) && $_GET['sort'] == "occurrences") { - $statement = $db->prepare('SELECT DISTINCT(Com_Name) FROM detections GROUP BY Com_Name ORDER BY COUNT(*) DESC'); + $statement = $db->prepare('SELECT DISTINCT(Com_Name), COUNT(Com_Name) AS Count FROM detections GROUP BY Com_Name ORDER BY COUNT(*) DESC'); } elseif(isset($_GET['sort']) && $_GET['sort'] == "confidence") { $statement = $db->prepare('SELECT Com_Name, Sci_Name, MAX(Confidence) as MaxConfidence FROM detections GROUP BY Com_Name ORDER BY MaxConfidence DESC'); } else { @@ -436,13 +436,15 @@ if(!isset($_GET['species']) && !isset($_GET['filename'])){ #By Species } elseif($view == "byspecies") { $birds = array(); - $confidence = array(); + $values = array(); while($results=$result->fetchArray(SQLITE3_ASSOC)) { $name = $results['Com_Name']; $birds[] = $name; if ($_GET['sort'] == "confidence") { - $confidence[] = ' (' . round($results['MaxConfidence'] * 100) . '%)'; + $values[] = ' (' . round($results['MaxConfidence'] * 100) . '%)'; + } elseif ($_GET['sort'] == "occurrences") { + $values[] = ' (' . $results['Count'] . ')'; } } @@ -462,7 +464,7 @@ if(!isset($_GET['species']) && !isset($_GET['filename'])){ if ($index < count($birds)) { ?> - + fetchArray(SQLITE3_ASSOC)) { $name = $results['Com_Name']; @@ -482,7 +484,9 @@ while($results=$result->fetchArray(SQLITE3_ASSOC)) if(realpath($home."/BirdSongs/Extracted/By_Date/".$date."/".str_replace(" ", "_", $dir_name)) !== false){ $birds[] = $name; if ($_GET['sort'] == "confidence") { - $confidence[] = ' (' . round($results['MaxConfidence'] * 100) . '%)'; + $values[] = ' (' . round($results['MaxConfidence'] * 100) . '%)'; + } elseif ($_GET['sort'] == "occurrences") { + $values[] = ' (' . $results['Count'] . ')'; } } } @@ -503,7 +507,7 @@ for ($row = 0; $row < $num_rows; $row++) { if ($index < count($birds)) { ?> - + $sciname = preg_replace('/ /', '_', $results['Sci_Name']); $sci_name = $results['Sci_Name']; $time = $results['Time']; - $confidence = round((float)round($results['Confidence'],2) * 100 ) . '%'; + $values = round((float)round($results['Confidence'],2) * 100 ) . '%'; $filename_formatted = $date."/".$comname."/".$results['File_Name']; // file was deleted by disk check, no need to show the detection in recordings @@ -644,14 +648,14 @@ echo " - $date $time
$confidence
+ $date $time
$values
".$imageelem." "; } else { echo " - @@ -686,7 +690,7 @@ echo "
$date $time
$confidence +
$date $time
$values
".$imageelem."
$sciname = preg_replace('/ /', '_', $results['Sci_Name']); $sci_name = $results['Sci_Name']; $time = $results['Time']; - $confidence = round((float)round($results['Confidence'],2) * 100 ) . '%'; + $values = round((float)round($results['Confidence'],2) * 100 ) . '%'; $filename_formatted = $date."/".$comname."/".$results['File_Name']; // add disk_check_exclude.txt lines into an array for grepping @@ -725,13 +729,13 @@ echo "
-$date $time
$confidence
+$date $time
$values
"; } else { echo " - ";
$date $time
$confidence +
$date $time
$values