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

Migitated some null risks

Browse Source
This commit is contained in:
schnulller
2022-06-19 01:58:07 +02:00
parent 4f7f3b5d46
commit d8a4fe7790
11 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HaWeb/Controllers/APIController.cs
View File

@@ -52,7 +52,7 @@ public class APIController : Controller {
[DisableFormValueModelBinding]
[ValidateAntiForgeryToken]
[FeatureGate(Features.UploadService, Features.AdminService)]
public async Task<IActionResult> SyntaxCheck(string id) {
public IActionResult SyntaxCheck(string id) {
return Ok();
}

10
HaWeb/Controllers/RegisterController.cs
View File

@@ -49,9 +49,10 @@ public class RegisterController : Controller {
ViewData["SEODescription"] = "Johann Georg Hamann: Kommentierte Briefausgabe. Personen-, Sach- und Ortsregister.";
// Normalisation and validation
if (id == null) return Redirect(url + defaultLetter);
if (String.IsNullOrWhiteSpace(id)) return Redirect(url + defaultLetter);
id = normalizeID(id, defaultLetter);
if (!lib.CommentsByCategoryLetter[category].Contains(id)) return error404();
if (String.IsNullOrWhiteSpace(id)) return Redirect(url + defaultLetter);
if (!lib.CommentsByCategoryLetter[category].Contains(id!)) return error404();
// Data aquisition and validation
var comments = lib.CommentsByCategoryLetter[category][id].OrderBy(x => x.Index);
@@ -115,8 +116,9 @@ public class RegisterController : Controller {
ViewData["SEODescription"] = "Johann Georg Hamann: Kommentierte Briefausgabe. Forschungsbibliographie.";
// Normalisation and Validation
if (id == null) return Redirect(url + defaultLetter);
if (String.IsNullOrWhiteSpace(id)) return Redirect(url + defaultLetter);
id = normalizeID(id, defaultLetter);
if (String.IsNullOrWhiteSpace(id)) return Redirect(url + defaultLetter);
if (id != "EDITIONEN" && !lib.CommentsByCategoryLetter[category].Contains(id)) return error404();
if (id == "EDITIONEN" && !lib.CommentsByCategoryLetter.Keys.Contains(id.ToLower())) return error404();
@@ -175,6 +177,7 @@ public class RegisterController : Controller {
private List<CommentModel> _createCommentModelForschungRegister(string category, IOrderedEnumerable<Comment>? comments) {
var lib = _lib.GetLibrary();
var res = new List<CommentModel>();
if (comments == null) return res;
foreach (var comm in comments) {
var parsedComment = HTMLHelpers.CommentHelpers.CreateHTML(lib, _readerService, comm, category, Settings.ParsingState.CommentType.Comment);
List<string>? parsedSubComments = null;
@@ -192,6 +195,7 @@ public class RegisterController : Controller {
private List<CommentModel> _createCommentModelBibel(string category, IOrderedEnumerable<Comment>? comments) {
var lib = _lib.GetLibrary();
var res = new List<CommentModel>();
if (comments == null) return res;
foreach (var comm in comments) {
var parsedComment = HTMLHelpers.CommentHelpers.CreateHTML(lib, _readerService, comm, category, Settings.ParsingState.CommentType.Comment);
List<string>? parsedSubComments = null;

4
HaWeb/Controllers/SucheController.cs
View File

@@ -68,8 +68,6 @@ public class SucheController : Controller {
List<IGrouping<int, Meta>>? metasbyyear = null;
if (search != null) {
search = search.Trim();
var sw = new System.Diagnostics.Stopwatch();
sw.Start();
var res = _lib.SearchLetters(search, _readerService);
if (res == null || !res.Any()) return _error404();
var ret = res.ToDictionary(
@@ -80,8 +78,6 @@ 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();
sw.Stop();
Console.WriteLine(sw.ElapsedMilliseconds);
return _paginateSend(lib, page, letters, null, null, null, search, ret);
}

4
HaWeb/HTMLHelpers/LinkHelper.cs
View File

@@ -33,7 +33,7 @@ public class LinkHelper {
reader.Tag += OnTag;
}
private void OnTag(object _, Tag tag) {
private void OnTag(object? _, Tag tag) {
if (tag.Name == "wwwlink" || tag.Name == "intlink" || tag.Name == "link") {
if (tag.EndTag && _followlinksinthis) {
_sb.Append(HTMLHelpers.TagHelpers.CreateEndElement("a"));
@@ -68,7 +68,7 @@ public class LinkHelper {
}
}
if (tag.Name == "link" && tag.Values != null) {
Comment comment = null;
Comment? comment = null;
if (tag.Values.ContainsKey("subref") && _lib.SubCommentsByID.ContainsKey(tag["subref"]))
comment = _lib.SubCommentsByID[tag["subref"]];
else if (tag.Values.ContainsKey("ref"))

1
HaWeb/Models/FileModel.cs
View File

@@ -13,5 +13,6 @@ public class FileModel {
IsUsed = isUsed;
LastModified = lastModified;
InProduction = inProduction;
Prefix = prefix;
}
}

2
HaWeb/Models/SucheViewModel.cs
View File

@@ -6,7 +6,7 @@ public class SucheViewModel {
public int Count { get; private set; }
public int ActiveYear { get; private set; }
public List<(int StartYear, int EndYear)>? AvailableYears { get; private set; }
public string? ActivePerson {get; set; }
public string? ActivePerson { get; set; }
public List<(string Key, string Name)>? AvailablePersons { get; private set; }
public List<(string Volume, List<string> Pages)>? AvailablePages { get; private set; }
public string? ActiveVolume { get; private set; }

2
HaWeb/SearchHelpers/SearchRules.cs
View File

@@ -26,7 +26,7 @@ public class SearchRules {
})
};
public static readonly WhitespaceFuncList WhitespaceRules= new WhitespaceFuncList() {
public static readonly WhitespaceFuncList WhitespaceRules = new WhitespaceFuncList() {
( (x, _) => true, (sb, text, reader) => {
var t = text.Value;
if (reader.State.Normalize)

2
HaWeb/Views/Suche/Index.cshtml
View File

@@ -12,7 +12,7 @@
<div class="ha-searchhead">
<h1>Briefauswahl</h1>
<div class="ha-searchnav">
@if (Model.AvailableYears != null && Model.AvailableYears.Any()) {
@if (Model.AvailableYears != null && Model.AvailableYears.Any() && Model.AvailableYears.Count > 1) {
@for(var i = 0; i < Model.AvailableYears.Count; i++) {
<a class="@(Model.ActiveYear == i ? "active" : "")" asp-route-person="@Model.ActivePerson" asp-route-search="@Model.ActiveSearch" asp-controller="Suche" asp-route-page="@i">
@if (Model.AvailableYears[i].StartYear != Model.AvailableYears[i].EndYear) {