museum-digital/MD_STD
33
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: museum-digital:9113cad57ec737bf8cb75bf41f969082e89861fb
Branches Tags
museum-digital:master
...
compare: museum-digital:a1e6d7773b2e177922a20fcd4d42b5d40e6a597d
Branches Tags
museum-digital:master

2 Commits
9113cad57e ... a1e6d7773b

Author SHA1 Message Date
Joshua Ramon Enslin
a1e6d7773b
Fix error in sorting a searched list by an inherent value 2021-09-26 19:25:07 +02:00
Joshua Ramon Enslin
d35e3ed003
Fix error in sorting by external list 2021-09-26 19:23:42 +02:00
1 changed files with 16 additions and 4 deletions
Show Stats Expand all files Collapse all files

20
src/MD_STD_SORT.php
View File

@ -29,8 +29,14 @@ final class MD_STD_SORT {
if ($a[$nameIndex] === $searchValue) return -1; if ($a[$nameIndex] === $searchValue) return -1;
if ($b[$nameIndex] === $searchValue) return 1; if ($b[$nameIndex] === $searchValue) return 1;
if (stripos($a[$nameIndex], $searchValue) !== false) return -1; $containsSearchA = stripos($a[$nameIndex], $searchValue);
if (stripos($b[$nameIndex], $searchValue) !== false) return 1; $containsSearchB = stripos($b[$nameIndex], $searchValue);
if ($containsSearchA !== false and $containsSearchB !== false) {
return $a[$sortIndex] > $b[$sortIndex] ? -1 : 1;
}
if ($containsSearchA !== false) return -1;
if ($containsSearchB !== false) return 1;
return $a[$sortIndex] > $b[$sortIndex] ? -1 : 1; return $a[$sortIndex] > $b[$sortIndex] ? -1 : 1;
}; };
@ -62,8 +68,14 @@ final class MD_STD_SORT {
if ($a[$nameIndex] === $searchValue) return -1; if ($a[$nameIndex] === $searchValue) return -1;
if ($b[$nameIndex] === $searchValue) return 1; if ($b[$nameIndex] === $searchValue) return 1;
if (stripos($a[$nameIndex], $searchValue) !== false) return -1; $containsSearchA = stripos($a[$nameIndex], $searchValue);
if (stripos($b[$nameIndex], $searchValue) !== false) return 1; $containsSearchB = stripos($b[$nameIndex], $searchValue);
if ($containsSearchA !== false and $containsSearchB !== false) {
return $extSortBy[$a[$sortIndex]] > $extSortBy[$b[$sortIndex]] ? -1 : 1;
}
if ($containsSearchA !== false) return -1;
if ($containsSearchB !== false) return 1;
return $extSortBy[$a[$sortIndex]] > $extSortBy[$b[$sortIndex]] ? -1 : 1; return $extSortBy[$a[$sortIndex]] > $extSortBy[$b[$sortIndex]] ? -1 : 1;
}; };