diff --git a/Modules.Interfaces/Interfaces.vbproj b/Modules.Interfaces/Interfaces.vbproj index 5a56b305..f8237cd2 100644 --- a/Modules.Interfaces/Interfaces.vbproj +++ b/Modules.Interfaces/Interfaces.vbproj @@ -136,9 +136,6 @@ Settings.Designer.vb - - PreserveNewest - @@ -150,14 +147,6 @@ Logging - - - PreserveNewest - - - PreserveNewest - - \ No newline at end of file diff --git a/Modules.Interfaces/ZUGFeRDInterface.vb b/Modules.Interfaces/ZUGFeRDInterface.vb index 56297e10..9c69de55 100644 --- a/Modules.Interfaces/ZUGFeRDInterface.vb +++ b/Modules.Interfaces/ZUGFeRDInterface.vb @@ -40,23 +40,12 @@ Public Class ZUGFeRDInterface End Try End Sub - ''' ''' Validates a ZUGFeRD File and extracts the XML Document from it ''' ''' ''' ''' - Public Function ExtractZUGFeRDFile(Path As String) As CrossIndustryDocumentType - Dim oXmlDocument = ValidateZUGFeRDFile(Path) - - If IsNothing(oXmlDocument) Then - Throw New ZUGFeRDExecption(ErrorType.NoZugferd, "Datei ist keine ZUGFeRD Datei.") - End If - - Return SerializeZUGFeRDDocument(oXmlDocument) - End Function - Public Function ExtractZUGFeRDFileWithGDPicture(Path As String) As CrossIndustryDocumentType Dim oXmlDocument = ValidateZUGFeRDFileWithGDPicture(Path) @@ -67,6 +56,12 @@ Public Class ZUGFeRDInterface Return SerializeZUGFeRDDocument(oXmlDocument) End Function + ''' + ''' Validates a ZUGFeRD File and extracts the XML Document from it + ''' + ''' + ''' + ''' Public Function ExtractZUGFeRDFileWithGDPicture(Stream As Stream) As CrossIndustryDocumentType Dim oXmlDocument = ValidateZUGFeRDFileWithGDPicture(Stream) @@ -77,50 +72,12 @@ Public Class ZUGFeRDInterface Return SerializeZUGFeRDDocument(oXmlDocument) End Function - Public Function ValidateZUGFeRDFile(Path As String) As XPathDocument - Dim oProcessOutput, oProcessError As String - Dim oXmlDocument As XPathDocument - Dim oTempFile = IO.Path.GetTempFileName() - - Dim oProcess As New Process() With { - .StartInfo = New ProcessStartInfo() With { - .FileName = ZUGFERD_CONVERTER_EXE, - .RedirectStandardError = True, - .RedirectStandardOutput = True, - .UseShellExecute = False, - .Arguments = $"-i ""{Path}"" -o ""{oTempFile}""" - } - } - - Try - oProcess.Start() - oProcessOutput = oProcess.StandardOutput.ReadToEnd() - oProcessError = oProcess.StandardError.ReadToEnd() - oProcess.WaitForExit() - - _logger.Debug("Process Output:") - _logger.Debug(oProcessOutput) - Catch ex As Exception - _logger.Error(ex) - Throw ex - End Try - - If Not oProcessOutput.ToLower.Contains(ZUGFERD_CONVERTER_SUCCESS_MESSAGE.ToLower) Then - _logger.Warn("File {0} is not a valid ZUGFeRD File!", Path) - Throw New ZUGFeRDExecption(ErrorType.NoZugferd, "Datei ist keine ZUGFeRD Datei.") - End If - - Try - oXmlDocument = New XPathDocument(oTempFile) - - Catch ex As Exception - _logger.Error(ex) - Throw ex - End Try - - Return oXmlDocument - End Function - + ''' + ''' Validates a ZUGFeRD File and extracts the XML Document from it + ''' + ''' + ''' + ''' Public Function ValidateZUGFeRDFileWithGDPicture(Stream As Stream) As XPathDocument Dim oEmbedExtractor = New PDFEmbeds(_logConfig) Dim oAllowedExtensions = New List(Of String) From {"xml"} diff --git a/Modules.Interfaces/ZUGFeRDInterface/pdf_zugferd_lib/pdf_zugferd_lib.dll b/Modules.Interfaces/ZUGFeRDInterface/pdf_zugferd_lib/pdf_zugferd_lib.dll deleted file mode 100644 index 3583ada1..00000000 Binary files a/Modules.Interfaces/ZUGFeRDInterface/pdf_zugferd_lib/pdf_zugferd_lib.dll and /dev/null differ diff --git a/Modules.Interfaces/ZUGFeRDInterface/pdf_zugferd_lib/pdf_zugferd_lib.lib b/Modules.Interfaces/ZUGFeRDInterface/pdf_zugferd_lib/pdf_zugferd_lib.lib deleted file mode 100644 index c3c4828f..00000000 Binary files a/Modules.Interfaces/ZUGFeRDInterface/pdf_zugferd_lib/pdf_zugferd_lib.lib and /dev/null differ diff --git a/Modules.Interfaces/ZUGFeRDInterface/pdf_zugferd_lib/pdf_zugferd_test.exe b/Modules.Interfaces/ZUGFeRDInterface/pdf_zugferd_lib/pdf_zugferd_test.exe deleted file mode 100644 index 325def83..00000000 Binary files a/Modules.Interfaces/ZUGFeRDInterface/pdf_zugferd_lib/pdf_zugferd_test.exe and /dev/null differ