museum-digital/MDNodaHelpers
35
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

Remove superfluous variable assignments

Browse Source
This commit is contained in:
Joshua Ramon Enslin
2022-09-15 21:29:07 +02:00
parent 7c0ad9fa37
commit 5819caff91
12 changed files with 44 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/NodaNameGetter.php
View File

@ -29,11 +29,10 @@ final class NodaNameGetter {
WHERE `trans_language` = '" . $mysqli_noda->escape_string($lang) . "'
AND `tag_id` IN (" . implode(', ', $tag_ids) . ")");
while ($cur = $result->fetch_assoc()) {
$output[(int)$cur['tag_id']] = (string)$cur['trans_name'];
while ($cur = $result->fetch_row()) {
$output[(int)$cur[0]] = (string)$cur[1];
}
$result->close();
$result = null;
if (!empty($tag_ids_left = array_diff($tag_ids, array_keys($output)))) {
@ -41,11 +40,10 @@ final class NodaNameGetter {
FROM `tag`
WHERE `tag_id` IN (" . implode(', ', $tag_ids_left) . ")");
while ($cur = $result->fetch_assoc()) {
$output[(int)$cur['tag_id']] = (string)$cur['tag_name'];
while ($cur = $result->fetch_row()) {
$output[(int)$cur[0]] = (string)$cur[1];
}
$result->close();
$result = null;
}
@ -76,11 +74,10 @@ final class NodaNameGetter {
WHERE `trans_language` = '" . $mysqli_noda->escape_string($lang) . "'
AND `ort_id` IN (" . implode(', ', $place_ids) . ")");
while ($cur = $result->fetch_assoc()) {
$output[(int)$cur['ort_id']] = (string)$cur['trans_name'];
while ($cur = $result->fetch_row()) {
$output[(int)$cur[0]] = (string)$cur[1];
}
$result->close();
$result = null;
if (!empty($place_ids_left = array_diff($place_ids, array_keys($output)))) {
@ -88,11 +85,10 @@ final class NodaNameGetter {
FROM `orte`
WHERE `ort_id` IN (" . implode(', ', $place_ids_left) . ")");
while ($cur = $result->fetch_assoc()) {
$output[(int)$cur['ort_id']] = (string)$cur['ort_name'];
while ($cur = $result->fetch_row()) {
$output[(int)$cur[0]] = (string)$cur[1];
}
$result->close();
$result = null;
}
@ -123,22 +119,20 @@ final class NodaNameGetter {
WHERE `trans_language` = '" . $mysqli_noda->escape_string($lang) . "'
AND `persinst_id` IN (" . implode(', ', $persinst_ids) . ")");
while ($cur = $result->fetch_assoc()) {
$output[(int)$cur['persinst_id']] = (string)$cur['trans_name'];
while ($cur = $result->fetch_row()) {
$output[(int)$cur[0]] = (string)$cur[1];
}
$result->close();
$result = null;
if (!empty($persinst_ids_left = array_diff($persinst_ids, array_keys($output)))) {
$result = $mysqli_noda->do_read_query("SELECT `persinst_id`, `persinst_name_en`
FROM `persinst`
WHERE `persinst_id` IN (" . implode(', ', $persinst_ids_left) . ")");
while ($cur = $result->fetch_assoc()) {
$output[(int)$cur['persinst_id']] = (string)$cur['persinst_name_en'];
while ($cur = $result->fetch_row()) {
$output[(int)$cur[0]] = (string)$cur[1];
}
$result->close();
$result = null;
}
if (count($output) > 1) {
@ -168,11 +162,10 @@ final class NodaNameGetter {
WHERE `trans_language` = '" . $mysqli_noda->escape_string($lang) . "'
AND `zeit_id` IN (" . implode(', ', $time_ids) . ")");
while ($cur = $result->fetch_assoc()) {
$output[(int)$cur['zeit_id']] = (string)$cur['trans_name'];
while ($cur = $result->fetch_row()) {
$output[(int)$cur[0]] = (string)$cur[1];
}
$result->close();
$result = null;
if (!empty($time_ids_left = array_diff($time_ids, array_keys($output)))) {
@ -180,11 +173,10 @@ final class NodaNameGetter {
FROM `zeiten`
WHERE `zeit_id` IN (" . implode(', ', $time_ids_left) . ")");
while ($cur = $result->fetch_assoc()) {
$output[(int)$cur['zeit_id']] = (string)$cur['zeit_name'];
while ($cur = $result->fetch_row()) {
$output[(int)$cur[0]] = (string)$cur[1];
}
$result->close();
$result = null;
}
@ -207,8 +199,6 @@ final class NodaNameGetter {
*/
public static function getTagName(MDMysqli $mysqli_noda, string $lang, int $tag_id):string {
$output = [];
// Get translations
$result = $mysqli_noda->query_by_stmt("SELECT `trans_name`
FROM `tag_translation`