diff --git a/RMuseum/Controllers/GanjoorController.cs b/RMuseum/Controllers/GanjoorController.cs index 48be3d00..4edf23ef 100644 --- a/RMuseum/Controllers/GanjoorController.cs +++ b/RMuseum/Controllers/GanjoorController.cs @@ -4246,11 +4246,6 @@ namespace RMuseum.Controllers public async Task GetCategoryWordCountsAsync(int catId, string term, [FromQuery] PagingParameterModel paging) { - if (!bool.Parse(Configuration["WordCounts"])) - { - return BadRequest(); - } - var pagedResult = await _ganjoorService.GetCategoryWordCountsAsync(catId, term, paging); if (!string.IsNullOrEmpty(pagedResult.ExceptionString)) return BadRequest(pagedResult.ExceptionString); @@ -4269,10 +4264,6 @@ namespace RMuseum.Controllers public async Task GetCategoryWordCountSummaryAsync(int catId) { - if(!bool.Parse(Configuration["WordCounts"])) - { - return BadRequest(); - } var res = await _ganjoorService.GetCategoryWordCountSummaryAsync(catId); if (!string.IsNullOrEmpty(res.ExceptionString)) return BadRequest(res.ExceptionString); diff --git a/RMuseum/Models/Ganjoor/ViewModels/GanjoorCatViewModel.cs b/RMuseum/Models/Ganjoor/ViewModels/GanjoorCatViewModel.cs index 258d79e7..9110fab3 100644 --- a/RMuseum/Models/Ganjoor/ViewModels/GanjoorCatViewModel.cs +++ b/RMuseum/Models/Ganjoor/ViewModels/GanjoorCatViewModel.cs @@ -80,16 +80,6 @@ namespace RMuseum.Models.Ganjoor.ViewModels /// public string MapName { get; set; } - /// - /// tajik title - /// - public string TajikTitle { get; set; } - - /// - /// additional descripion or note in Tajik - /// - public string TajikDescription { get; set; } - /// /// Next Category without Ancestors/Children/Poems info /// diff --git a/RMuseum/Models/Ganjoor/ViewModels/GanjoorPoemCompleteViewModel.cs b/RMuseum/Models/Ganjoor/ViewModels/GanjoorPoemCompleteViewModel.cs index 2173feb7..173279fd 100644 --- a/RMuseum/Models/Ganjoor/ViewModels/GanjoorPoemCompleteViewModel.cs +++ b/RMuseum/Models/Ganjoor/ViewModels/GanjoorPoemCompleteViewModel.cs @@ -146,10 +146,5 @@ namespace RMuseum.Models.Ganjoor.ViewModels /// poem is claimed by multiple poets /// public bool ClaimedByMultiplePoets { get; set; } - - /// - /// tajik title - /// - public string TajikTitle { get; set; } } } diff --git a/RMuseum/Models/Ganjoor/ViewModels/GanjoorPoemSummaryViewModel.cs b/RMuseum/Models/Ganjoor/ViewModels/GanjoorPoemSummaryViewModel.cs index 667df4e5..3b31fa91 100644 --- a/RMuseum/Models/Ganjoor/ViewModels/GanjoorPoemSummaryViewModel.cs +++ b/RMuseum/Models/Ganjoor/ViewModels/GanjoorPoemSummaryViewModel.cs @@ -25,11 +25,6 @@ /// public string Excerpt { get; set; } - /// - /// tajik title - /// - public string TajikTitle { get; set; } - /// /// whole poem sections /// diff --git a/RMuseum/Models/Ganjoor/ViewModels/GanjoorPoetViewModel.cs b/RMuseum/Models/Ganjoor/ViewModels/GanjoorPoetViewModel.cs index 800f562d..6e8345ce 100644 --- a/RMuseum/Models/Ganjoor/ViewModels/GanjoorPoetViewModel.cs +++ b/RMuseum/Models/Ganjoor/ViewModels/GanjoorPoetViewModel.cs @@ -100,16 +100,6 @@ /// public double DeathPlaceLongitude { get; set; } - /// - /// tajik nick name - /// - public string TajikNickName { get; set; } - - /// - /// additional descripion or note in Tajik - /// - public string TajikDescription { get; set; } - public override string ToString() { return Nickname; diff --git a/RMuseum/Models/Ganjoor/ViewModels/GanjoorVerseViewModel.cs b/RMuseum/Models/Ganjoor/ViewModels/GanjoorVerseViewModel.cs index 9a736a02..7f565dcd 100644 --- a/RMuseum/Models/Ganjoor/ViewModels/GanjoorVerseViewModel.cs +++ b/RMuseum/Models/Ganjoor/ViewModels/GanjoorVerseViewModel.cs @@ -60,11 +60,6 @@ /// public string CoupletSummary { get; set; } - /// - /// tajik text - /// - public string Tajik { get; set; } - public override string ToString() { return Text; diff --git a/RMuseum/Services/Implementation/GanjoorService.cs b/RMuseum/Services/Implementation/GanjoorService.cs index 13b07e92..73801d2f 100644 --- a/RMuseum/Services/Implementation/GanjoorService.cs +++ b/RMuseum/Services/Implementation/GanjoorService.cs @@ -80,8 +80,6 @@ namespace RMuseum.Services.Implementation DeathPlaceLatitude = poet.DeathLocation == null ? 0 : poet.DeathLocation.Latitude, DeathPlaceLongitude = poet.DeathLocation == null ? 0 : poet.DeathLocation.Longitude, PinOrder = poet.PinOrder, - TajikNickName = poet.TajikNickName, - TajikDescription = poet.TajikDescription, } ) .AsNoTracking() @@ -306,8 +304,6 @@ namespace RMuseum.Services.Implementation RImageId = parent.RImageId, SumUpSubsGeoLocations = parent.SumUpSubsGeoLocations, MapName = parent.MapName, - TajikTitle = parent.TajikTitle, - TajikDescription = parent.TajikDescription, }); parent = await context.GanjoorCategories.Where(c => c.Id == parent.ParentId).AsNoTracking().FirstOrDefaultAsync(); @@ -341,8 +337,6 @@ namespace RMuseum.Services.Implementation RImageId = c.RImageId, SumUpSubsGeoLocations = c.SumUpSubsGeoLocations, MapName = c.MapName, - TajikTitle = c.TajikTitle, - TajikDescription = c.TajikDescription, //other fields null } ).AsNoTracking().SingleOrDefaultAsync(); @@ -374,8 +368,6 @@ namespace RMuseum.Services.Implementation RImageId = c.RImageId, SumUpSubsGeoLocations = c.SumUpSubsGeoLocations, MapName = c.MapName, - TajikTitle = c.TajikTitle, - TajikDescription = c.TajikDescription, //other fields null } ).AsNoTracking().SingleOrDefaultAsync(); @@ -396,8 +388,6 @@ namespace RMuseum.Services.Implementation RImageId = cat.RImageId, SumUpSubsGeoLocations = cat.SumUpSubsGeoLocations, MapName = cat.MapName, - TajikTitle = cat.TajikTitle, - TajikDescription = cat.TajikDescription, Next = nextCat, Previous = preCat, Ancestors = ancetors, @@ -411,7 +401,6 @@ namespace RMuseum.Services.Implementation FullUrl = c.FullUrl, MixedModeOrder = c.MixedModeOrder, Published = c.Published, - TajikTitle = c.TajikTitle, } ).AsNoTracking().ToListAsync(), Poems = poems ? await context.GanjoorPoems @@ -423,7 +412,6 @@ namespace RMuseum.Services.Implementation Title = p.Title, UrlSlug = p.UrlSlug, Excerpt = context.GanjoorVerses.Where(v => v.PoemId == p.Id && v.VOrder == 1).FirstOrDefault().Text, - TajikTitle = p.TajikTitle, } ).AsNoTracking().ToListAsync() : @@ -483,8 +471,6 @@ namespace RMuseum.Services.Implementation DeathPlace = poet.DeathLocation == null ? "" : poet.DeathLocation.Name, DeathPlaceLatitude = poet.DeathLocation == null ? 0 : poet.DeathLocation.Latitude, DeathPlaceLongitude = poet.DeathLocation == null ? 0 : poet.DeathLocation.Longitude, - TajikNickName = poet.TajikNickName, - TajikDescription = poet.TajikDescription, }).AsNoTracking().FirstOrDefaultAsync(), Cat = catViewModel } @@ -645,8 +631,6 @@ namespace RMuseum.Services.Implementation ValidDeathDate = poet.ValidDeathDate, DeathYearInLHijri = poet.DeathYearInLHijri, PinOrder = poet.PinOrder, - TajikNickName = poet.TajikNickName, - TajikDescription = poet.TajikDescription, } ) .AsNoTracking().SingleAsync(); @@ -1498,7 +1482,6 @@ namespace RMuseum.Services.Implementation Id = comment.Poem.Id, Title = comment.Poem.FullTitle, UrlSlug = comment.Poem.FullUrl, - TajikTitle = comment.Poem.TajikTitle, Excerpt = "" } }; @@ -1630,7 +1613,6 @@ namespace RMuseum.Services.Implementation Id = comment.Poem.Id, Title = comment.Poem.FullTitle, UrlSlug = comment.Poem.FullUrl, - TajikTitle = comment.Poem.TajikTitle, Excerpt = "" } } @@ -1762,7 +1744,6 @@ namespace RMuseum.Services.Implementation SectionIndex4 = v.SectionIndex4, LanguageId = v.LanguageId, CoupletSummary = v.CoupletSummary, - Tajik = v.Tajik, } ).AsNoTracking().ToArrayAsync()); } @@ -1832,7 +1813,6 @@ namespace RMuseum.Services.Implementation Id = p.Id, Title = p.Title, UrlSlug = p.UrlSlug, - TajikTitle = p.TajikTitle, Excerpt = _context.GanjoorVerses.Where(v => v.PoemId == p.Id && v.VOrder == 1).FirstOrDefault().Text } ).AsNoTracking().SingleAsync(); @@ -1863,7 +1843,6 @@ namespace RMuseum.Services.Implementation Id = p.Id, Title = p.Title, UrlSlug = p.UrlSlug, - TajikTitle = p.TajikTitle, Excerpt = _context.GanjoorVerses.Where(v => v.PoemId == p.Id && v.VOrder == 1).FirstOrDefault().Text } ).AsNoTracking().SingleAsync(); @@ -1910,7 +1889,6 @@ namespace RMuseum.Services.Implementation SectionIndex4 = v.SectionIndex4, LanguageId = v.LanguageId, CoupletSummary = v.CoupletSummary, - Tajik = v.Tajik, } ).AsNoTracking().ToArrayAsync(); }; @@ -1985,7 +1963,6 @@ namespace RMuseum.Services.Implementation GeoDateTags = geoDateTags, Top6QuotedPoems = quoteds, ClaimedByMultiplePoets = poem.ClaimedByMultiplePoets, - TajikTitle = poem.TajikTitle, }; if (AggressiveCacheEnabled) @@ -2637,7 +2614,6 @@ namespace RMuseum.Services.Implementation Published = section.Poem.Published, Language = section.Poem.Language, PoemSummary = section.Poem.PoemSummary, - TajikTitle = section.Poem.TajikTitle, Category = new GanjoorPoetCompleteViewModel() { Poet = new GanjoorPoetViewModel() @@ -2726,7 +2702,6 @@ namespace RMuseum.Services.Implementation Published = section.Poem.Published, Language = section.Poem.Language, PoemSummary = section.Poem.PoemSummary, - TajikTitle = section.Poem.TajikTitle, Category = new GanjoorPoetCompleteViewModel() { Poet = new GanjoorPoetViewModel() @@ -2857,7 +2832,6 @@ namespace RMuseum.Services.Implementation Published = poem.Published, Language = poem.Language, PoemSummary = poem.PoemSummary, - TajikTitle = poem.TajikTitle, Category = new GanjoorPoetCompleteViewModel() { Poet = new GanjoorPoetViewModel() diff --git a/RMuseum/Services/Implementation/GanjoorTranslationService.cs b/RMuseum/Services/Implementation/GanjoorTranslationService.cs index 0f81f66c..5fb2ba8b 100644 --- a/RMuseum/Services/Implementation/GanjoorTranslationService.cs +++ b/RMuseum/Services/Implementation/GanjoorTranslationService.cs @@ -286,7 +286,6 @@ namespace RMuseum.Services.Implementation SectionIndex2 = pv.SectionIndex2, SectionIndex3 = pv.SectionIndex3, SectionIndex4 = pv.SectionIndex4, - Tajik = pv.Tajik, } ).Single(), TText = v.TText @@ -351,7 +350,6 @@ namespace RMuseum.Services.Implementation SectionIndex2 = pv.SectionIndex2, SectionIndex3 = pv.SectionIndex3, SectionIndex4 = pv.SectionIndex4, - Tajik = pv.Tajik, } ).Single(), TText = v.TText