Theodor-Springmann-Stiftung/hamann-ausgabe-core
1
0
Fork 0
mirror of https://github.com/Theodor-Springmann-Stiftung/hamann-ausgabe-core.git synced 2025-10-29 09:15:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Search Page Adjustments

Browse Source
This commit is contained in:
Simon Martens
2022-11-01 17:14:49 +01:00
parent a6093e3246
commit 74a952270d
8 changed files with 116 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
HaWeb/Controllers/IndexController.cs
View File

@@ -65,27 +65,9 @@ public class IndexController : Controller {
[Route("/HKB/")]
// Order of actions:
// Filter, sort by year, paginate, sort by Meta.Sort & .Order, parse
public IActionResult Index(string? search, int page = 0) {
public IActionResult Index(int page = 0) {
var lib = _lib.GetLibrary();
List<IGrouping<int, Meta>>? metasbyyear = null;
if (search != null) {
var stopwatch = new System.Diagnostics.Stopwatch();
stopwatch.Start();
search = search.Trim();
var res = _xmlService.SearchCollection("letters", search, _readerService);
if (res == null || !res.Any()) return _error404();
var ret = res.ToDictionary(
x => x.Index,
x => x.Results
.Select(y => new SearchResult(search, x.Index) { Page = y.Page, Line = y.Line, Preview = y.Preview })
.ToList()
);
var keys = res.Select(x => x.Index).Where(x => lib.Metas.ContainsKey(x)).Select(x => lib.Metas[x]);
var letters = keys.ToLookup(x => x.Sort.Year).OrderBy(x => x.Key).ToList();
stopwatch.Stop();
Console.WriteLine("SEARCH: " + stopwatch.ElapsedMilliseconds);
return _paginateSend(lib, page, letters, null, null, null, search, ret);
}
metasbyyear = lib.MetasByYear.OrderBy(x => x.Key).ToList();
return _paginateSend(lib, page, metasbyyear);
}
@@ -125,7 +107,7 @@ public class IndexController : Controller {
};
}
private List<(int StartYear, int EndYear)>? _paginate(List<IGrouping<int, Meta>>? letters) {
internal static List<(int StartYear, int EndYear)>? Paginate(List<IGrouping<int, Meta>>? letters, int lettersForPage) {
if (letters == null || !letters.Any()) return null;
List<(int StartYear, int EndYear)>? res = null;
int startyear = 0;
@@ -135,7 +117,7 @@ public class IndexController : Controller {
startyear = letterlist.Key;
}
count += letterlist.Count();
if (count >= _lettersForPage) {
if (count >= lettersForPage) {
if (res == null) res = new List<(int StartYear, int EndYear)>();
res.Add((startyear, letterlist.Key));
count = 0;
@@ -154,10 +136,8 @@ public class IndexController : Controller {
List<IGrouping<int, Meta>> metasbyyear,
string? person = null,
string? zhvolume = null,
string? zhpage = null,
string? activeSearch = null,
Dictionary<string, List<SearchResult>>? searchResults = null) {
var pages = _paginate(metasbyyear);
string? zhpage = null) {
var pages = Paginate(metasbyyear, _lettersForPage);
if (pages != null && page >= pages.Count) return _error404();
if (pages == null && page > 0) return _error404();
List<(int Year, List<BriefeMetaViewModel> LetterList)>? letters = null;
@@ -173,7 +153,7 @@ public class IndexController : Controller {
List<(string Volume, List<string> Pages)>? availablePages = null;
availablePages = lib.Structure.Where(x => x.Key != "-1").Select(x => (x.Key, x.Value.Select(x => x.Key).ToList())).ToList();
zhvolume = zhvolume == null ? "1" : zhvolume;
var model = new IndexViewModel(letters, page, pages, _getAvailablePersons(lib), availablePages.OrderBy(x => x.Volume).ToList(), zhvolume, zhpage, activeSearch, searchResults);
var model = new IndexViewModel(letters, page, pages, _getAvailablePersons(lib), availablePages.OrderBy(x => x.Volume).ToList(), zhvolume, zhpage);
if (person != null) model.ActivePerson = person;
return View("~/Views/HKB/Dynamic/Index.cshtml", model);
}

136
HaWeb/Controllers/SucheController.cs
View File

@@ -22,58 +22,22 @@ public class SucheController : Controller {
_xmlService = service;
_lettersForPage = config.GetValue<int>("LettersOnPage");
}
[Route("/HKB/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)
return RedirectToAction("Index", "Briefe", new { id = letterno });
return _error404();
}
[Route("/HKB/Suche/{zhvolume}/{zhpage}")]
public IActionResult GoToZH(string zhvolume, string zhpage) {
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();
var lines = pages.ContainsKey(zhpage) ? pages[zhpage] : null;
if (lines == null) return _error404();
var letters = lines.Aggregate(new HashSet<string>(), (x, y) => { x.Add(y.Value); return x; });
if (letters != null && letters.Any() && letters.Count == 1) {
string? autopsic = null;
if (lib.Metas.ContainsKey(letters.First())) {
autopsic = lib.Metas[letters.First()].Autopsic;
}
if (autopsic == null) return _error404();
return RedirectToAction("Index", "Briefe", new { id = autopsic });
}
if (letters != null && letters.Any()) {
var metas = lib.Metas.Where(x => letters.Contains(x.Key)).Select(x => x.Value);
if (metas == null) return _error404();
var metasbyyear = metas.ToLookup(x => x.Sort.Year).OrderBy(x => x.Key).ToList();
return _paginateSend(lib, 0, metasbyyear, null, zhvolume, zhpage);
}
return _error404();
}
[Route("/HKB/Suche")]
// Order of actions:
// Filter, sort by year, paginate, sort by Meta.Sort & .Order, parse
public IActionResult Index(string? search, int page = 0) {
public IActionResult Index(string search, string category = "letters", int page = 0) {
if (search == null) return _error404();
var lib = _lib.GetLibrary();
List<IGrouping<int, Meta>>? metasbyyear = null;
if (search != null) {
var stopwatch = new System.Diagnostics.Stopwatch();
stopwatch.Start();
var stopwatch = new System.Diagnostics.Stopwatch();
stopwatch.Start();
if (category == "letters") {
if (String.IsNullOrWhiteSpace(search))
return _paginateSendLetters(lib, page, search, SearchResultType.InvalidSearchTerm, null, null);
search = search.Trim();
var res = _xmlService.SearchCollection("letters", search, _readerService);
if (res == null || !res.Any()) return _error404();
if (res == null || !res.Any())
return _paginateSendLetters(lib, page, search, SearchResultType.NotFound, null, null);
var ret = res.ToDictionary(
x => x.Index,
x => x.Results
@@ -82,29 +46,16 @@ public class SucheController : Controller {
);
var keys = res.Select(x => x.Index).Where(x => lib.Metas.ContainsKey(x)).Select(x => lib.Metas[x]);
var letters = keys.ToLookup(x => x.Sort.Year).OrderBy(x => x.Key).ToList();
stopwatch.Stop();
Console.WriteLine("SEARCH: " + stopwatch.ElapsedMilliseconds);
return _paginateSend(lib, page, letters, null, null, null, search, ret);
return _paginateSendLetters(lib, page, search, SearchResultType.Success, ret, letters);
} else if (category == " register") {
}
metasbyyear = lib.MetasByYear.OrderBy(x => x.Key).ToList();
return _paginateSend(lib, page, metasbyyear);
}
[Route("/HKB/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<IGrouping<int, Meta>>? metasbyyear = null;
var letters = lib.Metas
.Where(x => x.Value.Senders.Contains(person) || x.Value.Receivers.Contains(person))
.Select(x => x.Value);
if (letters == null) return _error404();
metasbyyear = letters.ToLookup(x => x.Sort.Year).OrderBy(x => x.Key).ToList();
return _paginateSend(lib, page, metasbyyear, person);
stopwatch.Stop();
Console.WriteLine("SEARCH: " + stopwatch.ElapsedMilliseconds);
return _error404();
}
private List<(string Key, string Person)> _getAvailablePersons(ILibrary lib) {
return lib.Persons
.OrderBy(x => x.Value.Surname)
@@ -125,39 +76,28 @@ public class SucheController : Controller {
};
}
private List<(int StartYear, int EndYear)>? _paginate(List<IGrouping<int, Meta>>? letters) {
if (letters == null || !letters.Any()) return null;
List<(int StartYear, int EndYear)>? res = null;
int startyear = 0;
int count = 0;
foreach (var letterlist in letters) {
if (count == 0) {
startyear = letterlist.Key;
}
count += letterlist.Count();
if (count >= _lettersForPage) {
if (res == null) res = new List<(int StartYear, int EndYear)>();
res.Add((startyear, letterlist.Key));
count = 0;
}
if (letterlist == letters.Last()) {
if (res == null) res = new List<(int StartYear, int EndYear)>();
res.Add((startyear, letterlist.Key));
}
}
return res;
private List<string>? _paginate(List<(int StartYear, int EndYear)>? pages) {
return pages != null ? pages.Select(x => {
if (x.StartYear != x.EndYear)
return x.StartYear + "–" + x.EndYear;
else
return x.StartYear.ToString();
}).ToList() : null;
}
private IActionResult _paginateSend(
private List<string>? _paginate(List<string> comments) {
return null;
}
private IActionResult _paginateSendLetters(
ILibrary lib,
int page,
List<IGrouping<int, Meta>> metasbyyear,
string? person = null,
string? zhvolume = null,
string? zhpage = null,
string? activeSearch = null,
Dictionary<string, List<SearchResult>>? searchResults = null) {
var pages = _paginate(metasbyyear);
string activeSearch,
SearchResultType SRT,
Dictionary<string, List<SearchResult>>? searchResults,
List<IGrouping<int, Meta>>? metasbyyear
) {
var pages = IndexController.Paginate(metasbyyear, _lettersForPage);
if (pages != null && page >= pages.Count) return _error404();
if (pages == null && page > 0) return _error404();
List<(int Year, List<BriefeMetaViewModel> LetterList)>? letters = null;
@@ -170,11 +110,7 @@ public class SucheController : Controller {
.ThenBy(x => x.Meta.Order)
.ToList()))
.ToList();
List<(string Volume, List<string> Pages)>? availablePages = null;
availablePages = lib.Structure.Where(x => x.Key != "-1").Select(x => (x.Key, x.Value.Select(x => x.Key).ToList())).ToList();
zhvolume = zhvolume == null ? "1" : zhvolume;
var model = new SucheViewModel(letters, page, pages, _getAvailablePersons(lib), availablePages.OrderBy(x => x.Volume).ToList(), zhvolume, zhpage, activeSearch, searchResults);
if (person != null) model.ActivePerson = person;
var model = new SucheViewModel(SearchType.Letter, SearchResultType.Success, page, _paginate(pages), activeSearch, searchResults, letters);
return View("~/Views/HKB/Dynamic/Suche.cshtml", model);
}