diff --git a/GUIs.ClipboardWatcher/My Project/AssemblyInfo.vb b/GUIs.ClipboardWatcher/My Project/AssemblyInfo.vb index b925710b..1cfeed82 100644 --- a/GUIs.ClipboardWatcher/My Project/AssemblyInfo.vb +++ b/GUIs.ClipboardWatcher/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/GUIs.ClipboardWatcher/ProfileFilter.vb b/GUIs.ClipboardWatcher/ProfileFilter.vb index 5effc8cf..bca7cc37 100644 --- a/GUIs.ClipboardWatcher/ProfileFilter.vb +++ b/GUIs.ClipboardWatcher/ProfileFilter.vb @@ -417,6 +417,7 @@ Public Class ProfileFilter _Logger.Debug("Count-Command DATA before execute: [{0}]", oCountCommand) Dim oConnectionString = ProfileUtils.GetConnectionString(Database, oCountConnectionId) + oResultData += NotNull(Of Integer)(Database.GetScalarValueWithConnection(oCountCommand, oConnectionString), 0) _Logger.Debug("Datarows returned from search: [{0}]", oResultData) @@ -447,6 +448,7 @@ Public Class ProfileFilter _Logger.Debug("Count-Command for Documents BEFORE execute: [{0}]", oCountCommand) Dim oConnectionString = ProfileUtils.GetConnectionString(Database, oCountConnectionId) + oResultDocs += NotNull(Of Integer)(Database.GetScalarValueWithConnection(oCountCommand, oConnectionString), 0) _Logger.Debug("Documents returned from search: [{0}]", oResultDocs) diff --git a/GUIs.ClipboardWatcher/ProfileSearches.vb b/GUIs.ClipboardWatcher/ProfileSearches.vb index f7effafd..735276c8 100644 --- a/GUIs.ClipboardWatcher/ProfileSearches.vb +++ b/GUIs.ClipboardWatcher/ProfileSearches.vb @@ -87,6 +87,7 @@ Public Class ProfileSearches oSQL = oPatterns.ReplaceClipboardContents(oSQL, _Params.ClipboardContents) Dim oConnectionString = ProfileUtils.GetConnectionString(_Environment.Database, oConnectionId) + Dim oDatatable As DataTable = _Environment.Database.GetDatatableWithConnection(oSQL, oConnectionString) If oDatatable Is Nothing Then @@ -152,6 +153,7 @@ Public Class ProfileSearches oSQL = oPatterns.ReplaceClipboardContents(oSQL, _Params.ClipboardContents) Dim oConnectionString = ProfileUtils.GetConnectionString(_Environment.Database, oConnectionId) + Dim oDatatable As DataTable = _Environment.Database.GetDatatableWithConnection(oSQL, oConnectionString) If oDatatable Is Nothing Then diff --git a/GUIs.ClipboardWatcher/ProfileUtils.vb b/GUIs.ClipboardWatcher/ProfileUtils.vb index f3dcc7e1..2a13abb4 100644 --- a/GUIs.ClipboardWatcher/ProfileUtils.vb +++ b/GUIs.ClipboardWatcher/ProfileUtils.vb @@ -9,7 +9,9 @@ Public Class ProfileUtils Select Case oRow.Item("SQL_PROVIDER") Case "MS-SQL" + Dim oConnectionString = Database.GetConnectionString(oRow.Item("SERVER"), oRow.Item("DATENBANK"), oRow.Item("USERNAME"), oRow.Item("PASSWORD")) + oConnectionString = MSSQLServer.DecryptConnectionString(oConnectionString) Return oConnectionString Case Else