standardebooks/web
1
0
Fork 0
mirror of https://github.com/standardebooks/web.git synced 2025-07-13 10:02:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove RelevanceScore from the SELECT fields

Browse source 
Having it in the SELECT fields was causing warnings like this:

```
NOTICE: PHP message: PHP Deprecated:  Creation of dynamic property Ebook::$RelevanceScore is deprecated in /standardebooks.org/web/lib/Traits/Accessor.php
```
This commit is contained in:
Mike Colagrosso 2025-02-11 13:44:35 -07:00 • committed by Alex Cabal
parent 61bbf8f071
commit 1629d3a1a1
1 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/Ebook.php
View file

@ -2426,7 +2426,7 @@ final class Ebook{
public static function GetAllByFilter(string $query = null, array $tags = [], Enums\EbookSortType $sort = null, int $page = 1, int $perPage = EBOOKS_PER_PAGE, Enums\EbookReleaseStatusFilter $releaseStatusFilter = Enums\EbookReleaseStatusFilter::All): array{ public static function GetAllByFilter(string $query = null, array $tags = [], Enums\EbookSortType $sort = null, int $page = 1, int $perPage = EBOOKS_PER_PAGE, Enums\EbookReleaseStatusFilter $releaseStatusFilter = Enums\EbookReleaseStatusFilter::All): array{
$limit = $perPage; $limit = $perPage;
$offset = (($page - 1) * $perPage); $offset = (($page - 1) * $perPage);
$relevanceScoreField = ''; $orderByRelevance = false;
$joinContributors = ''; $joinContributors = '';
$joinTags = ''; $joinTags = '';
$params = []; $params = [];
@ -2474,18 +2474,18 @@ final class Ebook{
// Preserve quotes in the query so the user can enter, e.g., "war and peace" for an exact match. // Preserve quotes in the query so the user can enter, e.g., "war and peace" for an exact match.
$query = trim(preg_replace('|[^a-zA-Z0-9" ]|ius', ' ', Formatter::RemoveDiacritics($query))); $query = trim(preg_replace('|[^a-zA-Z0-9" ]|ius', ' ', Formatter::RemoveDiacritics($query)));
$relevanceScoreField = ', (
match(e.Title) against (?) * ' . EBOOK_SEARCH_WEIGHT_TITLE . ' +
match(e.IndexableAuthors) against (?) * ' . EBOOK_SEARCH_WEIGHT_AUTHORS . ' +
match(e.IndexableCollections) against (?) * ' . EBOOK_SEARCH_WEIGHT_COLLECTIONS . ' +
match(e.IndexableText) against (?)
) as RelevanceScore ';
$whereCondition .= ' and match(e.IndexableText, e.Title, e.IndexableAuthors, e.IndexableCollections) against(?) '; $whereCondition .= ' and match(e.IndexableText, e.Title, e.IndexableAuthors, e.IndexableCollections) against(?) ';
$params[] = $query; $params[] = $query;
if($sort == null || $sort == Enums\EbookSortType::Relevance || $sort == Enums\EbookSortType::Newest){ if($sort == null || $sort == Enums\EbookSortType::Relevance || $sort == Enums\EbookSortType::Newest){
$orderBy = 'RelevanceScore desc, e.EbookCreated desc'; $orderBy = '(
match(e.Title) against (?) * ' . EBOOK_SEARCH_WEIGHT_TITLE . ' +
match(e.IndexableAuthors) against (?) * ' . EBOOK_SEARCH_WEIGHT_AUTHORS . ' +
match(e.IndexableCollections) against (?) * ' . EBOOK_SEARCH_WEIGHT_COLLECTIONS . ' +
match(e.IndexableText) against (?)
) desc, e.EbookCreated desc';
// $params are added below based on this boolean.
$orderByRelevance = true;
} }
} }
@ -2498,9 +2498,12 @@ final class Ebook{
' . $whereCondition . ' ' . $whereCondition . '
', $params); ', $params);
if($relevanceScoreField != ''){ if($orderByRelevance){
// `RelevanceScore` is at the beginning of the query, so these params must go at the start of the array. $params[] = $query; // match(e.Title) against (?)
array_unshift($params, $query, $query, $query, $query); $params[] = $query; // match(e.IndexableAuthors) against (?)
$params[] = $query; // match(e.IndexableCollections) against (?)
$params[] = $query; // match(e.IndexableText) against (?)
} }
$params[] = $limit; $params[] = $limit;
@ -2508,7 +2511,6 @@ final class Ebook{
$ebooks = Db::Query(' $ebooks = Db::Query('
SELECT distinct e.* SELECT distinct e.*
' . $relevanceScoreField . '
from Ebooks e from Ebooks e
' . $joinContributors . ' ' . $joinContributors . '
' . $joinTags . ' ' . $joinTags . '