Updated to fixed the Tridion Docs binary PDF issue on search module a…

…nd also Tridion Sites opensearch updated to used PageModelTitle
RWS · Jan 29, 2024 · 85d8690 · 85d8690
1 parent 4f9ab28
commit 85d8690
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 31 deletions.
diff --git a/webapp-net/Search/Controllers/TridionDocsSearchController.cs b/webapp-net/Search/Controllers/TridionDocsSearchController.cs
@@ -196,7 +196,7 @@ private SearchResultSet BuildResultSet(FacetedSearchResults facetedSearchResults
                     PublicationTitle = result.Node.Search.PublicationTitle,
                     Meta = result.Node.Search.Fields,
                     Highlighted = result.Node.Search.Highlighted,
-                    ItemType = result.Node.Search.ItemType
+                    ItemType = (result.Node.Search.ItemType == Sdl.Tridion.Api.Client.ItemType.Binary)? "binary":"Page"
                 };
 
                 searchResultSet.QueryResults.Add(searchResult);

diff --git a/webapp-net/Search/Providers/OpenSearchProvider.cs b/webapp-net/Search/Providers/OpenSearchProvider.cs
@@ -65,8 +65,7 @@ protected virtual SearchItem MapResult(SearchResult result, Type modelType, stri
             SearchItem searchItem = (SearchItem)Activator.CreateInstance(modelType);
             searchItem.MvcData = new MvcData(viewName);
             searchItem.Id = result.Id;
-            //searchItem.Title = GetContentTitle(result.Id.Replace("_", ":"), result.PageTitle);
-            searchItem.Title = result.PageTitle;
+            searchItem.Title = GetPageModelTitle(result.Id.Replace("_", ":"), result.PageTitle);
             searchItem.Url = result.Url;
             searchItem.Summary = GetTrimmedContent(result.Highlighted.Contains(contentLanguageFilter) ? result.Highlighted[contentLanguageFilter].ToString() : result.Content);
             searchItem.CustomFields = new Dictionary<string, object>();
@@ -93,7 +92,7 @@ public static string GetTrimmedContent(string content)
 
         private string GetLanguage(string language) => string.IsNullOrEmpty(language) ? _defaultLanguage : CultureInfo.GetCultureInfo(language.Split('-')[0]).EnglishName.ToLower();
 
-        private string GetContentTitle(string pageUri, string pageTitle)
+        private string GetPageModelTitle(string pageUri, string pageTitle)
         {
             if (string.IsNullOrEmpty(pageUri)) { return string.Empty; }
 
@@ -106,36 +105,26 @@ private string GetContentTitle(string pageUri, string pageTitle)
             {
                 return pageTitle;
             }
-            HashSet<string> validRegionNames = new HashSet<string> { "Main" };
-            foreach (var regions in pageModel.Regions)
+
+            IDictionary coreResources = WebRequestContext.Localization.GetResources("core");
+
+            string separator = string.Empty;
+            if (coreResources.Contains("core.pageTitleSeparator"))
             {
-                if (validRegionNames.Contains(regions.Name) && regions.Entities.Any())
-                {
-                    foreach (var entity in regions.Entities)
-                    {
-                        if (entity != null)
-                        {
-                            Type entityType = entity.GetType();
-
-                            // Check if the entity is of type Article using reflection
-                            if (entityType.FullName == "Sdl.Web.Modules.Core.Models.Article")
-                            {
-                                PropertyInfo headlineProperty = entityType.GetProperty("Headline");
-                                if (headlineProperty != null)
-                                {
-                                    object headlineValue = headlineProperty.GetValue(entity);
-                                    if (headlineValue != null)
-                                    {
-                                        return headlineValue.ToString();
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
+                separator = coreResources["core.pageTitleSeparator"].ToString();
             }
 
-            return pageTitle;
+            string suffix = string.Empty;
+            if (coreResources.Contains("core.pageTitlePostfix"))
+            {
+                suffix = coreResources["core.pageTitlePostfix"].ToString();
+            }
+
+            string replaceTitleSeparatorPostix = $"{separator}{suffix}";
+
+            string title = pageModel.Title.Replace(replaceTitleSeparatorPostix, "");
+
+            return title;
         }
 
         protected virtual NameValueCollection SetupParameters(SearchQuery searchQuery, Localization localization)