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 17:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: doppelte Marginalien

Browse Source
This commit is contained in:
Simon Martens
2023-10-26 13:04:49 +02:00
parent d85611182f
commit bc9521d53e
5 changed files with 54 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
HaWeb/Settings/NodeRules/MarginalCollection.cs Normal file
View File

@@ -0,0 +1,42 @@
using HaWeb.Models;
using System.Xml.Linq;
using HaWeb.XMLTests;
namespace HaWeb.Settings.NodeRules;
public class MarginalCollectionRules : ICollectionRule {
public string Name { get; } = "marginal";
public HamannXPath[] Bases { get; } = {
new HamannXPath() { Documents = new[] { "stellenkommentar" }, XPath = "//marginal"}
};
public HamannXPath[] Backlinks { get; } = {};
public IEnumerable<(string, XElement, XMLRootDocument)> GenerateIdentificationStrings(IEnumerable<(XElement, XMLRootDocument)> list) {
foreach (var e in list) {
var id = e.Item1.Attribute("letter")!.Value;
id += "-";
id += e.Item1.Attribute("page")!.Value;
id += "-";
id += e.Item1.Attribute("line")!.Value;
if (e.Item1.HasAttributes && e.Item1.Attribute("sort") != null) {
id += "-";
id += e.Item1.Attribute("sort")!.Value;
}
yield return (
id,
e.Item1,
e.Item2
);
}
}
public IEnumerable<(string, XElement, XMLRootDocument, bool)> GenerateBacklinkString(IEnumerable<(XElement, XMLRootDocument)> list) => null;
public bool CheckDatatypes(XElement element) {
if (element.HasAttributes && element.Attribute("sort") != null ) {
return Int32.TryParse(element.Attribute("sort").Value, out var _);
} else {
return true;
}
}
}

4
HaWeb/Settings/NodeRules/StructureCollection.cs
View File

@@ -44,4 +44,8 @@ public class StructureCollection : ICollectionRule {
partialmatch); partialmatch);
} }
} }
public bool CheckDatatypes(XElement element) {
return true;
}
} }

5
HaWeb/Settings/ParsingRules/TextRules.cs
View File

@@ -234,8 +234,9 @@ public class TextRules {
if(reader.State.ParsedMarginals == null) reader.State.ParsedMarginals = new List<(string, string, string)>(); if(reader.State.ParsedMarginals == null) reader.State.ParsedMarginals = new List<(string, string, string)>();
var sb2 = new StringBuilder(); var sb2 = new StringBuilder();
// Sortiert an dieser String, nicht nach Zahl: sort 1-9 ist möglich, es gibt keine Abstürze bei fehlerhaften Werten // Sortiert an dieser Stelle nach marginal.Sort, dessen Angabe eine Zahl sein muss.
if (margs.Count() > 1) margs = margs.OrderBy(x => x.Sort ?? " "); // Der Syntaxchecker muss also überprüfen, ob doppelte Angaben gemacht sind oder Sort fehlt.
if (margs.Count() > 1) margs = margs.Where(x => Int32.TryParse(x.Sort, out var y)).OrderBy(x => Int32.Parse(x.Sort));
sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, CSSClasses.COMMENTMARKERCLASS, "ma-" + reader.State.currpage + "-" + reader.State.currline)); sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, CSSClasses.COMMENTMARKERCLASS, "ma-" + reader.State.currpage + "-" + reader.State.currline));
sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT));
sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, CSSClasses.MARGINGALBOXCLASS)); sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, CSSClasses.MARGINGALBOXCLASS));

1
HaWeb/XMLTests/ICollectionRule.cs
View File

@@ -8,4 +8,5 @@ public interface ICollectionRule {
public HamannXPath[] Backlinks { get; } public HamannXPath[] Backlinks { get; }
public IEnumerable<(string, XElement, XMLRootDocument)> GenerateIdentificationStrings(IEnumerable<(XElement, XMLRootDocument)> List); public IEnumerable<(string, XElement, XMLRootDocument)> GenerateIdentificationStrings(IEnumerable<(XElement, XMLRootDocument)> List);
public IEnumerable<(string, XElement, XMLRootDocument, bool)> GenerateBacklinkString(IEnumerable<(XElement, XMLRootDocument)> List); public IEnumerable<(string, XElement, XMLRootDocument, bool)> GenerateBacklinkString(IEnumerable<(XElement, XMLRootDocument)> List);
public bool CheckDatatypes(XElement element);
} }

5
HaWeb/XMLTests/XMLTester.cs
View File

@@ -135,9 +135,12 @@ public class XMLTester {
foreach (var r in rule.GenerateIdentificationStrings(elemens)) { foreach (var r in rule.GenerateIdentificationStrings(elemens)) {
if (!hs.Add(r.Item1)) { if (!hs.Add(r.Item1)) {
var lc = getLineColumn(r.Item2); var lc = getLineColumn(r.Item2);
_Results[r.Item3.File.FileName].Log(lc.Item1, lc.Item2, "Brief-Seite-Zeile " + r.Item1 + " mehrdeutig."); _Results[r.Item3.File.FileName].Log(lc.Item1, lc.Item2, "Identifikator (Brief-Seite-Zeile(-Sort))" + r.Item1 + " mehrdeutig.");
} }
} }
foreach (var e in elemens) {
rule.CheckDatatypes(e.Item1);
}
} }
} }
_CollectionIDs!.TryAdd(rule.Name, hs); _CollectionIDs!.TryAdd(rule.Name, hs);