MS .net 4.6.2 Modules Update

Global_Indexer/frmIndex.vb

@@ -23,7 +23,7 @@ Public Class frmIndex
     Public FormLoaded As Boolean = False
     Private Shared ReadOnly _Instance As frmIndex = Nothing
     Dim DropType As String
-    Private Shared WDDirect As Boolean = False
+    Private Shared WMDirect As Boolean = False
 
     Dim sql_history_INSERT_INTO As String
     Dim sql_history_Index_Values As String
@@ -570,7 +570,7 @@ Public Class frmIndex
             CURR_DOKART_OBJECTTYPE = DT.Rows(0).Item("OBJEKTTYP")
             CURR_WORKFILE_EXTENSION = extension
 
-            oRAWZielordner = WINDREAM.GetNormalizedPath(DT.Rows(0).Item("ZIEL_PFAD"))
+            oRAWZielordner = WINDREAM.GetNormalizedPath(DT.Rows(0).Item("ZIEL_PFAD"), True)
             oRAWZielordner = Path.Combine(WINDREAM_BASEPATH, oRAWZielordner)
 
             '####
@@ -745,7 +745,7 @@ Public Class frmIndex
     End Function
     Private Function Write_Indizes() As Boolean
         Try
-            _Logger.NewBlock("Write_Indizes")
+
             _Logger.Info("Indexing file [{0}]", CURRENT_NEWFILENAME)
 
             Dim indexierung_erfolgreich As Boolean = False
@@ -885,7 +885,7 @@ Public Class frmIndex
             ShowErrorMessage(ex, "Write_Indizes")
             Return False
         Finally
-            _Logger.EndBlock()
+
         End Try
         Return True
     End Function
@@ -1386,7 +1386,7 @@ Public Class frmIndex
                 CURRENT_NEWFILENAME = oWMCheckPath
             End If
 
-            Dim oStreamSuccessful = WINDREAM.NewFileStream(CURRENT_WORKFILE, CURRENT_NEWFILENAME)
+            Dim oStreamSuccessful = WINDREAM.NewFileStream(CURRENT_WORKFILE, CURRENT_NEWFILENAME, CURR_DOKART_OBJECTTYPE)
             Dim oTempPath As String = Path.Combine(WINDREAM_BASEPATH, CURRENT_NEWFILENAME)
 
             _Logger.Debug("Checks for file [{0}]", oTempPath)
@@ -1790,16 +1790,29 @@ Public Class frmIndex
             pnlIndex.Controls.Clear()
             Dim sql As String = "Select WINDREAM_DIRECT, ZIEL_PFAD, DUPLICATE_HANDLING from TBDD_DOKUMENTART WHERE GUID = " & oSelectedItem.Guid
             Dim oDoctypes As DataTable = DATABASE_ECM.GetDatatable(sql)
-            Dim oDocType As DataRow = oDoctypes.Rows.Item(0)
 
+            Dim oDocType As DataRow = oDoctypes.Rows.Item(0)
+            WMDirect = oDocType.Item("WINDREAM_DIRECT")
             Dim oDestination As String = oDocType.Item("ZIEL_PFAD")
-            Dim oNormalized As String = WINDREAM.GetNormalizedPath(oDestination)
-            Dim oNewDestination = Path.Combine(WINDREAM.ClientBasePath, oNormalized)
+            Dim oNewDestination As String
+            If WMDirect Then
+                Dim oNormalized As String = WINDREAM.GetNormalizedPath(oDestination, False)
+                oNewDestination = Path.Combine(WINDREAM.ClientBasePath, oNormalized)
+            Else
+                oNewDestination = oDestination
+            End If
+
 
             LOGGER.Debug("Path from Database is [{0}]", oDestination)
             LOGGER.Debug("Checking for path [{0}]", oNewDestination)
+            Dim oPathExists As Boolean
+            If WMDirect Then
+                oPathExists = WINDREAM.TestFolderExists(oNewDestination)
+            Else
+                oPathExists = Directory.Exists(oNewDestination)
+            End If
 
-            If Directory.Exists(oNewDestination) = False Then
+            If oPathExists = False Then
                 Dim oMessage As String
 
                 If USER_LANGUAGE = "de-DE" Then
@@ -1811,7 +1824,7 @@ Public Class frmIndex
                 MsgBox(oMessage, MsgBoxStyle.Information, Text)
                 ComboboxDoctype.EditValue = Nothing
             Else
-                WDDirect = oDocType.Item("WINDREAM_DIRECT")
+
                 CURRENT_DOKART_DUPLICATE_HANDLING = oDocType.Item("DUPLICATE_HANDLING")
                 Refresh_IndexeMan(oSelectedItem.Guid)
             End If