Zooflow: Work on Search FOrm

GUIs.ZooFlow/frmFlowForm.vb

@@ -516,31 +516,14 @@ Public Class frmFlowForm
         End If
     End Sub
 
-    Private Sub PictureBox1_Click(sender As Object, e As EventArgs)
-        frmSearchNeu.Show()
-
-        'Open_FlowSearch()
-    End Sub
     Sub Open_FlowSearch()
         Cursor = Cursors.WaitCursor
         If TheFormIsAlreadyLoaded("frmFlowSearch1") Then
             Cursor = Cursors.Default
             Exit Sub
         End If
-        'Dim oSQLFlowSearch As String = ""
-        'For Each oRow As DataRow In My.Tables.DTIDB_COMMON_SQL.Rows
-        '    If oRow.Item("TITLE") = SQLCMD_FLOW_SEARCH_LOWER_LIMIT Then
-        '        oSQLFlowSearch = oRow.Item("SQL_COMMAND")
 
-        '    End If
-        'Next
-        'If oSQLFlowSearch <> String.Empty Then
-        'oSQLFlowSearch = oSQLFlowSearch.Replace("@USER_ID", My.Application.User.UserId)
-        'oSQLFlowSearch = oSQLFlowSearch.Replace("@LANGUAGE_ID", My.Application.User.LanguageId)
-        'oSQLFlowSearch = oSQLFlowSearch.Replace("@LANGUAGE", My.Application.User.Language)
-
-        'End If
-        Dim oForm As New frmFlowSearch1()
+        Dim oForm As New frmFlowSearch2()
         oForm.Show()
         oForm.BringToFront()
 
@@ -584,16 +567,7 @@ Public Class frmFlowForm
         PictureEdit2.Image = My.Resources.ZOOFLOW_DEFAULT
     End Sub
 
-    Private Sub PictureBoxAbo_Click(sender As Object, e As EventArgs)
-        Cursor = Cursors.WaitCursor
-        If TheFormIsAlreadyLoaded("frmPreSearch") Then
-            Cursor = Cursors.Default
-            Exit Sub
-        End If
-        Dim oForm2 As New frmSearchPredefined()
-        oForm2.Show()
-        Cursor = Cursors.Default
-    End Sub
+
     Private Function TheFormIsAlreadyLoaded(ByVal pFormName As String) As Boolean
 
         TheFormIsAlreadyLoaded = False
@@ -1152,7 +1126,7 @@ Public Class frmFlowForm
             Dim oToken = RunningTaskTokenSource.Token
 
             Try
-                Dim oResult = Await Search.Run(oSearchText)
+                Dim oResult = Await Search.RunWithSearchTerm(oSearchText)
                 If oResult.OK = False Then
                     NotifyIcon.ShowBalloonTip(20_000, "Info", oResult.ErrorMessage, ToolTipIcon.Info)
                 End If
@@ -1274,7 +1248,7 @@ Public Class frmFlowForm
                     Where(Function(row) row.Item(0) = oObjectId).
                     CopyToDataTable()
 
-                Search.Run(oResult, "Suche")
+                Search.RunWithDataTable(oResult, "Suche")
             Catch ex As Exception
                 ErrorHandler.ShowErrorMessage(ex, "Laden eines Dokuments")
             Finally