Compare commits
4 Commits
104b3d6b8b
...
2c34f13694
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2c34f13694 | ||
|
|
d028cf455b | ||
|
|
23a65cdeef | ||
|
|
bac5a3bcd4 |
@@ -177,6 +177,10 @@ Public Class ImportZUGFeRDFiles
|
|||||||
' Will be set only at the end of the function if no error occurred.
|
' Will be set only at the end of the function if no error occurred.
|
||||||
Dim oIsSuccess As Boolean = False
|
Dim oIsSuccess As Boolean = False
|
||||||
|
|
||||||
|
' Flag to save if the occurred error (if any) was expected
|
||||||
|
' Used to determine if transactions should be committed or not
|
||||||
|
Dim oExpectedError As Boolean = True
|
||||||
|
|
||||||
' Create file lists
|
' Create file lists
|
||||||
Dim oFileGroupFiles As List(Of FileInfo) = oFileGroup.Value
|
Dim oFileGroupFiles As List(Of FileInfo) = oFileGroup.Value
|
||||||
Dim oEmailAttachmentFiles As New List(Of FileInfo)
|
Dim oEmailAttachmentFiles As New List(Of FileInfo)
|
||||||
@@ -433,6 +437,8 @@ Public Class ImportZUGFeRDFiles
|
|||||||
|
|
||||||
oMoveDirectory = DIRECTORY_DONT_MOVE
|
oMoveDirectory = DIRECTORY_DONT_MOVE
|
||||||
|
|
||||||
|
oExpectedError = False
|
||||||
|
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
_logger.Warn("Unknown Error occurred: {0}", ex.Message)
|
_logger.Warn("Unknown Error occurred: {0}", ex.Message)
|
||||||
_logger.Error(ex)
|
_logger.Error(ex)
|
||||||
@@ -453,6 +459,8 @@ Public Class ImportZUGFeRDFiles
|
|||||||
|
|
||||||
oMoveDirectory = DIRECTORY_DONT_MOVE
|
oMoveDirectory = DIRECTORY_DONT_MOVE
|
||||||
|
|
||||||
|
oExpectedError = False
|
||||||
|
|
||||||
Finally
|
Finally
|
||||||
Try
|
Try
|
||||||
' If an application error occurred, dont move files so they will be processed again later
|
' If an application error occurred, dont move files so they will be processed again later
|
||||||
@@ -480,9 +488,10 @@ Public Class ImportZUGFeRDFiles
|
|||||||
End Try
|
End Try
|
||||||
|
|
||||||
Try
|
Try
|
||||||
' If everything went OK, finally commit all changes to the Database
|
' If everything went OK or an expected error occurred,
|
||||||
|
' finally commit all changes To the Database
|
||||||
' ==================================================================
|
' ==================================================================
|
||||||
If oIsSuccess Then
|
If oIsSuccess Or oExpectedError Then
|
||||||
' Commit SQL Transaction
|
' Commit SQL Transaction
|
||||||
oSQLTransaction.Commit()
|
oSQLTransaction.Commit()
|
||||||
|
|
||||||
|
|||||||
@@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
|
|||||||
' Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
|
' Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
|
||||||
' übernehmen, indem Sie "*" eingeben:
|
' übernehmen, indem Sie "*" eingeben:
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("1.6.0.0")>
|
<Assembly: AssemblyVersion("1.6.1.0")>
|
||||||
<Assembly: AssemblyFileVersion("1.6.0.0")>
|
<Assembly: AssemblyFileVersion("1.6.1.0")>
|
||||||
|
|||||||
@@ -1,11 +1,10 @@
|
|||||||
Public Class Config
|
Public Class Config
|
||||||
Public Property Firebird As FirebirdConfig
|
Public Property Firebird As New FirebirdConfig
|
||||||
Public Property MSSQLConnectionString As String = ""
|
Public Property MSSQLConnectionString As String = ""
|
||||||
Public Property MSSQLEnabled As Boolean = False
|
Public Property MSSQLEnabled As Boolean = False
|
||||||
Public Property MSSQLEmailOutAccountID As String = 1
|
Public Property MSSQLEmailOutAccountID As String = 1
|
||||||
|
|
||||||
Public Property JobInterval As Integer = 10
|
Public Property JobInterval As Integer = 10
|
||||||
Public Property GDPictureKey As String = "1234567890_EXAMPLE_KEY"
|
|
||||||
Public Property ExceptionEmailAddress As String = "wisag-flow@digitaldata.works"
|
Public Property ExceptionEmailAddress As String = "wisag-flow@digitaldata.works"
|
||||||
|
|
||||||
Public Property Debug As Boolean = False
|
Public Property Debug As Boolean = False
|
||||||
|
|||||||
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
|||||||
' übernehmen, indem Sie "*" eingeben:
|
' übernehmen, indem Sie "*" eingeben:
|
||||||
' <Assembly: AssemblyVersion("1.0.*")>
|
' <Assembly: AssemblyVersion("1.0.*")>
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("1.3.0.0")>
|
<Assembly: AssemblyVersion("1.3.1.0")>
|
||||||
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
||||||
|
|||||||
Reference in New Issue
Block a user