Merge pull request #627 from poppastring/fix-rss-category

poppastring · web-flow · commit de9000689d90 · 2022-03-26T20:59:57.000-04:00
Better comparison when we pass in RSS category names
diff --git a/source/DasBlog.Web.Repositories/SubscriptionManager.cs b/source/DasBlog.Web.Repositories/SubscriptionManager.cs
@@ -314,15 +314,15 @@ private RssRoot GetRssCore(string category, int maxDayCount, int maxEntryCount)
 
         protected EntryCollection BuildEntries(string category, int maxDayCount, int maxEntryCount)
         {
-            EntryCollection entryList = new EntryCollection();
+            var entryList = new EntryCollection();
 
             if (category != null)
             {
                 int entryCount = dasBlogSettings.SiteConfiguration.RssEntryCount;
-                category = category.ToUpper();
-                foreach (CategoryCacheEntry catEntry in dataService.GetCategories())
+                category = category.Replace(dasBlogSettings.SiteConfiguration.TitlePermalinkSpaceReplacement, " ");
+                foreach (var catEntry in dataService.GetCategories())
                 {
-                    if (catEntry.Name.ToUpper() == category)
+					if (string.Compare(catEntry.Name, category, CultureInfo.CurrentCulture, CompareOptions.IgnoreCase | CompareOptions.IgnoreSymbols) == 0)
                     {
                         foreach (CategoryCacheEntryDetail detail in catEntry.EntryDetails)
                         {

Original file line number	Diff line number	Diff line change
`@@ -314,15 +314,15 @@ private RssRoot GetRssCore(string category, int maxDayCount, int maxEntryCount)`
`314`	`314`
`315`	`315`	`protected EntryCollection BuildEntries(string category, int maxDayCount, int maxEntryCount)`
`316`	`316`	`{`
`317`		`- EntryCollection entryList = new EntryCollection();`
	`317`	`+ var entryList = new EntryCollection();`
`318`	`318`
`319`	`319`	`if (category != null)`
`320`	`320`	`{`
`321`	`321`	`int entryCount = dasBlogSettings.SiteConfiguration.RssEntryCount;`
`322`		`- category = category.ToUpper();`
`323`		`- foreach (CategoryCacheEntry catEntry in dataService.GetCategories())`
	`322`	`+ category = category.Replace(dasBlogSettings.SiteConfiguration.TitlePermalinkSpaceReplacement, " ");`
	`323`	`+ foreach (var catEntry in dataService.GetCategories())`
`324`	`324`	`{`
`325`		`- if (catEntry.Name.ToUpper() == category)`
	`325`	`+ if (string.Compare(catEntry.Name, category, CultureInfo.CurrentCulture, CompareOptions.IgnoreCase \| CompareOptions.IgnoreSymbols) == 0)`
`326`	`326`	`{`
`327`	`327`	`foreach (CategoryCacheEntryDetail detail in catEntry.EntryDetails)`
`328`	`328`	`{`