diff --git a/DDZUGFeRDService/App.config b/DDZUGFeRDService/App.config index 91adb3bc..3caf5e6e 100644 --- a/DDZUGFeRDService/App.config +++ b/DDZUGFeRDService/App.config @@ -32,7 +32,7 @@ 10 - + False diff --git a/DDZUGFeRDService/ThreadRunner.vb b/DDZUGFeRDService/ThreadRunner.vb index 1289e5f1..ba8c6a17 100644 --- a/DDZUGFeRDService/ThreadRunner.vb +++ b/DDZUGFeRDService/ThreadRunner.vb @@ -37,7 +37,6 @@ Public Class ThreadRunner Dim args As New WorkerArgs() args = LoadFolderConfig(args) args = LoadPropertyMapFor(args, "DEFAULT") - args.GDPictureKey = GDPictureKey ' Use MSSQL Server if available If Not IsNothing(_mssql) Then @@ -114,25 +113,6 @@ Public Class ThreadRunner Dim args As WorkerArgs = e.Argument _logger.Debug("Background worker running..") - ' Use MSSQL Server if available - If Not IsNothing(_mssql) Then - 'Checking if documents have bee´n rejected - Dim oSQL As String = "Select * from TBEDMI_DOC_REJECTED WHERE MD5_UPDATE = 0" - 'Dim oDT As DataTable = _mssql.GetDatatable(oSQL) - 'If Not IsNothing(oDT) Then - ' For Each oRow As DataRow In oDT.Rows - ' oSQL = $"UPDATE TBEDM_ZUGFERD_HISTORY_IN SET REJECTED = TRUE WHERE MESSAGE_ID = '{oRow.Item("MESSAGE_ID")}'" - ' If _firebird.ExecuteNonQuery(oSQL) = True Then - ' oSQL = $"UPDATE TBEDMI_DOC_REJECTED SET MD5_UPDATE = 1 WHERE GUID = '{oRow.Item("GUID")}'" - ' If _mssql.ExecuteNonQuery(oSQL) = True Then - ' _logger.Debug($"Refreshed the Rejected Info for messageid [{oRow.Item("MESSAGE_ID")}]") - ' End If - ' End If - ' Next - 'Else - ' _logger.Warn("oDTTBEDMI_DOC_REJECTED is nothing...") - 'End If - End If Dim job As New ImportZUGFeRDFiles(_logConfig, _firebird, _mssql) job.Start(args) Catch ex As Exception diff --git a/GUIs.Test.ZUGFeRDTest/App.config b/GUIs.Test.ZUGFeRDTest/App.config index ee850a55..7d636a2e 100644 --- a/GUIs.Test.ZUGFeRDTest/App.config +++ b/GUIs.Test.ZUGFeRDTest/App.config @@ -32,6 +32,9 @@ + + Server=SDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM_TEST;User Id=sa;Password=dd + diff --git a/GUIs.Test.ZUGFeRDTest/Form1.vb b/GUIs.Test.ZUGFeRDTest/Form1.vb index 0fc13b40..0a680b35 100644 --- a/GUIs.Test.ZUGFeRDTest/Form1.vb +++ b/GUIs.Test.ZUGFeRDTest/Form1.vb @@ -13,6 +13,7 @@ Imports DigitalData.Modules.Logging Public Class Form1 Private _logConfig As LogConfig Private _firebird As Firebird + Private _mssql As MSSQLServer Private _zugferd As ZUGFeRDInterface Private PropertyMap As New Dictionary(Of String, XmlItemProperty) @@ -22,6 +23,7 @@ Public Class Form1 _logConfig = New LogConfig(LogConfig.PathType.CurrentDirectory) _logConfig.Debug = True _firebird = New Firebird(_logConfig, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PASS) + _mssql = New MSSQLServer(_logConfig, My.Settings.MSSQL_CONNECTIONSTRING) _zugferd = New ZUGFeRDInterface(_logConfig) End Sub @@ -85,9 +87,8 @@ Public Class Form1 Dim args As New WorkerArgs() args = LoadFolderConfig(args) args = LoadPropertyMapFor(args, "DEFAULT") - args.GDPictureKey = "21182889975216572111813147150675976632" - Dim job As New Jobs.ImportZUGFeRDFiles(_logConfig, _firebird) + Dim job As New Jobs.ImportZUGFeRDFiles(_logConfig, _firebird, _mssql) job.Start(args) End Sub @@ -163,13 +164,11 @@ Public Class Form1 End Sub Private Sub Button7_Click(sender As Object, e As EventArgs) Handles Button7.Click - Dim oExtractor = New Jobs.PDFAttachments(_logConfig, "21182889975216572111813147150675976632") - + Dim oExtractor = New Jobs.PDFAttachments(_logConfig) Dim oResult = OpenFileDialog1.ShowDialog() If oResult = DialogResult.OK Then oExtractor.Extract(OpenFileDialog1.FileName, AllowedExtensions:=New List(Of String) From {"docx", "doc", "pdf", "xls", "xlsx", "ppt", "pptx", "txt"}) End If - End Sub End Class diff --git a/GUIs.Test.ZUGFeRDTest/My Project/Settings.Designer.vb b/GUIs.Test.ZUGFeRDTest/My Project/Settings.Designer.vb index 9d3b1474..b77f9d20 100644 --- a/GUIs.Test.ZUGFeRDTest/My Project/Settings.Designer.vb +++ b/GUIs.Test.ZUGFeRDTest/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -107,6 +107,18 @@ Namespace My Me("MD5Cheksum") = value End Set End Property + + _ + Public Property MSSQL_CONNECTIONSTRING() As String + Get + Return CType(Me("MSSQL_CONNECTIONSTRING"),String) + End Get + Set + Me("MSSQL_CONNECTIONSTRING") = value + End Set + End Property End Class End Namespace diff --git a/GUIs.Test.ZUGFeRDTest/My Project/Settings.settings b/GUIs.Test.ZUGFeRDTest/My Project/Settings.settings index fd42a2b7..2e7a8ce5 100644 --- a/GUIs.Test.ZUGFeRDTest/My Project/Settings.settings +++ b/GUIs.Test.ZUGFeRDTest/My Project/Settings.settings @@ -17,5 +17,8 @@ + + Server=SDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM_TEST;User Id=sa;Password=dd + \ No newline at end of file diff --git a/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb b/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb index d76b8f1e..0a949a5d 100644 --- a/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb +++ b/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb @@ -330,13 +330,26 @@ Public Class ImportZUGFeRDFiles Public Sub Start(Arguments As Object) Implements IJob.Start Dim oArgs As WorkerArgs = Arguments Dim oPropertyExtractor = New PropertyValues(_logConfig) - Dim oAttachmentExtractor = New PDFAttachments(_logConfig, oArgs.GDPictureKey) + Dim oAttachmentExtractor = New PDFAttachments(_logConfig) _logger.Debug("Starting Job {0}", [GetType].Name) _logger.Debug("Registering GDPicture License") - Dim oLicenseManager As New LicenseManager - oLicenseManager.RegisterKEY(oArgs.GDPictureKey) + If _mssql IsNot Nothing Then + Try + Dim oSQL = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'" + Dim oLicenseKey As String = _mssql.GetScalarValue(oSQL) + Dim oLicenseManager As New LicenseManager + oLicenseManager.RegisterKEY(oLicenseKey) + Catch ex As Exception + _logger.Error(ex) + _logger.Warn("GDPicture License could not be retrieved! Query failed! Exiting job.") + Exit Sub + End Try + Else + _logger.Warn("GDPicture License could not be retrieved! MSSQL is not enabled! Exiting job.") + Exit Sub + End If Try For Each oPath As String In oArgs.WatchDirectories diff --git a/Modules.Jobs/EDMI/ZUGFeRD/PDFAttachments.vb b/Modules.Jobs/EDMI/ZUGFeRD/PDFAttachments.vb index e22d48ba..3f170017 100644 --- a/Modules.Jobs/EDMI/ZUGFeRD/PDFAttachments.vb +++ b/Modules.Jobs/EDMI/ZUGFeRD/PDFAttachments.vb @@ -13,7 +13,7 @@ Public Class PDFAttachments Public FileContents As Byte() End Class - Public Sub New(LogConfig As LogConfig, GdPictureKey As String) + Public Sub New(LogConfig As LogConfig) Logger = LogConfig.GetLogger End Sub diff --git a/Modules.Jobs/EDMI/ZUGFeRD/WorkerArgs.vb b/Modules.Jobs/EDMI/ZUGFeRD/WorkerArgs.vb index 8785c5b6..71b3f456 100644 --- a/Modules.Jobs/EDMI/ZUGFeRD/WorkerArgs.vb +++ b/Modules.Jobs/EDMI/ZUGFeRD/WorkerArgs.vb @@ -9,7 +9,6 @@ Public Class WorkerArgs Public AttachmentsSubDirectory As String Public PropertyMap As Dictionary(Of String, XmlItemProperty) Public InsertIntoSQLServer As Boolean - Public GDPictureKey As String Public Sub New() WatchDirectories = New List(Of String) @@ -20,6 +19,5 @@ Public Class WorkerArgs AttachmentsSubDirectory = Nothing PropertyMap = New Dictionary(Of String, XmlItemProperty) InsertIntoSQLServer = False - GDPictureKey = String.Empty End Sub End Class \ No newline at end of file