diff --git a/RMuseum/Models/Ganjoor/CategoryWordCount.cs b/RMuseum/Models/Ganjoor/CategoryWordCount.cs index a3704cc9..ad86e6de 100644 --- a/RMuseum/Models/Ganjoor/CategoryWordCount.cs +++ b/RMuseum/Models/Ganjoor/CategoryWordCount.cs @@ -24,11 +24,6 @@ namespace RMuseum.Models.Ganjoor /// public int Count { get; set; } - /// - /// is root cat - /// - public bool PoetCat { get; set; } - /// /// row number in category /// diff --git a/RMuseum/RMuseum.xml b/RMuseum/RMuseum.xml index 61995223..79087272 100644 --- a/RMuseum/RMuseum.xml +++ b/RMuseum/RMuseum.xml @@ -7239,11 +7239,6 @@ Count - - - is root cat - - row number in category diff --git a/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-CategoryWordCounts.cs b/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-CategoryWordCounts.cs index 42501d1a..76fc1a7a 100644 --- a/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-CategoryWordCounts.cs +++ b/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-CategoryWordCounts.cs @@ -80,7 +80,7 @@ namespace RMuseum.Services.Implementation { var poetCat = await context.GanjoorCategories.AsNoTracking().Where(c => c.PoetId == poet.Id && c.ParentId == null).SingleAsync(); await jobProgressServiceEF.UpdateJob(job.Id, poet.Id, poet.Nickname); - var wordCounts = await _BuildCategoryWordStatsAsync(context, poetCat, true, jobProgressServiceEF, job); + var wordCounts = await _BuildCategoryWordStatsAsync(context, poetCat, jobProgressServiceEF, job); if(true == await context.CategoryWordCounts.Where(c => c.CatId == poetCat.Id).AnyAsync()) { List catIdList = new List @@ -157,13 +157,13 @@ namespace RMuseum.Services.Implementation }); } - private async Task> _BuildCategoryWordStatsAsync(RMuseumDbContext context, GanjoorCat cat, bool poetCat, LongRunningJobProgressServiceEF jobProgressServiceEF, RLongRunningJobStatus job) + private async Task> _BuildCategoryWordStatsAsync(RMuseumDbContext context, GanjoorCat cat, LongRunningJobProgressServiceEF jobProgressServiceEF, RLongRunningJobStatus job) { List counts = new List(); var children = await context.GanjoorCategories.AsNoTracking().Where(c => c.ParentId == cat.Id).ToListAsync(); foreach (var child in children) { - var subcatCounts = await _BuildCategoryWordStatsAsync(context, child, false, jobProgressServiceEF, job); + var subcatCounts = await _BuildCategoryWordStatsAsync(context, child, jobProgressServiceEF, job); if (subcatCounts.Any()) { foreach (var count in subcatCounts) @@ -175,7 +175,7 @@ namespace RMuseum.Services.Implementation } else { - counts.Add(new CategoryWordCount { CatId = cat.Id, Word = count.Word, Count = count.Count, PoetCat = poetCat }); + counts.Add(new CategoryWordCount { CatId = cat.Id, Word = count.Word, Count = count.Count }); } } counts.AddRange(subcatCounts); @@ -199,7 +199,7 @@ namespace RMuseum.Services.Implementation } else { - counts.Add(new CategoryWordCount { CatId = cat.Id, Word = word, Count = 1, PoetCat = poetCat }); + counts.Add(new CategoryWordCount { CatId = cat.Id, Word = word, Count = 1 }); } } }