Zooflow: Search tweaks

GUIs.ZooFlow/Search/SearchRunner.vb

@@ -104,11 +104,26 @@ Public Class SearchRunner
     End Function
 
     Public Async Function RunWithSearchTerm(pSearchTerm As String, pDateFrom As Date, pDateTo As Date, pSearchTitle As String) As Task(Of SearchResult)
-        Return Await RunWithSearchTerm(New SearchOptions With {.SearchString = pSearchTerm, .SearchTitle = pSearchTitle})
+        Return Await RunWithSearchTerm(New SearchOptions With {
+                                           .SearchString = pSearchTerm,
+                                           .SearchTitle = pSearchTitle,
+                                           .DateFrom = pDateFrom,
+                                           .DateTo = pDateTo
+                                       })
     End Function
 
     Public Async Function RunWithTokens(pTokens As IEnumerable(Of Search.SearchToken.Token)) As Task(Of SearchResult)
-        Return Await RunWithSearchTerm(New SearchOptions With {.SearchTokens = pTokens})
+        Return Await RunWithSearchTerm(New SearchOptions With {
+                                            .SearchTokens = pTokens
+                                       })
+    End Function
+
+    Public Async Function RunWithTokens(pTokens As IEnumerable(Of Search.SearchToken.Token), pDateFrom As Date, pDateTo As Date, pSearchTitle As String) As Task(Of SearchResult)
+        Return Await RunWithSearchTerm(New SearchOptions With {
+                                            .SearchTokens = pTokens,
+                                            .DateFrom = pDateFrom,
+                                            .DateTo = pDateTo
+                                       })
     End Function
 
 
@@ -125,7 +140,7 @@ Public Class SearchRunner
 
         Dim oSQL
 
-        If oTokens.Count > 0 Then
+        If oTokens IsNot Nothing AndAlso oTokens.Count > 0 Then
             Await InsertSearchTokens(oTokens)
             oSQL = $"EXEC PRIDB_SEARCH_GET_TOKEN_RESULT_DOCS {UserId}, '{oDateConstraint}', '{UserLanguage}'"
         ElseIf oSearchTerm IsNot Nothing Then
@@ -225,9 +240,9 @@ Public Class SearchRunner
 
             Dim oDateTo As Date
             If pDateTo.Equals(Date.MinValue) Then
-                oDateTo = pDateTo
-            Else
                 oDateTo = pDateFrom
+            Else
+                oDateTo = pDateTo
             End If
             Dim oProc = $"EXEC PRIDB_SEARCH_ADD_USR_DATE {UserId},'{pDateFrom}','{oDateTo}'"
             If Await My.Database.ExecuteNonQueryIDBAsync(oProc) = True Then