Merge pull request #1755 from johnhenley/dev96/issues/remove-full-text-catalog-1712

johnhenley · web-flow · commit 684816d5a7ac · 2026-02-02T17:39:50.000Z
TASK: Remove full-text search components
diff --git a/Dnn.CommunityForums/DnnCommunityForums.csproj b/Dnn.CommunityForums/DnnCommunityForums.csproj
@@ -36,8 +36,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <EmbeddedResource Include="sql\FullTextInstallPart1.sql" />
-        <EmbeddedResource Include="sql\FullTextInstallPart2.sql" />
       <None Remove="CustomControls\Resources\TextSuggest.js" />
     </ItemGroup>
 
diff --git a/Dnn.CommunityForums/DnnCommunityForums.dnn b/Dnn.CommunityForums/DnnCommunityForums.dnn
@@ -75,7 +75,7 @@
             <attributes>
               <businessControllerClass>DotNetNuke.Modules.ActiveForums.TopicsController, DotNetNuke.Modules.ActiveForums</businessControllerClass>
               <desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
-              <upgradeVersionsList>07.00.07,07.00.11,07.00.12,08.00.00,08.01.00,08.02.00,08.02.02,08.02.03,08.02.04,08.02.08,09.00.00,09.01.00,09.02.00,09.02.01,09.03.00,09.05.00</upgradeVersionsList>
+              <upgradeVersionsList>07.00.07,07.00.11,07.00.12,08.00.00,08.01.00,08.02.00,08.02.02,08.02.03,08.02.04,08.02.08,09.00.00,09.01.00,09.02.00,09.02.01,09.03.00,09.05.00,09.06.00</upgradeVersionsList>
             </attributes>
           </eventMessage>
         </component>
@@ -464,10 +464,15 @@
                 <name>09.04.00.SqlDataProvider</name>
                 <version>09.04.00</version>
             </script>
+            <script type="Install">
+                <path>sql</path>
+                <name>09.06.00.SqlDataProvider</name>
+                <version>09.06.00</version>
+            </script>
             <script type="UnInstall">
               <path>sql</path>
               <name>Uninstall.SqlDataProvider</name>
-              <version>09.04.00</version>
+              <version>09.06.00</version>
             </script>
           </scripts>
         </component>
diff --git a/Dnn.CommunityForums/ForumSettings.ascx.designer.cs b/Dnn.CommunityForums/ForumSettings.ascx.designer.cs
diff --git a/Dnn.CommunityForums/Providers/DataProviders/SqlDataProvider/SqlDataProvider.cs b/Dnn.CommunityForums/Providers/DataProviders/SqlDataProvider/SqlDataProvider.cs
@@ -344,10 +344,7 @@ public override void Reply_Delete(int ForumId, int TopicId, int ReplyId, int Del
 
         #region Search
         [Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Using Search_DotNetNuke(int moduleId, DateTime beginDateUtc)")]
-        public override IDataReader Search_DotNetNuke(int moduleId)
-        {
-            return SqlHelper.ExecuteReader(this.ConnectionString, this.DatabaseOwner + this.ObjectQualifier + "activeforums_Search_GetSearchItems", moduleId);
-        }
+        public override IDataReader Search_DotNetNuke(int moduleId) => throw new NotImplementedException();
 
         public override IDataReader Search_DotNetNuke(int moduleId, DateTime beginDateUtc)
         {
diff --git a/Dnn.CommunityForums/Services/Search/ISearchController.cs b/Dnn.CommunityForums/Services/Search/ISearchController.cs
@@ -46,7 +46,6 @@ internal interface ISearchController
         /// <param name="resultType">Type of results to return.</param>
         /// <param name="sort">Sort order.</param>
         /// <param name="maxCacheHours">Maximum cache duration in hours.</param>
-        /// <param name="fullText">Whether to use full-text search.</param>
         /// <returns>A <see cref="DotNetNuke.Modules.ActiveForums.ViewModels.SearchResults"/> containing the search results.</returns>
         DotNetNuke.Modules.ActiveForums.ViewModels.SearchResults Search(
             int portalId,
@@ -63,7 +62,6 @@ DotNetNuke.Modules.ActiveForums.ViewModels.SearchResults Search(
             string tags,
             SearchResultType resultType,
             SearchSortType sort,
-            int maxCacheHours,
-            bool fullText);
+            int maxCacheHours);
     }
 }
diff --git a/Dnn.CommunityForums/Services/Search/SearchController.cs b/Dnn.CommunityForums/Services/Search/SearchController.cs
@@ -52,8 +52,7 @@ internal static DotNetNuke.Modules.ActiveForums.ViewModels.SearchResults Search(
             string tags,
             SearchSortType sort,
             SearchResultType resultType,
-            int maxCacheHours,
-            bool fullText)
+            int maxCacheHours)
         {
             return Provider.Search(
                 portalId,
@@ -70,8 +69,7 @@ internal static DotNetNuke.Modules.ActiveForums.ViewModels.SearchResults Search(
                 tags,
                 resultType,
                 sort,
-                maxCacheHours,
-                fullText);
+                maxCacheHours);
         }
 
         [Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Not Used.")]
@@ -92,55 +90,7 @@ public DotNetNuke.Modules.ActiveForums.ViewModels.SearchResults Search(
                 string tags,
                 SearchResultType resultType,
                 SearchSortType sort,
-                int maxCacheHours,
-                bool fullText)
-            {
-                var ds = DataProvider.Instance().Search(
-                    portalId,
-                    moduleId,
-                    userId,
-                    searchId,
-                    rowIndex,
-                    pageSize,
-                    searchText,
-                    0, /*search any */
-                    0, /*search subject and topic*/
-                    searchDays,
-                    authorUserId,
-                    authorUsername,
-                    forumsToSearch,
-                    tags,
-                    (int)resultType,
-                    (int)sort,
-                    maxCacheHours,
-                    fullText);
-
-                var results = new DotNetNuke.Modules.ActiveForums.ViewModels.SearchResults(ds.Tables[0]);
-                results.Results = new List<DotNetNuke.Modules.ActiveForums.Entities.IPostInfo>();
-                foreach (System.Data.DataRow row in ds.Tables[1].Rows)
-                {
-                    DotNetNuke.Modules.ActiveForums.Entities.IPostInfo post = null;
-                    var topicId = Utilities.SafeConvertInt(row["TopicId"], DotNetNuke.Common.Utilities.Null.NullInteger);
-                    var contentId = Utilities.SafeConvertInt(row["ContentId"], DotNetNuke.Common.Utilities.Null.NullInteger);
-                    var reply = new DotNetNuke.Modules.ActiveForums.Controllers.ReplyController(moduleId).GetByContentId(contentId);
-                    if (reply != null)
-                    {
-                        post = (DotNetNuke.Modules.ActiveForums.Entities.IPostInfo)reply;
-                    }
-                    else
-                    {
-                        var topic = new DotNetNuke.Modules.ActiveForums.Controllers.TopicController(moduleId).GetById(topicId);
-                        if (topic != null)
-                        {
-                            post = topic;
-                        }
-                    }
-
-                    results.Results.Add(post);
-                }
-
-                return results;
-            }
+                int maxCacheHours) => throw new NotImplementedException();
         }
 
         private sealed class LuceneSearchController : DotNetNuke.Modules.ActiveForums.Services.Search.ISearchController
@@ -160,8 +110,7 @@ public DotNetNuke.Modules.ActiveForums.ViewModels.SearchResults Search(
                 string tags,
                 SearchResultType resultType,
                 SearchSortType sort,
-                int maxCacheHours,
-                bool fullText)
+                int maxCacheHours)
             {
                 DateTime startQuery = DateTime.UtcNow;
 
diff --git a/Dnn.CommunityForums/class/Globals.cs b/Dnn.CommunityForums/class/Globals.cs
@@ -218,6 +218,7 @@ public class SettingKeys
         public const string Theme = "THEME";
         [Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Not Used.")]
         public const string MailQueue = "MAILQUEUE";
+        [Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Not Used.")]
         public const string FullText = "FULLTEXT";
         public const string AllowSubTypes = "ALLOWSUBTYPES";
         public const string FloodInterval = "FLOODINTERVAL";
diff --git a/Dnn.CommunityForums/class/ModuleSettings.cs b/Dnn.CommunityForums/class/ModuleSettings.cs
@@ -117,6 +117,7 @@ public string Theme
 
         public string TemplatePath => string.Concat(this.ThemeLocation, "templates/");
 
+        [Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Not Used.")]
         public bool FullText => this.MainSettings.GetBoolean(SettingKeys.FullText);
 
         public string AllowSubTypes => this.MainSettings.GetString(SettingKeys.AllowSubTypes, string.Empty);
diff --git a/Dnn.CommunityForums/components/Common/ForumSettingsBase.cs b/Dnn.CommunityForums/components/Common/ForumSettingsBase.cs
@@ -306,24 +306,18 @@ public string PrefixURLLikes
             }
         }
 
+        [Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Not Used.")]
+
         public bool FullTextSearch
         {
             get
             {
-                return this.Settings.GetBoolean(SettingKeys.FullText);
+                throw new NotImplementedException();
             }
 
             set
             {
-                this.UpdateModuleSettingCaseSensitive(SettingKeys.FullText, value.ToString());
-                if (this.Settings.ContainsKey(SettingKeys.FullText))
-                {
-                    this.Settings[SettingKeys.FullText] = value.ToString();
-                }
-                else
-                {
-                    this.Settings.Add(SettingKeys.FullText, value.ToString());
-                }
+                throw new NotImplementedException();
             }
         }
 
diff --git a/Dnn.CommunityForums/components/Helpers/UpgradeModuleSettings.cs b/Dnn.CommunityForums/components/Helpers/UpgradeModuleSettings.cs
@@ -78,7 +78,6 @@ internal static void MoveSettingsForModuleInstanceToTabModuleInstance_070011(int
             DotNetNuke.Entities.Modules.ModuleController.Instance.UpdateModuleSetting(tabModuleId, SettingKeys.InstallDate, currSettings.InstallDate.ToString());
             DotNetNuke.Entities.Modules.ModuleController.Instance.UpdateModuleSetting(tabModuleId, SettingKeys.IsInstalled, currSettings.IsInstalled.ToString());
             DotNetNuke.Entities.Modules.ModuleController.Instance.UpdateModuleSetting(tabModuleId, SettingKeys.Theme, currSettings.Theme);
-            DotNetNuke.Entities.Modules.ModuleController.Instance.UpdateModuleSetting(tabModuleId, SettingKeys.FullText, currSettings.FullText.ToString());
             DotNetNuke.Entities.Modules.ModuleController.Instance.UpdateModuleSetting(tabModuleId, SettingKeys.FloodInterval, currSettings.FloodInterval.ToString());
             DotNetNuke.Entities.Modules.ModuleController.Instance.UpdateModuleSetting(tabModuleId, SettingKeys.EditInterval, currSettings.EditInterval.ToString());
             DotNetNuke.Entities.Modules.ModuleController.Instance.UpdateModuleSetting(tabModuleId, SettingKeys.DeleteBehavior, currSettings.DeleteBehavior.ToString());
@@ -487,5 +486,21 @@ internal static void UpgradeSocialGroupForumConfigModuleSettings_090300()
                 }
             }
         }
+
+        internal static void DeleteObsoleteModuleSettings_090600()
+        {
+            /* remove FULLTEXT */
+
+            foreach (DotNetNuke.Abstractions.Portals.IPortalInfo portal in DotNetNuke.Entities.Portals.PortalController.Instance.GetPortals())
+            {
+                foreach (ModuleInfo module in DotNetNuke.Entities.Modules.ModuleController.Instance.GetModules(portal.PortalId))
+                {
+                    if (module.DesktopModule.ModuleName.Trim().ToLowerInvariant().Equals(Globals.ModuleName.ToLowerInvariant()))
+                    {
+                        DotNetNuke.Entities.Modules.ModuleController.Instance.DeleteModuleSetting(module.ModuleID, "FULLTEXT");
+                    }
+                }
+            }
+        }
     }
 }
diff --git a/Dnn.CommunityForums/components/Topics/TopicsController.cs b/Dnn.CommunityForums/components/Topics/TopicsController.cs
@@ -372,6 +372,19 @@ public string UpgradeModule(string Version)
                         return "Failed";
                     }
 
+                    break;
+                case "09.06.00":
+                    try
+                    {
+                        DotNetNuke.Modules.ActiveForums.Helpers.UpgradeModuleSettings.DeleteObsoleteModuleSettings_090600();
+                    }
+                    catch (Exception ex)
+                    {
+                        this.LogError(ex.Message, ex);
+                        Exceptions.LogException(ex);
+                        return "Failed";
+                    }
+
                     break;
                 default:
                     break;
diff --git a/Dnn.CommunityForums/controls/af_search.ascx.cs b/Dnn.CommunityForums/controls/af_search.ascx.cs
@@ -403,8 +403,7 @@ private void BindPosts()
                 tags: this.Tags,
                 resultType: this.SearchResultType,
                 sort: this.SearchSortType,
-                maxCacheHours: maxCacheHours,
-                fullText: this.ModuleSettings.FullText);
+                maxCacheHours: maxCacheHours);
 
             this.searchId = (this.searchResults != null) ? this.searchResults.SearchId : 0;
 
diff --git a/Dnn.CommunityForums/sql/09.06.00.SqlDataProvider b/Dnn.CommunityForums/sql/09.06.00.SqlDataProvider
@@ -0,0 +1,64 @@
+SET NOCOUNT ON 
+GO
+
+/* --------------------- */
+
+/* issue 1712 - begin - remove full-text search catalog, setup, and search procedures */
+
+IF OBJECTPROPERTY(object_id('{databaseOwner}{objectQualifier}activeforums_Content'),'TableHasActiveFulltextIndex') = 1
+BEGIN
+	exec sp_fulltext_table N'{databaseOwner}{objectQualifier}activeforums_Content', N'drop'					
+END
+GO
+ 
+IF EXISTS (SELECT * FROM sysfulltextcatalogs ftc WHERE ftc.name = N'{objectQualifier}activeforums_Catalog')
+BEGIN
+exec sp_fulltext_catalog '{objectQualifier}activeforums_Catalog', 'drop'
+END
+GO
+
+/* activeforums_Search_ManageFullText */
+IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'{databaseOwner}[{objectQualifier}activeforums_Search_ManageFullText]') AND type in (N'P', N'PC'))
+DROP PROCEDURE {databaseOwner}[{objectQualifier}activeforums_Search_ManageFullText]
+GO
+
+/* activeforums_Search_GetFullTextStatus */
+IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'{databaseOwner}[{objectQualifier}activeforums_Search_GetFullTextStatus]') AND type in (N'P', N'PC'))
+DROP PROCEDURE {databaseOwner}[{objectQualifier}activeforums_Search_GetFullTextStatus]
+GO
+
+/* activeforums_Search_Standard */
+IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'{databaseOwner}[{objectQualifier}activeforums_Search_Standard]') AND type in (N'P', N'PC'))
+DROP PROCEDURE {databaseOwner}[{objectQualifier}activeforums_Search_Standard]
+GO
+
+/* activeforums_Search_FullText */
+IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'{databaseOwner}[{objectQualifier}activeforums_Search_FullText]') AND type in (N'P', N'PC'))
+DROP PROCEDURE {databaseOwner}[{objectQualifier}activeforums_Search_FullText]
+GO
+
+/* activeforums_Functions_SplitText */
+IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'{databaseOwner}[{objectQualifier}activeforums_Functions_SplitText]') AND type in (N'FN', N'IF', N'TF', N'FS', N'FT'))
+DROP FUNCTION {databaseOwner}[{objectQualifier}activeforums_Functions_SplitText]
+GO
+
+/* activeforums_Search */
+IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'{databaseOwner}[{objectQualifier}activeforums_Search]') AND type in (N'P', N'PC'))
+DROP PROCEDURE {databaseOwner}[{objectQualifier}activeforums_Search]
+GO
+
+/* activeforums_SearchCache */
+IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'{databaseOwner}[{objectQualifier}activeforums_SearchCache]') AND type in (N'U'))
+DROP TABLE {databaseOwner}[{objectQualifier}activeforums_SearchCache]
+GO
+
+
+IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'{databaseOwner}{objectQualifier}activeforums_Search_GetSearchItems') AND type in (N'P', N'PC'))
+DROP PROCEDURE {databaseOwner}{objectQualifier}activeforums_Search_GetSearchItems
+GO
+
+/* issue 1712 - end - remove full-text search catalog, setup, and search procedures */
+
+/* --------------------- */
+
+
diff --git a/Dnn.CommunityForums/sql/FullTextInstallPart1.sql b/Dnn.CommunityForums/sql/FullTextInstallPart1.sql
diff --git a/Dnn.CommunityForums/sql/FullTextInstallPart2.sql b/Dnn.CommunityForums/sql/FullTextInstallPart2.sql
diff --git a/Dnn.CommunityForums/sql/Uninstall.SqlDataProvider b/Dnn.CommunityForums/sql/Uninstall.SqlDataProvider

Original file line number	Diff line number	Diff line change
`@@ -306,24 +306,18 @@ public string PrefixURLLikes`
`306`	`306`	`}`
`307`	`307`	`}`
`308`	`308`
	`309`	`+ [Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Not Used.")]`
	`310`	`+`
`309`	`311`	`public bool FullTextSearch`
`310`	`312`	`{`
`311`	`313`	`get`
`312`	`314`	`{`
`313`		`- return this.Settings.GetBoolean(SettingKeys.FullText);`
	`315`	`+ throw new NotImplementedException();`
`314`	`316`	`}`
`315`	`317`
`316`	`318`	`set`
`317`	`319`	`{`
`318`		`- this.UpdateModuleSettingCaseSensitive(SettingKeys.FullText, value.ToString());`
`319`		`- if (this.Settings.ContainsKey(SettingKeys.FullText))`
`320`		`- {`
`321`		`- this.Settings[SettingKeys.FullText] = value.ToString();`
`322`		`- }`
`323`		`- else`
`324`		`- {`
`325`		`- this.Settings.Add(SettingKeys.FullText, value.ToString());`
`326`		`- }`
	`320`	`+ throw new NotImplementedException();`
`327`	`321`	`}`
`328`	`322`	`}`
`329`	`323`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,6 @@ internal static void MoveSettingsForModuleInstanceToTabModuleInstance_070011(int`
`78`	`78`	`DotNetNuke.Entities.Modules.ModuleController.Instance.UpdateModuleSetting(tabModuleId, SettingKeys.InstallDate, currSettings.InstallDate.ToString());`
`79`	`79`	`DotNetNuke.Entities.Modules.ModuleController.Instance.UpdateModuleSetting(tabModuleId, SettingKeys.IsInstalled, currSettings.IsInstalled.ToString());`
`80`	`80`	`DotNetNuke.Entities.Modules.ModuleController.Instance.UpdateModuleSetting(tabModuleId, SettingKeys.Theme, currSettings.Theme);`
`81`		`- DotNetNuke.Entities.Modules.ModuleController.Instance.UpdateModuleSetting(tabModuleId, SettingKeys.FullText, currSettings.FullText.ToString());`
`82`	`81`	`DotNetNuke.Entities.Modules.ModuleController.Instance.UpdateModuleSetting(tabModuleId, SettingKeys.FloodInterval, currSettings.FloodInterval.ToString());`
`83`	`82`	`DotNetNuke.Entities.Modules.ModuleController.Instance.UpdateModuleSetting(tabModuleId, SettingKeys.EditInterval, currSettings.EditInterval.ToString());`
`84`	`83`	`DotNetNuke.Entities.Modules.ModuleController.Instance.UpdateModuleSetting(tabModuleId, SettingKeys.DeleteBehavior, currSettings.DeleteBehavior.ToString());`
`@@ -487,5 +486,21 @@ internal static void UpgradeSocialGroupForumConfigModuleSettings_090300()`
`487`	`486`	`}`
`488`	`487`	`}`
`489`	`488`	`}`
	`489`	`+`
	`490`	`+ internal static void DeleteObsoleteModuleSettings_090600()`
	`491`	`+ {`
	`492`	`+ /* remove FULLTEXT */`
	`493`	`+`
	`494`	`+ foreach (DotNetNuke.Abstractions.Portals.IPortalInfo portal in DotNetNuke.Entities.Portals.PortalController.Instance.GetPortals())`
	`495`	`+ {`
	`496`	`+ foreach (ModuleInfo module in DotNetNuke.Entities.Modules.ModuleController.Instance.GetModules(portal.PortalId))`
	`497`	`+ {`
	`498`	`+ if (module.DesktopModule.ModuleName.Trim().ToLowerInvariant().Equals(Globals.ModuleName.ToLowerInvariant()))`
	`499`	`+ {`
	`500`	`+ DotNetNuke.Entities.Modules.ModuleController.Instance.DeleteModuleSetting(module.ModuleID, "FULLTEXT");`
	`501`	`+ }`
	`502`	`+ }`
	`503`	`+ }`
	`504`	`+ }`
`490`	`505`	`}`
`491`	`506`	`}`