From 4f7f3b5d461753c5695705342c041662af582d72 Mon Sep 17 00:00:00 2001 From: schnulller Date: Sun, 19 Jun 2022 00:55:11 +0200 Subject: [PATCH] Added trim to all search terms on start page --- HaWeb/Controllers/SucheController.cs | 7 +++++++ HaWeb/README.md | 6 ++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/HaWeb/Controllers/SucheController.cs b/HaWeb/Controllers/SucheController.cs index e451db6..41b43e5 100644 --- a/HaWeb/Controllers/SucheController.cs +++ b/HaWeb/Controllers/SucheController.cs @@ -22,6 +22,8 @@ public class SucheController : Controller { [Route("Suche/{letterno}")] public IActionResult GoTo(string letterno) { + if (String.IsNullOrWhiteSpace(letterno)) return _error404(); + letterno = letterno.Trim(); var lib = _lib.GetLibrary(); var letter = lib.Metas.Where(x => x.Value.Autopsic == letterno); if (letter != null) @@ -32,6 +34,9 @@ public class SucheController : Controller { [Route("Suche/{zhvolume}/{zhpage}")] public IActionResult GoToZH(string zhvolume, string zhpage) { // TODO: Bug in letter parsing: dictionary is WRONG! + if (String.IsNullOrWhiteSpace(zhvolume) || String.IsNullOrWhiteSpace(zhpage)) return _error404(); + zhvolume = zhvolume.Trim(); + zhpage = zhpage.Trim(); var lib = _lib.GetLibrary(); var pages = lib.Structure.ContainsKey(zhvolume) ? lib.Structure[zhvolume] : null; if (pages == null) return _error404(); @@ -62,6 +67,7 @@ public class SucheController : Controller { var lib = _lib.GetLibrary(); List>? metasbyyear = null; if (search != null) { + search = search.Trim(); var sw = new System.Diagnostics.Stopwatch(); sw.Start(); var res = _lib.SearchLetters(search, _readerService); @@ -86,6 +92,7 @@ public class SucheController : Controller { [Route("Suche/Person/{person}")] public IActionResult Person(string person, int page = 0) { if (String.IsNullOrWhiteSpace(person)) return _error404(); + person = person.Trim(); var lib = _lib.GetLibrary(); List>? metasbyyear = null; var letters = lib.Metas diff --git a/HaWeb/README.md b/HaWeb/README.md index e54aa92..ad4002d 100644 --- a/HaWeb/README.md +++ b/HaWeb/README.md @@ -69,10 +69,8 @@ TODO 659 align center und align-right ueberschneidugn TODO Word-wrap before align, tabs TODO pills are not mobile friendly (hover / click) TODO Evtl alignment von center / right an der letzten oder nächsten zeile -TODO Abhärten des Konstruktors von XMLRootDokument für von außerhalb platzierte Dokumente TODO XML-Check im Client -TODO Lock für die Liste, Bzw ConcurretBag TODO 516A david friedlaender in den traditions -TODO 3 Zeilen marginal schließt perfekt an 2 zeilen text an -TODO Einfügungszeichen zerstört suchergebnisse \ No newline at end of file +TODO Einfügungszeichen zerstört suchergebnisse +TODO Fußnoten in static pages funktionieren nicht \ No newline at end of file