This commit is contained in:
2020-02-13 10:21:07 +01:00
parent f150f3d897
commit a6ac1e08f0
13 changed files with 1769 additions and 2425 deletions

View File

@@ -441,7 +441,7 @@ Public Class frmValidator
Continue For
End If
If clsPatterns.HasComplexPatterns(oSQLStatement) Then
LOGGER.Warn($"Unexpected error LoadSQLData2 - sql Statement still has complex patterns! [{oSql}]")
LOGGER.Warn($"Unexpected error LoadSQLData2 - sql Statement still has complex patterns! [{oSQLStatement}]")
Continue For
End If
'sql = ClassPatterns.ReplaceInternalValues(sqlStatement)
@@ -1886,13 +1886,13 @@ Public Class frmValidator
oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING)
LOGGER.Debug($"Checking file 0 [{oResult}] exists?...")
If File.Exists(oResult) = False Then
If USER_USERNAME = "SchreiberM" Then
oResult = "\\dd-gan.local.digitaldata.works\DD-DFSR01\UserObjects\UserFiles\schreiberm\Desktop\AANG-3302-swbn.pdf"
ElseIf USER_USERNAME = "Administrator" Then
'oResult = "C:\Users\Administrator.DD-GAN\Desktop\test.pdf"
oResult = "\\dd-gan.local.digitaldata.works\DD-DFSR01\UserObjects\UserFiles\schreiberm\Desktop\AANG-3302-swbn.pdf"
Else
LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...")
'If USER_USERNAME = "SchreiberM" Then
' oResult = "\\dd-gan.local.digitaldata.works\DD-DFSR01\UserObjects\UserFiles\schreiberm\Desktop\AANG-3302-swbn.pdf"
'ElseIf USER_USERNAME = "Administrator" Then
' 'oResult = "C:\Users\Administrator.DD-GAN\Desktop\test.pdf"
' oResult = "\\dd-gan.local.digitaldata.works\DD-DFSR01\UserObjects\UserFiles\schreiberm\Desktop\AANG-3302-swbn.pdf"
'Else
LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...")
oSQL = $"SELECT [dbo].[FNPM_GET_FILEPATH] ({CURRENT_DOC_GUID},1)"
oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING)
LOGGER.Debug($"Checking file 1[{oResult}] exists?...")
@@ -1900,7 +1900,7 @@ Public Class frmValidator
LOGGER.Warn($"File {oResult} not existing!")
Return False
End If
End If
'End If
End If
WMDocPathWindows = oResult
OLD_Document_Path = WMDocPathWindows