.
Deploy / deploy (push) Successful in 8s

This commit is contained in:
2026-05-06 12:59:55 +02:00
parent a9df8baf97
commit daf95349d2
2 changed files with 26 additions and 14 deletions
+1 -1
View File
@@ -197,7 +197,7 @@ pre.raw-line { background: var(--bs-tertiary-bg); padding: .75rem; border-radius
<input type="text" class="form-control" id="logSearchInput" placeholder="Search all log lines..." maxlength="200"> <input type="text" class="form-control" id="logSearchInput" placeholder="Search all log lines..." maxlength="200">
<button class="btn btn-primary" id="logSearchBtn"><i class="bi bi-search me-1"></i>Search</button> <button class="btn btn-primary" id="logSearchBtn"><i class="bi bi-search me-1"></i>Search</button>
</div> </div>
<small class="text-secondary mt-1 d-block">Search terms: <code>error 500</code>, <code>"disk full"</code>, <code>auth*</code>. Boolean operators like <code>NOT</code> not supported.</small> <small class="text-secondary mt-1 d-block">Use <code>*</code> as wildcard. <code>bla</code> matches "blabla". <code>*</code> shows all logs. Separate terms match all (AND).</small>
</div> </div>
</div> </div>
<div class="card"> <div class="card">
+25 -13
View File
@@ -176,24 +176,15 @@ class Repository
return []; return [];
} }
try { if ($query === '*') {
$stmt = $this->db->pdo()->prepare( $stmt = $this->db->pdo()->prepare(
"SELECT e.* FROM log_entries e "SELECT * FROM log_entries ORDER BY created_at DESC LIMIT ? OFFSET ?"
JOIN log_entries_fts fts ON e.id = fts.rowid
WHERE log_entries_fts MATCH ?
ORDER BY rank
LIMIT ? OFFSET ?"
); );
$stmt->execute([$query, $limit, $offset]); $stmt->execute([$limit, $offset]);
return $stmt->fetchAll(); return $stmt->fetchAll();
} catch (\PDOException $e) {
return $this->searchLogEntriesLike($query, $limit, $offset);
} }
}
private function searchLogEntriesLike(string $query, int $limit = 200, int $offset = 0): array $like = $this->toLikePattern($query);
{
$like = '%' . str_replace(['%', '_'], ['\\%', '\\_'], $query) . '%';
$stmt = $this->db->pdo()->prepare( $stmt = $this->db->pdo()->prepare(
"SELECT e.* FROM log_entries e "SELECT e.* FROM log_entries e
WHERE e.line LIKE ? WHERE e.line LIKE ?
@@ -204,6 +195,27 @@ class Repository
return $stmt->fetchAll(); return $stmt->fetchAll();
} }
private function toLikePattern(string $query): string
{
$parts = preg_split('/\s+/', $query);
$likeParts = [];
foreach ($parts as $part) {
$escaped = '';
for ($i = 0; $i < strlen($part); $i++) {
$ch = $part[$i];
if ($ch === '*') {
$escaped .= '%';
} elseif ($ch === '%' || $ch === '_') {
$escaped .= '\\' . $ch;
} else {
$escaped .= $ch;
}
}
$likeParts[] = '%' . $escaped . '%';
}
return implode('%', $likeParts);
}
// --- Config --- // --- Config ---
public function getAllowedUserTokens(): array public function getAllowedUserTokens(): array