last minute bugfixing
This commit is contained in:
parent
9e7f2e2770
commit
b3158f7a1e
@ -97,6 +97,10 @@
|
|||||||
<Reference Include="DigitalData.Modules.Logging">
|
<Reference Include="DigitalData.Modules.Logging">
|
||||||
<HintPath>..\..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
|
<HintPath>..\..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
<Reference Include="DigitalData.Modules.Patterns, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
|
<SpecificVersion>False</SpecificVersion>
|
||||||
|
<HintPath>..\..\..\DDMonorepo\Modules.Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="DigitalData.Modules.Windows">
|
<Reference Include="DigitalData.Modules.Windows">
|
||||||
<HintPath>..\..\..\DDMonorepo\Windows\bin\Debug\DigitalData.Modules.Windows.dll</HintPath>
|
<HintPath>..\..\..\DDMonorepo\Windows\bin\Debug\DigitalData.Modules.Windows.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
|||||||
@ -5,6 +5,7 @@ Imports DD_Clipboard_Watcher.ClassConstants
|
|||||||
Imports DD_Clipboard_Watcher.ClassWindowAPI
|
Imports DD_Clipboard_Watcher.ClassWindowAPI
|
||||||
Imports DigitalData.Modules.ZooFlow
|
Imports DigitalData.Modules.ZooFlow
|
||||||
Imports DigitalData.Modules.ClipboardWatcher
|
Imports DigitalData.Modules.ClipboardWatcher
|
||||||
|
Imports DigitalData.Modules.Patterns
|
||||||
|
|
||||||
Public Class frmStart
|
Public Class frmStart
|
||||||
Private WithEvents Hotkey As New ClassHotkey(Me)
|
Private WithEvents Hotkey As New ClassHotkey(Me)
|
||||||
@ -192,6 +193,9 @@ Public Class frmStart
|
|||||||
Dim oInvalidDocumentSQL = False
|
Dim oInvalidDocumentSQL = False
|
||||||
Dim oInvalidDataSQL = False
|
Dim oInvalidDataSQL = False
|
||||||
|
|
||||||
|
Dim oPatterns As New ClassPatterns(LogConfig)
|
||||||
|
Dim oEnv = GetEnvironment()
|
||||||
|
|
||||||
For Each oProfile In oProfiles
|
For Each oProfile In oProfiles
|
||||||
Dim oResultDocs As Integer = 0
|
Dim oResultDocs As Integer = 0
|
||||||
Dim oResultData As Integer = 0
|
Dim oResultData As Integer = 0
|
||||||
@ -208,7 +212,9 @@ Public Class frmStart
|
|||||||
Continue For
|
Continue For
|
||||||
End If
|
End If
|
||||||
|
|
||||||
oCountCommand = clsPatterns.ReplaceAllValues(oCountCommand, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID, oProfile.Guid)
|
oCountCommand = oPatterns.ReplaceUserValues(oCountCommand, oEnv.User)
|
||||||
|
oCountCommand = oPatterns.ReplaceInternalValues(oCountCommand)
|
||||||
|
|
||||||
oResultData += Database.GetScalarValue(oCountCommand)
|
oResultData += Database.GetScalarValue(oCountCommand)
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
Logger.Warn("Invalid SQL Query for Counting Data in Profile {0}: {1}", oProfile.Guid, oCountCommand)
|
Logger.Warn("Invalid SQL Query for Counting Data in Profile {0}: {1}", oProfile.Guid, oCountCommand)
|
||||||
@ -225,7 +231,9 @@ Public Class frmStart
|
|||||||
Continue For
|
Continue For
|
||||||
End If
|
End If
|
||||||
|
|
||||||
oCountCommand = clsPatterns.ReplaceAllValues(oCountCommand, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID, oProfile.Guid)
|
oCountCommand = oPatterns.ReplaceUserValues(oCountCommand, oEnv.User)
|
||||||
|
oCountCommand = oPatterns.ReplaceInternalValues(oCountCommand)
|
||||||
|
|
||||||
oResultDocs += Database.GetScalarValue(oCountCommand)
|
oResultDocs += Database.GetScalarValue(oCountCommand)
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
Logger.Warn("Invalid SQL Query for Counting Data in Profile {0}: {1}", oProfile.Guid, oCountCommand)
|
Logger.Warn("Invalid SQL Query for Counting Data in Profile {0}: {1}", oProfile.Guid, oCountCommand)
|
||||||
@ -242,7 +250,6 @@ Public Class frmStart
|
|||||||
Exit Sub
|
Exit Sub
|
||||||
End If
|
End If
|
||||||
|
|
||||||
Dim oEnv = GetEnvironment()
|
|
||||||
Dim oParams = New ClipboardWatcherParams() With {
|
Dim oParams = New ClipboardWatcherParams() With {
|
||||||
.ClipboardContents = CURRENT_CLIPBOARD_CONTENTS,
|
.ClipboardContents = CURRENT_CLIPBOARD_CONTENTS,
|
||||||
.MatchingProfiles = oProfiles,
|
.MatchingProfiles = oProfiles,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user