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

docs: #294 another bug fix

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2022-03-23 11:32:05 +04:30
parent 357291e4ca
commit b4d02e7701
2 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-Maintenance.cs
View File

@ -172,11 +172,10 @@ namespace RMuseum.Services.Implementation
{
return new RServiceResult<bool>(false, resGeneration.ExceptionString);
}
var cat = await _context.GanjoorCategories.AsNoTracking().Where(c => c.Id == catId).SingleAsync();
var dbPage = await _context.GanjoorPages.AsNoTracking().Where(p => p.GanjoorPageType == GanjoorPageType.CatPage && p.CatId == catId).SingleOrDefaultAsync();
if(dbPage == null)
{
var cat = await _context.GanjoorCategories.AsNoTracking().Where(c => c.Id == catId).SingleAsync();
dbPage = await _context.GanjoorPages.AsNoTracking().Where(p => p.GanjoorPageType == GanjoorPageType.PoetPage && p.PoetId == cat.PoetId).SingleAsync();
}
@ -188,6 +187,13 @@ namespace RMuseum.Services.Implementation
Note = "تولید فهرست بخش",
UrlSlug = dbPage.UrlSlug,
NoIndex = dbPage.NoIndex,
RedirectFromFullUrl = dbPage.RedirectFromFullUrl,
Published = dbPage.Published,
CatType = cat.CatType,
Description = cat.Description,
DescriptionHtml = cat.DescriptionHtml,
MixedModeOrder = cat.MixedModeOrder,
TableOfContentsStyle = cat.TableOfContentsStyle,
}
);

51
RMuseum/Services/Implementation/LanguageUtils.cs
View File

@ -30,7 +30,7 @@ namespace RMuseum.Services.Implementation
/// <param name="specfics"></param>
/// <param name="additional"></param>
/// <returns></returns>
public static string GetFirstNotMatchingCharacter(string input, string specfics, string additional= "")
public static string GetFirstNotMatchingCharacter(string input, string specfics, string additional = "")
{
string all = specfics + additional;
foreach (char c in input)
@ -87,7 +87,7 @@ namespace RMuseum.Services.Implementation
.Trim();
}
/// <summary>
/// find rhyme
/// </summary>
@ -98,10 +98,10 @@ namespace RMuseum.Services.Implementation
{
List<string> verseTextList = verses.Count == 2 ? verses.Select(v => v.Text).ToList()
: verses.Where(v => v.VersePosition == VersePosition.Left).Select(v => v.Text).ToList();
if(verseTextList.Count > 1)
if (verseTextList.Count > 1)
{
string rhyme = PrepareTextForFindingRhyme(verseTextList[0]);
if(string.IsNullOrEmpty(rhyme))
if (string.IsNullOrEmpty(rhyme))
{
return new GanjooRhymeAnalysisResult()
{
@ -109,11 +109,10 @@ namespace RMuseum.Services.Implementation
FailVerse = verseTextList[0]
};
}
if(secondPhase)
if (secondPhase)
{
if (secondPhase)
if (rhyme.Length > 0 && rhyme[rhyme.Length - 1] == 'ی')
rhyme = rhyme.Remove(rhyme.Length - 1);
if (rhyme.Length > 0 && rhyme[rhyme.Length - 1] == 'ی')
rhyme = rhyme.Remove(rhyme.Length - 1);
}
for (int j = 1; j < verseTextList.Count; j++)
@ -194,6 +193,19 @@ namespace RMuseum.Services.Implementation
}
if (rhyme.Length == 0)
{
if (verseTextList.Count == 2)
{
var secVerse = PrepareTextForFindingRhyme(verseTextList[1]);
if (secVerse.Length > 0)
{
return new GanjooRhymeAnalysisResult()
{
Rhyme = $"{secVerse[secVerse.Length - 1]}",
FailVerse = ""
};
}
}
return new GanjooRhymeAnalysisResult()
{
Rhyme = "",
@ -203,30 +215,11 @@ namespace RMuseum.Services.Implementation
}
if(!secondPhase)
{
if(string.IsNullOrEmpty(rhyme))
{
return FindRhyme(verses, true);
}
}
else
if (!secondPhase)
{
if (string.IsNullOrEmpty(rhyme))
{
if(verseTextList.Count == 2)
{
var secVerse = PrepareTextForFindingRhyme(verseTextList[1]);
if(secVerse.Length > 0)
{
return new GanjooRhymeAnalysisResult()
{
Rhyme = $"{secVerse[secVerse.Length - 1]}",
FailVerse = ""
};
}
}
return FindRhyme(verses, true);
}
}