use common get_label()
This commit is contained in:
+7
-29
@@ -419,20 +419,8 @@ if(!isset($_GET['species']) && !isset($_GET['filename'])){
|
|||||||
$values = array();
|
$values = array();
|
||||||
while($results=$result->fetchArray(SQLITE3_ASSOC))
|
while($results=$result->fetchArray(SQLITE3_ASSOC))
|
||||||
{
|
{
|
||||||
$name = $results['Com_Name'];
|
$birds[] = $results['Sci_Name'];
|
||||||
$birds[] = $name;
|
$values[] = get_label($results, $_GET['sort']);
|
||||||
if ($_GET['sort'] == "confidence") {
|
|
||||||
$values[] = ' (' . round($results['MaxConfidence'] * 100) . '%)';
|
|
||||||
} elseif ($_GET['sort'] == "occurrences") {
|
|
||||||
$valuescount = $results['Count'];
|
|
||||||
if ($valuescount >= 1000) {
|
|
||||||
$values[] = ' (' . round($valuescount / 1000, 1) . 'k)';
|
|
||||||
} else {
|
|
||||||
$values[] = ' (' . $valuescount . ')';
|
|
||||||
}
|
|
||||||
} elseif ($_GET['sort'] == "date") {
|
|
||||||
$values[] = ' (' . $results['Date'] . ')';
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(count($birds) > 45) {
|
if(count($birds) > 45) {
|
||||||
@@ -451,7 +439,7 @@ if(!isset($_GET['species']) && !isset($_GET['filename'])){
|
|||||||
if ($index < count($birds)) {
|
if ($index < count($birds)) {
|
||||||
?>
|
?>
|
||||||
<td class="spec">
|
<td class="spec">
|
||||||
<button type="submit" name="species" value="<?php echo $birds[$index];?>"><?php echo $birds[$index].$values[$index];?></button>
|
<button type="submit" name="species" value="<?php echo $birds[$index];?>"><?php echo $values[$index];?></button>
|
||||||
</td>
|
</td>
|
||||||
<?php
|
<?php
|
||||||
} else {
|
} else {
|
||||||
@@ -466,20 +454,10 @@ if(!isset($_GET['species']) && !isset($_GET['filename'])){
|
|||||||
$values = array();
|
$values = array();
|
||||||
while($results=$result->fetchArray(SQLITE3_ASSOC))
|
while($results=$result->fetchArray(SQLITE3_ASSOC))
|
||||||
{
|
{
|
||||||
$name = $results['Com_Name'];
|
$dir_name = str_replace("'", '', $results['Com_Name']);
|
||||||
$dir_name = str_replace("'", '', $name);
|
|
||||||
if(realpath($home."/BirdSongs/Extracted/By_Date/".$date."/".str_replace(" ", "_", $dir_name)) !== false){
|
if(realpath($home."/BirdSongs/Extracted/By_Date/".$date."/".str_replace(" ", "_", $dir_name)) !== false){
|
||||||
$birds[] = $name;
|
$birds[] = $results['Sci_Name'];
|
||||||
if ($_GET['sort'] == "confidence") {
|
$values[] = get_label($results, $_GET['sort'], $_GET['date']);
|
||||||
$values[] = ' (' . round($results['MaxConfidence'] * 100) . '%)';
|
|
||||||
} elseif ($_GET['sort'] == "occurrences") {
|
|
||||||
$valuescount = $results['Count'];
|
|
||||||
if ($valuescount >= 1000) {
|
|
||||||
$values[] = ' (' . round($valuescount / 1000, 1) . 'k)';
|
|
||||||
} else {
|
|
||||||
$values[] = ' (' . $valuescount . ')';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -499,7 +477,7 @@ for ($row = 0; $row < $num_rows; $row++) {
|
|||||||
if ($index < count($birds)) {
|
if ($index < count($birds)) {
|
||||||
?>
|
?>
|
||||||
<td class="spec">
|
<td class="spec">
|
||||||
<button type="submit" name="species" value="<?php echo $birds[$index];?>"><?php echo $birds[$index].$values[$index];?></button>
|
<button type="submit" name="species" value="<?php echo $birds[$index];?>"><?php echo $values[$index];?></button>
|
||||||
</td>
|
</td>
|
||||||
<?php
|
<?php
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
+2
-13
@@ -64,18 +64,7 @@ if (get_included_files()[0] === __FILE__) {
|
|||||||
$comname = preg_replace('/\'/', '', $comname);
|
$comname = preg_replace('/\'/', '', $comname);
|
||||||
$filename = "/By_Date/".$results['Date']."/".$comname."/".$results['File_Name'];
|
$filename = "/By_Date/".$results['Date']."/".$comname."/".$results['File_Name'];
|
||||||
$birds[] = $results['Com_Name'];
|
$birds[] = $results['Com_Name'];
|
||||||
if ($_GET['sort'] == "confidence") {
|
$values[] = get_label($results, $_GET['sort']);
|
||||||
$values[] = ' (' . round($results['MaxConfidence'] * 100) . '%)';
|
|
||||||
} elseif ($_GET['sort'] == "occurrences") {
|
|
||||||
$valuescount = $results['Count'];
|
|
||||||
if ($valuescount >= 1000) {
|
|
||||||
$values[] = ' (' . round($valuescount / 1000, 1) . 'k)';
|
|
||||||
} else {
|
|
||||||
$values[] = ' (' . $valuescount . ')';
|
|
||||||
}
|
|
||||||
} elseif ($_GET['sort'] == "date") {
|
|
||||||
$values[] = ' (' . $results['Date'] . ')';
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(count($birds) > 45) {
|
if(count($birds) > 45) {
|
||||||
@@ -94,7 +83,7 @@ if (get_included_files()[0] === __FILE__) {
|
|||||||
if ($index < count($birds)) {
|
if ($index < count($birds)) {
|
||||||
?>
|
?>
|
||||||
<td>
|
<td>
|
||||||
<button type="submit" name="species" value="<?php echo $birds[$index];?>"><?php echo $birds[$index].$values[$index];?></button>
|
<button type="submit" name="species" value="<?php echo $birds[$index];?>"><?php echo $values[$index];?></button>
|
||||||
</td>
|
</td>
|
||||||
<?php
|
<?php
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user