This commit is contained in:
Jürgen Mummert
2025-12-23 11:42:11 +01:00
parent 33f7b01c69
commit d44b84094d
+103 -28
View File
@@ -2,8 +2,23 @@
namespace MummertMedia\ContaoMeilisearchBundle\EventListener; namespace MummertMedia\ContaoMeilisearchBundle\EventListener;
use Contao\System;
use Doctrine\DBAL\Connection;
class IndexPageListener class IndexPageListener
{ {
private static bool $shutdownRegistered = false;
/** @var array<string, array{priority?:int, keywords?:string, imagepath?:string, startDate?:int}> */
private static array $queue = [];
private Connection $db;
public function __construct()
{
$this->db = System::getContainer()->get('database_connection');
}
public function onIndexPage(string $content, array &$data, array &$set): void public function onIndexPage(string $content, array &$data, array &$set): void
{ {
if (!str_contains($content, 'MEILISEARCH')) { if (!str_contains($content, 'MEILISEARCH')) {
@@ -15,23 +30,38 @@ class IndexPageListener
return; return;
} }
/* // Debug ohne Risiko
* PRIORITY if (PHP_SAPI === 'cli') {
* event/news > page echo "INDEXPAGE LISTENER ACTIVE: " . ($set['url'] ?? '[no url]') . "\n";
*/ }
if (isset($markers['event.priority'])) {
$data['priority'] = (int) $markers['event.priority']; // Wir updaten final über checksum (stabil, egal ob URL mit/ohne Domain)
} elseif (isset($markers['news.priority'])) { $checksum = $data['checksum'] ?? null;
$data['priority'] = (int) $markers['news.priority']; if (!$checksum) {
} elseif (isset($markers['page.priority'])) { return;
$data['priority'] = (int) $markers['page.priority'];
} }
/* /*
* KEYWORDS alle kombinieren * PRIORITY: event/news > page
*/
$priority = null;
if (isset($markers['event.priority'])) {
$priority = (int) $markers['event.priority'];
} elseif (isset($markers['news.priority'])) {
$priority = (int) $markers['news.priority'];
} elseif (isset($markers['page.priority'])) {
$priority = (int) $markers['page.priority'];
}
if ($priority !== null) {
$data['priority'] = $priority; // bleibt bei dir schon stehen
$set['priority'] = $priority; // harmless, aber konsistent
}
/*
* KEYWORDS: kombinieren
*/ */
$keywords = []; $keywords = [];
foreach (['event.keywords', 'news.keywords', 'page.keywords'] as $key) { foreach (['event.keywords', 'news.keywords', 'page.keywords'] as $key) {
if (!empty($markers[$key])) { if (!empty($markers[$key])) {
$keywords = array_merge( $keywords = array_merge(
@@ -41,36 +71,81 @@ class IndexPageListener
} }
} }
if ($keywords) { $keywords = array_values(array_unique(array_filter($keywords)));
$data['keywords'] = implode(' ', array_unique($keywords)); $keywordsString = $keywords ? implode(' ', $keywords) : '';
}
// Wichtig: in $set setzen, weil Contao später oft nochmal keywords finalisiert
$set['keywords'] = $keywordsString;
/* /*
* IMAGEPATH UUID * IMAGEPATH (UUID): event/news > page > custom
* event/news > page > custom
*/ */
foreach ( $imageUuid = '';
['event.searchimage', 'news.searchimage', 'page.searchimage', 'custom.searchimage'] foreach (['event.searchimage', 'news.searchimage', 'page.searchimage', 'custom.searchimage'] as $key) {
as $key
) {
if (!empty($markers[$key])) { if (!empty($markers[$key])) {
$data['imagepath'] = trim($markers[$key]); $imageUuid = trim($markers[$key]);
break; break;
} }
} }
// Ebenso: in $set setzen (damit es nicht überschrieben wird)
$set['imagepath'] = $imageUuid;
/* /*
* STARTDATE Timestamp * STARTDATE (Timestamp)
*/ */
$startDate = 0;
foreach (['event.date', 'news.date'] as $key) { foreach (['event.date', 'news.date'] as $key) {
if (!empty($markers[$key])) { if (!empty($markers[$key])) {
$ts = strtotime($markers[$key]); $ts = strtotime(trim($markers[$key]));
if ($ts !== false) { if ($ts !== false) {
$data['startDate'] = $ts; $startDate = (int) $ts;
} }
break; break;
} }
} }
$set['startDate'] = $startDate;
/*
* Sicherheitsnetz: am Ende definitiv in tl_search schreiben
*/
self::$queue[$checksum] = [
'priority' => $priority,
'keywords' => $keywordsString,
'imagepath' => $imageUuid,
'startDate' => $startDate,
];
if (!self::$shutdownRegistered) {
self::$shutdownRegistered = true;
register_shutdown_function(function (): void {
$db = System::getContainer()->get('database_connection');
foreach (self::$queue as $checksum => $values) {
$params = ['checksum' => $checksum];
$sets = [];
if (array_key_exists('priority', $values) && $values['priority'] !== null) {
$sets[] = 'priority = :priority';
$params['priority'] = $values['priority'];
}
$sets[] = 'keywords = :keywords';
$params['keywords'] = $values['keywords'] ?? '';
$sets[] = 'imagepath = :imagepath';
$params['imagepath'] = $values['imagepath'] ?? '';
$sets[] = 'startDate = :startDate';
$params['startDate'] = $values['startDate'] ?? 0;
$sql = 'UPDATE tl_search SET ' . implode(', ', $sets) . ' WHERE checksum = :checksum';
$db->executeStatement($sql, $params);
}
});
}
} }
private function extractMarkers(string $content): array private function extractMarkers(string $content): array
@@ -80,11 +155,11 @@ class IndexPageListener
} }
$markers = []; $markers = [];
foreach (preg_split('/\R/', trim($m[1])) as $line) { foreach (preg_split('/\R/', trim($m[1])) ?: [] as $line) {
if (!str_contains($line, '=')) { $line = trim($line);
if ($line === '' || !str_contains($line, '=')) {
continue; continue;
} }
[$k, $v] = explode('=', $line, 2); [$k, $v] = explode('=', $line, 2);
$markers[trim($k)] = trim($v); $markers[trim($k)] = trim($v);
} }