Merge pull request #31 from Scippy/master

DNN9 core search integration
ventrian · Feb 25, 2022 · 48b6292 · 48b6292
2 parents c6e3080 + 7c18469
commit 48b6292
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/Entities/Constants.vb b/Entities/Constants.vb
@@ -143,9 +143,9 @@ Namespace Ventrian.PropertyAgent
         Public Const MEDIUM_HEIGHT_SETTING As String = "MediumHeight"
         Public Const MEDIUM_HEIGHT_SETTING_DEFAULT As Integer = 240
         Public Const LARGE_WIDTH_SETTING As String = "LargeWidth"
-        Public Const LARGE_WIDTH_SETTING_DEFAULT As Integer = 700
+        Public Const LARGE_WIDTH_SETTING_DEFAULT As Integer = 1600
         Public Const LARGE_HEIGHT_SETTING As String = "LargeHeight"
-        Public Const LARGE_HEIGHT_SETTING_DEFAULT As Integer = 475
+        Public Const LARGE_HEIGHT_SETTING_DEFAULT As Integer = 1200
         Public Const IMAGES_ITEMS_PER_ROW_SETTING As String = "ImagesItemsPerRow"
         Public Const IMAGES_ITEMS_PER_ROW_SETTING_DEFAULT As Integer = 2
         Public Const IMAGES_WATERMARK_ENABLED_SETTING As String = "ImagesWatermarkEnabled"

diff --git a/Entities/Property/PropertyController.vb b/Entities/Property/PropertyController.vb
@@ -4,12 +4,14 @@ Imports DotNetNuke.Common.Utilities
 Imports DotNetNuke.Framework
 Imports DotNetNuke.Services.Search
 Imports DotNetNuke.Entities.Modules
+Imports DotNetNuke.Services.Search.Entities
+Imports DotNetNuke.Entities.Portals
 
 Namespace Ventrian.PropertyAgent
 
     Public Class PropertyController
 
-        Implements ISearchable
+        Inherits ModuleSearchBase
 
 
 #Region " Private Methods "
@@ -212,8 +214,7 @@ Namespace Ventrian.PropertyAgent
 
 #Region " Optional Interfaces "
 
-        Public Function GetSearchItems(ByVal ModInfo As DotNetNuke.Entities.Modules.ModuleInfo) As DotNetNuke.Services.Search.SearchItemInfoCollection Implements DotNetNuke.Entities.Modules.ISearchable.GetSearchItems
-
+        Public Overrides Function GetModifiedSearchDocuments(ModInfo As DotNetNuke.Entities.Modules.ModuleInfo, beginDateUtc As Date) As IList(Of SearchDocument)
             Dim objModuleController As New ModuleController
             Dim objSettings As Hashtable = objModuleController.GetModuleSettings(ModInfo.ModuleID)
 
@@ -240,6 +241,7 @@ Namespace Ventrian.PropertyAgent
                         End If
 
                         Dim SearchItemCollection As New SearchItemInfoCollection
+                        Dim list As New List(Of SearchDocument)
 
                         Dim objPropertyController As New PropertyController
                         Dim objProperties As List(Of PropertyInfo) = objPropertyController.List(ModInfo.ModuleID, Null.NullInteger, SearchStatusType.PublishedActive, Null.NullInteger, Null.NullInteger, Null.NullBoolean, Null.NullBoolean, SortByType.Published, Null.NullInteger, SortDirectionType.Descending, Null.NullString, Null.NullString, 0, 100000, Null.NullBoolean)
@@ -333,18 +335,33 @@ Namespace Ventrian.PropertyAgent
 
                             Dim SearchItem As New SearchItemInfo(strTitle, strDescription, Null.NullInteger, objProperty.DateModified, objProperty.ModuleID, objProperty.PropertyID.ToString(), strContent, "agentType=View&PropertyID=" & objProperty.PropertyID.ToString())
                             SearchItemCollection.Add(SearchItem)
+                            Dim TabPath As String = ModInfo.ParentTab.TabPath.Replace("//", "/")
+                            Dim item2 As New SearchDocument With {
+                                .Url = TabPath + "?" + SearchItem.GUID,
+                                    .AuthorUserId = SearchItem.Author,
+            .UniqueKey = SearchItem.SearchKey,
+            .PortalId = ModInfo.PortalID,
+            .Title = SearchItem.Title,
+            .Description = SearchItem.Description,
+            .Body = SearchItem.Content,
+            .ModifiedTimeUtc = SearchItem.PubDate
+        }
+                            list.Add(item2)
                         Next
 
-                        Return SearchItemCollection
+                        Return list
 
                     End If
                 End If
             End If
 
             Return Nothing
-
         End Function
 
+
+
+
+
 #End Region
 
     End Class