Release 2.6

app/ClassWMResulthandler/clsDateiverarbeitung.vb

@@ -1,10 +1,10 @@
-Imports WINDREAMLib
-Imports System.IO
+Imports System.IO
 Imports System.Net
-Imports Newtonsoft.Json
 Imports System.Text
-Imports DigitalData.Modules.Logging
 Imports System.Text.RegularExpressions
+Imports DigitalData.Modules.Logging
+Imports Newtonsoft.Json
+Imports WINDREAMLib
 
 Public Class clsDateiverarbeitung
     Dim Logger As Logger
@@ -15,7 +15,7 @@ Public Class clsDateiverarbeitung
     Dim _database As clsDatabase
 
     Public Shared pr_DTPROFIL_REGELN As DataTable
-    Public Shared aktfile_Exportresult As String
+    Public Shared CURRFile_Exportresult As String
 
     Public Shared CriticalError As Boolean = False
 
@@ -154,10 +154,11 @@ Public Class clsDateiverarbeitung
                 oFilename = oFilenameWM.Substring(0, oSplitIndex)
             End If
 
-
+            oFilename = oFilename.Replace("/", "_")
             Logger.Debug("Preparing export of WMFile {0}..", oFilenameWM)
             Logger.Debug("Filename: {0}", oFilename)
             Logger.Debug("Extension: {0}", clsCURRENT.FILE_Extension)
+            Logger.Debug("pExportPath: {0}", pExportPath)
 
             ' build the file path in case the exported file doesn't already exist
             oFilenameExport = BuildExportPath(pExportPath, oFilename, clsCURRENT.FILE_Extension)
@@ -182,12 +183,13 @@ Public Class clsDateiverarbeitung
 
             Logger.Debug("Cleaning up..")
             oStream.Close()
-
+            oStream = Nothing
+            oWMFileIO = Nothing
             Logger.Debug("File exported!")
 
             If File.Exists(oFilenameExport) Then
-                Logger.Info($"File Export to HDD [{oFilenameExport}]was successfull (File.Exists = True)!")
-                aktfile_Exportresult = oFilenameExport
+                Logger.Info($"File Export to HDD [{oFilenameExport}] was successfull!")
+                CURRFile_Exportresult = oFilenameExport
                 clsCURRENT.EXPORTED_FILENAME = oFilenameExport
                 clsCURRENT.TEMP_FILES.Add(oFilenameExport)
                 Logger.Debug("FileInfo Added to variables...")
@@ -200,6 +202,7 @@ Public Class clsDateiverarbeitung
             Return True
         Catch ex As Exception
             Logger.Error(ex)
+            Logger.Info($"Unexpected error in Export_WMFile2HDD [{ex.Message}]")
             Return False
         End Try
     End Function
@@ -307,10 +310,10 @@ Public Class clsDateiverarbeitung
                 End If
             Next
             Dim version As Integer = 2
-            Dim ZielPfad As String = Path.GetDirectoryName(aktfile_Exportresult)
+            Dim ZielPfad As String = Path.GetDirectoryName(CURRFile_Exportresult)
             Logger.Debug("ZielPfad: " & ZielPfad)
             Dim Filename = konvention
-            Dim Extension = Path.GetExtension(aktfile_Exportresult)
+            Dim Extension = Path.GetExtension(CURRFile_Exportresult)
             Logger.Debug("Extension: " & Extension)
             Dim tempFilename As String = ZielPfad & "\" & Filename & Extension
             Logger.Debug("tempFilename: " & tempFilename)
@@ -319,8 +322,20 @@ Public Class clsDateiverarbeitung
                 tempFilename = ZielPfad & "\" & Filename & "_" & version & Extension
                 version += 1
             Loop
-            Logger.Debug("RenameFile - OLDFilename: " & aktfile_Exportresult & " - NEWFilename: " & Path.GetFileName(tempFilename))
-            My.Computer.FileSystem.RenameFile(aktfile_Exportresult, Path.GetFileName(tempFilename))
+            Logger.Debug("RenameFile - OLDFilename: " & CURRFile_Exportresult)
+            Logger.Debug("NEWFilename: " & Path.GetFileName(tempFilename))
+            Threading.Thread.Sleep(500)
+            Try
+                My.Computer.FileSystem.RenameFile(CURRFile_Exportresult, Path.GetFileName(tempFilename))
+            Catch ex As Exception
+                If ex.Message.Contains("The process cannot access the file") Then
+                    tempFilename = tempFilename.Replace(".pdf", "_X.pdf")
+                    My.Computer.FileSystem.CopyFile(CURRFile_Exportresult, tempFilename)
+                    Logger.Info("File is in use - NewName " & tempFilename)
+                    CURRFile_Exportresult = tempFilename
+                End If
+            End Try
+
             Logger.Info("Datei wurde erfolgreich umbenannt.")
             Return True
         Catch ex As Exception
@@ -329,12 +344,14 @@ Public Class clsDateiverarbeitung
             Return False
         End Try
     End Function
+
+
     Public Function Rename_File_Vektor(WMFile As WMObject, WMINDEX_NAME As String)
         Try
             Dim WMIndexwert
-            Dim ZielPfad As String = Path.GetDirectoryName(aktfile_Exportresult)
+            Dim ZielPfad As String = Path.GetDirectoryName(CURRFile_Exportresult)
             Logger.Debug("ZielPfad: " & ZielPfad)
-            Dim Extension = Path.GetExtension(aktfile_Exportresult)
+            Dim Extension = Path.GetExtension(CURRFile_Exportresult)
             Logger.Debug("Extension: " & Extension)
 
             If WMINDEX_NAME.StartsWith("[%") Then
@@ -354,8 +371,8 @@ Public Class clsDateiverarbeitung
                             Dim tempFilename As String = ZielPfad & "\" & WMvalue & Extension
                             Logger.Debug("tempFilename: " & tempFilename)
                             If anz = 1 Then
-                                Logger.Debug("RenameFile - OLDFilename: " & aktfile_Exportresult & " - NEWFilename: " & Path.GetFileName(tempFilename))
-                                My.Computer.FileSystem.RenameFile(aktfile_Exportresult, Path.GetFileName(tempFilename))
+                                Logger.Debug("RenameFile - OLDFilename: " & CURRFile_Exportresult & " - NEWFilename: " & Path.GetFileName(tempFilename))
+                                My.Computer.FileSystem.RenameFile(CURRFile_Exportresult, Path.GetFileName(tempFilename))
                                 copybasefile = tempFilename
                             Else
                                 Dim version As Integer = 2