anas/divan
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

TOC bug fix

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2024-05-20 12:02:54 +03:30
parent 815b059581
commit 6eb714cf9d
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-TOC.cs
View File

@ -140,14 +140,15 @@ namespace RMuseum.Services.Implementation
{
if (options == GanjoorTOC.TitlesAndFirstVerse || options == GanjoorTOC.AlphabeticWithFirstVerse || options == GanjoorTOC.AlphabeticWithFirstVerseNotSorted)
{
var excerpt = verses[0].Text;
var excerptVerse = verses.Any(v => v.VersePosition != VersePosition.Comment) ? verses.Where(v => v.VersePosition != VersePosition.Comment).First() : verses.First();
var excerpt = excerptVerse.Text;
if (
(
verses[0].VersePosition == VersePosition.Paragraph
excerptVerse.VersePosition == VersePosition.Paragraph
||
verses[0].VersePosition == VersePosition.Single
excerptVerse.VersePosition == VersePosition.Single
||
verses[0].VersePosition == VersePosition.Comment
excerptVerse.VersePosition == VersePosition.Comment
) && excerpt.Length > 100)
{
excerpt = excerpt.Substring(0, 50);
@ -166,25 +167,27 @@ namespace RMuseum.Services.Implementation
else
if (options == GanjoorTOC.AlphabeticWithSecondVerse || options == GanjoorTOC.AlphabeticWithSecondVerseNotSorted || options == GanjoorTOC.TitlesAndSecondVerse)
{
if (verses.Length > 1)
var excerptVerses = verses.Any(v => v.VersePosition != VersePosition.Comment) ? verses.Where(v => v.VersePosition != VersePosition.Comment).ToArray() : verses;
if (excerptVerses.Length > 1)
{
title += $": {verses[1].Text}";
title += $": {excerptVerses[1].Text}";
}
else
{
title += $": {verses[0].Text}";
title += $": {excerptVerses[0].Text}";
}
}
else
if (options == GanjoorTOC.AlphabeticWithFirstCouplet || options == GanjoorTOC.AlphabeticWithFirstCoupletNotSorted || options == GanjoorTOC.TitlesAndFirstCouplet)
{
if (verses.Length > 1)
var excerptVerses = verses.Any(v => v.VersePosition != VersePosition.Comment) ? verses.Where(v => v.VersePosition != VersePosition.Comment).ToArray() : verses;
if (excerptVerses.Length > 1)
{
title += $": {verses[0].Text} - {verses[1].Text}";
title += $": {excerptVerses[0].Text} - {excerptVerses[1].Text}";
}
else
{
title += $": {verses[0].Text}";
title += $": {excerptVerses[0].Text}";
}
}
else
@ -196,7 +199,8 @@ namespace RMuseum.Services.Implementation
}
else
{
title += $": {verses[0].Text}";
var excerptVerse = verses.Any(v => v.VersePosition != VersePosition.Comment) ? verses.Where(v => v.VersePosition != VersePosition.Comment).First() : verses.First();
title += $": {excerptVerse.Text}";
}
}
else
@ -212,7 +216,8 @@ namespace RMuseum.Services.Implementation
}
else
{
title += $": {verses[0].Text}";
var excerptVerse = verses.Any(v => v.VersePosition != VersePosition.Comment) ? verses.Where(v => v.VersePosition != VersePosition.Comment).First() : verses.First();
title += $": {excerptVerse.Text}";
}
}
}