MS WMsharedrive Integration

2022-11-11 14:37:36 +01:00 · 2022-11-11 14:37:36 +01:00 · 01b066e4e3
commit 01b066e4e3
parent f01ffe312d
19 changed files with 280 additions and 435 deletions
--- a/app/DD-Record-Organizer/Classes/ClassDOC_SEARCH.vb
+++ b/app/DD-Record-Organizer/Classes/ClassDOC_SEARCH.vb
@ -513,15 +513,6 @@ Public Class ClassDOC_SEARCH
        End Try
    End Function

-    Public Shared Function REFRESH_DOC_TABLE_RESULTS()
-        Try
-            Dim execute = "EXEC[dbo].[PRPMO_DOCRESULT_CHANGE]"
-            Return ClassDatabase.Execute_non_Query_withConn(execute, 1)
-        Catch ex As Exception
-            MsgBox("Unexpected Error in REFRESH_TABLE_RESULTS: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            Return False
-        End Try
-    End Function
    Public Shared Function CREATE_DOC_RELATED_LINKS(DOC_ID As Integer, RECORD_ID As Integer)
        Try
            Dim execute = String.Format("EXEC [dbo].[PRPMO_DOC_CREATE_NEW_DOC] {0},{1},'{2}'", DOC_ID, RECORD_ID, USER_USERNAME)
--- a/app/DD-Record-Organizer/Classes/ClassGridFormatter.vb
+++ b/app/DD-Record-Organizer/Classes/ClassGridFormatter.vb
@ -89,44 +89,49 @@ Public Class ClassGridFormatter
        End Function

        Public Sub FormatGridView(gridView As GridView)
-            If IsNothing(gridView.GridControl.DataSource) Then
-                Throw New Exception("Error in FormatGridView: DataSource is Empty!")
-            End If
-
-            ' Editoren zum Grid hinzufügen
-            gridView.GridControl.RepositoryItems.AddRange({checkboxEdit, dateEdit})
-
-            For Each columnName As String In Me.dateColumns
-                Dim column As GridColumn = gridView.Columns(columnName)
-
-                If Not IsNothing(column) Then
-                    column.DisplayFormat.FormatType = FormatType.DateTime
-                    column.DisplayFormat.FormatString = CURRENT_DATE_FORMAT
-                    column.OptionsFilter.FilterPopupMode = FilterPopupMode.Date
-                    column.FilterMode = ColumnFilterMode.Value ' was DisplayText
-                    column.ColumnEdit = dateEdit
+            Try
+                If IsNothing(gridView.GridControl.DataSource) Then
+                    Throw New Exception("Error in FormatGridView: DataSource is Empty!")
                End If
-            Next

-            For Each columnName As String In Me.checkboxColumns
-                Dim column As GridColumn = gridView.Columns(columnName)
+                ' Editoren zum Grid hinzufügen
+                gridView.GridControl.RepositoryItems.AddRange({checkboxEdit, dateEdit})

-                If Not IsNothing(column) Then
-                    column.ColumnEdit = checkboxEdit
-                End If
-            Next
+                For Each columnName As String In Me.dateColumns
+                    Dim column As GridColumn = gridView.Columns(columnName)

-            currencyColumns = GetCurrencyColumns()
+                    If Not IsNothing(column) Then
+                        column.DisplayFormat.FormatType = FormatType.DateTime
+                        column.DisplayFormat.FormatString = CURRENT_DATE_FORMAT
+                        column.OptionsFilter.FilterPopupMode = FilterPopupMode.Date
+                        column.FilterMode = ColumnFilterMode.Value ' was DisplayText
+                        column.ColumnEdit = dateEdit
+                    End If
+                Next

-            For Each columnName As String In currencyColumns
-                Dim column As GridColumn = gridView.Columns(columnName)
+                For Each columnName As String In Me.checkboxColumns
+                    Dim column As GridColumn = gridView.Columns(columnName)
+
+                    If Not IsNothing(column) Then
+                        column.ColumnEdit = checkboxEdit
+                    End If
+                Next
+
+                currencyColumns = GetCurrencyColumns()
+
+                For Each columnName As String In currencyColumns
+                    Dim column As GridColumn = gridView.Columns(columnName)
+
+                    If Not IsNothing(column) Then
+                        column.DisplayFormat.FormatType = FormatType.Numeric
+                        column.DisplayFormat.FormatString = "C"
+                        column.DisplayFormat.Format = New CurrencyFormatter()
+                    End If
+                Next
+            Catch ex As Exception
+                LOGGER.Warn("Unexpected Error in FormatGridView: " & ex.Message)
+            End Try

-                If Not IsNothing(column) Then
-                    column.DisplayFormat.FormatType = FormatType.Numeric
-                    column.DisplayFormat.FormatString = "C"
-                    column.DisplayFormat.Format = New CurrencyFormatter()
-                End If
-            Next

        End Sub

--- a/app/DD-Record-Organizer/Classes/ClassHelper.vb
+++ b/app/DD-Record-Organizer/Classes/ClassHelper.vb
@ -10,11 +10,11 @@ Public Class ClassHelper
        Try
            Dim ochanged As Boolean = False
            If WMpath.StartsWith("W:") Then
-                WMpath = WMpath.Replace("W:", "\\windream\Objects")
+                WMpath = WMpath.Replace("W:", WMPATH_PREFIX)
                ochanged = True
            ElseIf WMpath.StartsWith("\") Then
-                If WMpath.StartsWith("\\windream\Objects") = False Then
-                    WMpath = "\\windream\Objects" & WMpath
+                If WMpath.StartsWith(WMPATH_PREFIX) = False Then
+                    WMpath = WMPATH_PREFIX & WMpath
                    ochanged = True
                End If
            End If
@ -24,6 +24,23 @@ Public Class ClassHelper
            Return WMpath
        End Try

+    End Function
+    Public Shared Function GetRelPath(WMpath As String)
+        Try
+            If WMpath.StartsWith("W:") Then
+                WMpath = WMpath.Replace("W:", "")
+
+            ElseIf WMpath.StartsWith("\") Then
+                If WMpath.StartsWith(WMPATH_PREFIX) = False Then
+                    WMpath = WMpath.Replace("WMPATH_PREFIX:", "")
+                End If
+            End If
+            LOGGER.Debug("WMpath is: " & WMpath)
+            Return WMpath
+        Catch ex As Exception
+            Return WMpath
+        End Try
+
    End Function
    Public Shared Function Format_Currency(value As String, language As String)
        Try
@ -161,7 +178,7 @@ Public Class ClassHelper
                If USER_GENERAL_VIEWER = "NONE" Then
                    Dim EXT = Path.GetExtension(RESULT_DOC_PATH)
                    EXT = EXT.Replace(".", "")
-                    Dim sql = String.Format("SELECT VIEWER FROM TBPMO_DOC_USER_VIEW WHERE USER_ID = {0} AND UPPER(FILE_EXTENSION) = UPPER('{1}')", USER_GUID, EXT)
+                    Dim sql = String.Format("SELECT VIEWER FROM TBPMO_DOC_USER_VIEW WHERE USER_ID = {0} AND FILE_EXTENSION = '{1}'", USER_GUID, EXT)
                    Dim DT As DataTable = ClassDatabase.Return_Datatable(sql)
                    If DT.Rows.Count = 1 Then
                        Select Case DT.Rows(0).Item("VIEWER")
@ -192,6 +209,7 @@ Public Class ClassHelper
    Public Shared Sub Open_Folder(RESULT_DOC_PATH As Object, DocID As String)
        Try
            If RESULT_DOC_PATH <> Nothing Then
+                RESULT_DOC_PATH = FORMAT_WM_PATH(RESULT_DOC_PATH)
                Dim _path = Path.GetDirectoryName(RESULT_DOC_PATH)
                FOLDER_OPEN(_path, DocID)
            Else
--- a/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb
+++ b/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb
@ -135,6 +135,7 @@ Public Class ClassImport_Windream
                oROOTWM_FOLDER = ""
            End Try
            If oROOTWM_FOLDER <> String.Empty Then
+                oROOTWM_FOLDER = ClassHelper.FORMAT_WM_PATH(oROOTWM_FOLDER)
                LOGGER.Debug($"oROOTWM_FOLDER '{oROOTWM_FOLDER}' will be used")
                oWMTARGET_FOLDER = oROOTWM_FOLDER
            End If
--- a/app/DD-Record-Organizer/Classes/ClassInit.vb
+++ b/app/DD-Record-Organizer/Classes/ClassInit.vb
@ -76,7 +76,7 @@ Public Class ClassInit
    Public Sub InitAddons()
        Try
            Dim CurrentDir As String = My.Application.Info.DirectoryPath
-            ' Dim Sql As String = "SELECT PATH_ADDONS from TBPMO_KONFIGURATION WHERE GUID = 1"
+
            Dim AddonPath As String = MY_ADDON_PATH ' ClassDatabase.Execute_Scalar(Sql)
            Dim Dev_AddonPath As String = System.IO.Path.GetFullPath(System.IO.Path.Combine(CurrentDir, "..\..\..\..\app"))

@ -133,9 +133,14 @@ Public Class ClassInit
                End Try
                WD_UNICODE = KONFIG_DT.Rows(0).Item("WD_UNICODE")
                SQL_FULLTEXT = KONFIG_DT.Rows(0).Item("SQL_FULLTEXT")
+                WMDriveLetter = KONFIG_DT.Rows(0).Item("WM_LAUFWERKBUCHSTABE")
+                WMPATH_PREFIX = KONFIG_DT.Rows(0).Item("WMPATH_PREFIX")
+                If Not WMPATH_PREFIX.ToUpper.StartsWith("\\WINDREAM\OBJECTS") Then
+                    SHARE_DRIVE_ACTIVE = True
+                End If
            End If

-            sql = "SELECT * FROM TBDD_SQL_COMMANDS"
+                sql = "SELECT * FROM TBDD_SQL_COMMANDS"
            Dim oDTSQL_COMMANDS As DataTable = ClassDatabase.Return_Datatable(sql, True)
            For Each oRow As DataRow In oDTSQL_COMMANDS.Rows
                If oRow.Item("TITLE") = "ADDI_DOC_SEARCH_RECORD" Then
@ -187,14 +192,13 @@ Public Class ClassInit
            End If

            Dim sql = String.Format("SELECT T.*, T1.IS_ADMIN FROM TBDD_USER T INNER JOIN TBDD_USER_MODULES T1 ON T.GUID = T1.USER_ID INNER JOIN TBDD_MODULES T2 ON T1.MODULE_ID = T2.GUID  
-WHERE (LOWER(USERNAME) = LOWER('{0}')) AND T2.SHORT_NAME = 'ADDI'", USER_USERNAME)
+WHERE (USERNAME = '{0}') AND T2.SHORT_NAME = 'ADDI'", USER_USERNAME)
            LOGGER.Info("Login at: " & Now.ToString)
            LOGGER.Info("Username: " & USER_USERNAME)
            Dim USER_DT As DataTable = ClassDatabase.Return_Datatable(sql, True)
            If USER_DT.Rows.Count = 0 Then
-                LOGGER.Warn(" - User '" & USER_USERNAME & "' not listed in Useradminsitration!")
-                'MsgBox("Achtung: Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
-                'Me.Close()
+                LOGGER.Warn(" - User '" & USER_USERNAME & "' not listed in Useradministration!")
+
                Dim msg = String.Format("You are not listed in the Useradministration." & vbNewLine & "Please contact the admin.")
                MsgBox(msg, MsgBoxStyle.Exclamation)
                ClassHelper.InsertEssential_Log(0, "USER-ID", String.Format("User '{0}' not listed in Userconfiguration", USER_USERNAME))
@ -203,7 +207,7 @@ WHERE (LOWER(USERNAME) = LOWER('{0}')) AND T2.SHORT_NAME = 'ADDI'", USER_USERNAM
                Dim Right_RO As Boolean = False
                USER_GUID = USER_DT.Rows(0).Item("GUID")
                USERID_FK_INT_ECM = USER_DT.Rows(0).Item("USERID_FK_INT_ECM")
-                USER_WAN = USER_DT.Rows(0).Item("WAN_ENVIRONMENT") 'ClassDatabase.Execute_Scalar("SELECT WAN_ENVIRONMENT FROM TBDD_USER WHERE GUID = " & USER_GUID, False)
+                USER_WAN = USER_DT.Rows(0).Item("WAN_ENVIRONMENT")
                USER_LANGUAGE = USER_DT.Rows(0).Item("LANGUAGE")
                clsCURRENT.USER_LANGUAGE = USER_LANGUAGE
                USER_DATE_FORMAT = USER_DT.Rows(0).Item("DATE_FORMAT")
@ -276,6 +280,19 @@ WHERE (LOWER(USERNAME) = LOWER('{0}')) AND T2.SHORT_NAME = 'ADDI'", USER_USERNAM

                    End If
                    Try
+                        If SHARE_DRIVE_ACTIVE = True Then
+
+                        End If
+                        LOGGER.Info($"SHAREDRIVE IS ACTIVE = {SHARE_DRIVE_ACTIVE.ToString}")
+                        Try
+                            WMMOD = New DigitalData.Modules.Windream.Windream(LOGCONFIG, False, WMDriveLetter, WMPATH_PREFIX, True, "", "", "", "")
+                            If IsNothing(WMMOD) Then
+                                MsgBox("No windream connectable", MsgBoxStyle.Exclamation)
+                            End If
+                        Catch ex As Exception
+                            LOGGER.Warn("Could not create the login for DigitalData.Modules.Windream.Windream!")
+                        End Try
+
                        If clsWindream.Create_Session = False Then
                            LOGGER.Warn("Could not create the login for windream - No session created!")
                            ClassHelper.MSGBOX_Handler("ERROR", "windream-login Error:", "Could not create the login/session!", "ADDI will start anyway but be aware that searching and importing won't be possible!")
--- a/app/DD-Record-Organizer/Classes/ClassWDRights.vb
+++ b/app/DD-Record-Organizer/Classes/ClassWDRights.vb
@ -67,9 +67,9 @@ Public Class ClassWDRights
            Return False
        End Try
    End Function
-    Public Shared Function Doc_Renew_Rights(doc_id As Integer, docpath As String, deleterights As Boolean) As Boolean
+    Public Shared Function Doc_Renew_Rights(doc_id As Integer, reldocpath As String, deleterights As Boolean) As Boolean
        Try
-            LOGGER.Debug(String.Format("Working on rights for file: {0}", docpath))
+            LOGGER.Debug(String.Format("Working on rights for file: {0}", reldocpath))
            Dim DT_USER_RIGHT As DataTable
            Dim DT_GROUP_RIGHT As DataTable
            Dim oSession
@ -77,6 +77,8 @@ Public Class ClassWDRights
            Dim UserGroupRelation
            Dim UserOrGroup
            Dim oUSer
+            reldocpath = ClassHelper.GetRelPath(reldocpath)
+
            Try
                'Dedizierte Session herstellen
                oSession = GetWMSessionAsUser(AD_DOMAIN, AD_SERVER, AD_USER, AD_USER_PW)
@ -102,10 +104,10 @@ Public Class ClassWDRights
                LOGGER.Debug(String.Format("Amount of Grouprights: {0}", DT_GROUP_RIGHT.Rows.Count))
                Try
                    'Object definieren
-                    oWMObject = oSession.GetWMObjectByPath(0, docpath.Substring(2))
+                    oWMObject = oSession.GetWMObjectByPath(1, reldocpath)
                    LOGGER.Debug("Object created.")
                Catch ex As Exception
-                    Dim msg = "Error GetWMObjectByPath: (FDSR) " & docpath.Substring(2) & vbNewLine & Err.Description
+                    Dim msg = "Error GetWMObjectByPath: (FDSR) " & reldocpath & vbNewLine & Err.Description
                    LOGGER.Warn(msg)
                    Return False
                End Try
@ -232,7 +234,7 @@ Public Class ClassWDRights
                            Case WMAccessRightReadWrite
                                _right = "READ WRITE"
                        End Select
-                        MSG_RESULT &= String.Format("Error while working on RightChange:" & vbNewLine & "Fileright: {0}" & vbNewLine & "User: {1} " & vbNewLine & "File: {2}", _right, StringUserRight, docpath) & vbNewLine
+                        MSG_RESULT &= String.Format("Error while working on RightChange:" & vbNewLine & "Fileright: {0}" & vbNewLine & "User: {1} " & vbNewLine & "File: {2}", _right, StringUserRight, reldocpath) & vbNewLine
                        LOGGER.Warn(ex.Message)
                    End Try
                Next
@ -283,7 +285,7 @@ Public Class ClassWDRights
                            Case WMAccessRightReadWrite
                                _right = "READ WRITE"
                        End Select
-                        MSG_RESULT &= String.Format("Error while working on RightChange2:" & vbNewLine & "Fileright: {0}" & vbNewLine & "Group: {1} " & vbNewLine & "File: {2}", _right, StringGroupRight, docpath) & vbNewLine
+                        MSG_RESULT &= String.Format("Error while working on RightChange2:" & vbNewLine & "Fileright: {0}" & vbNewLine & "Group: {1} " & vbNewLine & "File: {2}", _right, StringGroupRight, reldocpath) & vbNewLine
                        clsLogger.Add(ex.Message)
                    End Try
                Next
--- a/app/DD-Record-Organizer/DD-Record-Organizer.vbproj
+++ b/app/DD-Record-Organizer/DD-Record-Organizer.vbproj
@ -172,6 +172,9 @@
    <Reference Include="DigitalData.Modules.Logging">
      <HintPath>..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
    </Reference>
+    <Reference Include="DigitalData.Modules.Windream">
+      <HintPath>..\..\..\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll</HintPath>
+    </Reference>
    <Reference Include="DLLLicenseManager">
      <HintPath>..\..\lib\DLLLicenseManager.dll</HintPath>
    </Reference>
--- a/app/DD-Record-Organizer/ModuleHelperMethods.vb
+++ b/app/DD-Record-Organizer/ModuleHelperMethods.vb
@ -384,7 +384,6 @@ Module ModuleHelperMethods
        frm.Show()
    End Sub
    Public Sub OpenRightsmanager()
-        'Dim path As String = ClassDatabase.Execute_Scalar("SELECT PATH_ADDONS FROm TBPMO_KONFIGURATION WHERE GUID = 1")
        Try
            Dim ProductionPath As String = System.IO.Path.Combine(MY_ADDON_PATH, "RightManager", "RecordOrganizer_RightManager.exe")
            Dim DevelPath As String = System.IO.Path.Combine(MY_ADDON_PATH, "RecordOrganizer_RightManager\bin\Debug", "RecordOrganizer_RightManager.exe")
--- a/app/DD-Record-Organizer/ModuleMySettings.vb
+++ b/app/DD-Record-Organizer/ModuleMySettings.vb
@ -3,6 +3,7 @@ Imports System.Xml
 Imports DD_LIB_Standards
 Imports DevExpress.LookAndFeel
 Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Windream

 Module ModuleMySettings
    Public PATH_FileExclusions As String = Path.Combine(Application.UserAppDataPath(), "FileExclusions.xml")
@ -19,6 +20,10 @@ Module ModuleMySettings
    Public MY_WIKISTRING As String
    Public WD_GROUP1 As String
    Public WD_UNICODE As Boolean = False
+    Public WMDriveLetter As String
+    Public WMPATH_PREFIX As String
+    Public WMMOD As Windream
+    Public SHARE_DRIVE_ACTIVE As Boolean = False
    Public GridDocResult_BestFitColumns As Boolean = True
    Public SQL_FULLTEXT As String

--- a/app/DD-Record-Organizer/frmConstructor_Main.resx
+++ b/app/DD-Record-Organizer/frmConstructor_Main.resx
@ -146,7 +146,7 @@
  <data name="FormDesignerToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        xAAADsQBlSsOGwAAAMpJREFUSEu9lUEOwyAMBHlS38Dj+GafkPbC1WWRRY1qEhtCV1opCngmJIcEIgo5
+        wwAADsMBx2+oZAAAAMpJREFUSEu9lUEOwyAMBHlS38Dj+GafkPbC1WWRRY1qEhtCV1opCngmJIcEIgo5
        Z9IaHNHm0SaIMXati44MGVLwOt61bdGRIeOvAlmroOx7cHXGykcuewA+uDoDgpmU4QpPKRFarp+4x8vf
        zAgkHK+CBTjFusAFRzwCNxyxCqbgiEUwDUeuBEtw5EywDEdGglvgiCa4DY5cCZbgCARlGBCtAJvgYqZr
        E+BVyPIGnMT05CNGJ9j+P9gukJ0V/DDOPjLPmqLNo1WwrxQ+GCNWVrb1cMEAAAAASUVORK5CYII=
@ -219,7 +219,7 @@
  <data name="tsmiNodeRename.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAFBJREFUOE9joBh8+/btPz4MVYYbgBQ5OTmBMUwTMh+qDDegigHYNBKL4S6A0chs
+        wgAADsIBFShKgAAAAFBJREFUOE9joBh8+/btPz4MVYYbgBQ5OTmBMUwTMh+qDDegigHYNBKL4S6A0chs
        YmjauYAQhqkbTi5A1ojMJ0QTNIAQRvECNgxNb4MWMDAAAPsOTf9dAGOQAAAAAElFTkSuQmCC
 </value>
  </data>
@ -247,7 +247,7 @@
  <data name="OberhalbToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        xAAADsQBlSsOGwAAAG1JREFUOE+1kdEJgDAMRDtbhssa3TK/0ZSIxV5Co3jwUI7LA7Gp6idgWQGWFWBZ
+        wwAADsMBx2+oZAAAAG1JREFUOE+1kdEJgDAMRDtbhssa3TK/0ZSIxV5Co3jwUI7LA7Gp6idgWQGWFWBZ
        4X7xiEg/UUD3yUgosNjYjphZiWg8n5JF4IOFSAIFNsyYJf8IENufMMdG2bElFFzHgPw3vgWWFWBZAZb7
        aDsAn1PBeUq8SBsAAAAASUVORK5CYII=
 </value>
@ -261,7 +261,7 @@
  <data name="UnterhalbToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        xAAADsQBlSsOGwAAAJVJREFUOE+lkdEJxDAMQztbhssat2V+fZWxD1vKR8IZBLX8JEr7mNlf2po3UiNm
+        wwAADsMBx2+oZAAAAJVJREFUOE+lkdEJxDAMQztbhssat2V+fZWxD1vKR8IZBLX8JEr7mNlf2po3UiNm
        rWVVYSsvRgxCYwzXVcELfwDuCnBjvi0QYIBckB7zbYECdlGBi/m2QIDmnFKQHvNtgTKIQBbk83FBDdeS
        0wL/WPwG8HBjvi1uxO/KkhrGTXgxYrKkhjHCi1EmSn5hjPBs3GprnsueLz0XwXnZAqB7AAAAAElFTkSu
        QmCC
@ -276,7 +276,7 @@
  <data name="tsmiNodeNew.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn
+        wwAADsMBx2+oZAAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn
        yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF
        TkSuQmCC
 </value>
@ -290,7 +290,7 @@
  <data name="tsmiNodeDelete.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
-        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsTAAALEwEAmpwYAAACLUlE
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsSAAALEgHS3X78AAACLUlE
        QVQ4T52TvY/ScBjHuVIRKHA9JAgnL+VoC7TX0kLLS6EvFBTa0uj5J7gYF+PsfpOTMrg4ORgHY+LCYJwc
        TYyJiYuDLu7GxHgxd/Hnr5fA8TZcrsmnzfN9nufTNPnVBwDw2ZYljGzr3ciyTNu2EC87L75eb+DvD67f
        hU9g9vt/HNs5cMaOf9Owohro7YNbe8PhjfuzzBOgkDuabk6bbRXoxuBkNLIeus6yhKyIwY5umo5tHxmG
@ -592,7 +592,7 @@
    <value>0, 0</value>
  </data>
  <data name="pnlDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>699, 231</value>
+    <value>699, 221</value>
  </data>
  <data name="pnlDetails.TabIndex" type="System.Int32, mscorlib">
    <value>4</value>
@ -634,7 +634,7 @@
    <value>0, 0</value>
  </data>
  <data name="pnlDocFill.Size" type="System.Drawing.Size, System.Drawing">
-    <value>486, 206</value>
+    <value>486, 196</value>
  </data>
  <data name="pnlDocFill.TabIndex" type="System.Int32, mscorlib">
    <value>5</value>
@ -681,7 +681,7 @@
    <value>Ansicht eingeschränkt - Klick Bearbeiten für Entsperren</value>
  </data>
  <data name="statStripDoc.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 206</value>
+    <value>0, 196</value>
  </data>
  <data name="statStripDoc.Size" type="System.Drawing.Size, System.Drawing">
    <value>486, 25</value>
@ -720,7 +720,7 @@
    <value>1</value>
  </data>
  <data name="SplitContainerDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1201, 235</value>
+    <value>1201, 225</value>
  </data>
  <data name="SplitContainerDetails.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@ -896,7 +896,7 @@
    <value>1</value>
  </data>
  <data name="TabDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1201, 262</value>
+    <value>1201, 252</value>
  </data>
  <data name="TabDetails.Text" xml:space="preserve">
    <value>Detailansicht</value>
@ -926,7 +926,7 @@
    <value>0, 27</value>
  </data>
  <data name="GridControlPos.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1201, 223</value>
+    <value>1201, 237</value>
  </data>
  <data name="GridControlPos.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@ -952,7 +952,7 @@
  <data name="BindingNavigatorAddNewItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn
+        wwAADsMBx2+oZAAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn
        yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF
        TkSuQmCC
 </value>
@ -978,7 +978,7 @@
  <data name="BindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        wgAADsIBFShKgAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
        wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
        v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
        UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
@ -998,7 +998,7 @@
  <data name="BindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        wgAADsIBFShKgAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
        5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
        Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
        08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
@ -1040,7 +1040,7 @@
  <data name="BindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        wgAADsIBFShKgAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
        n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
        N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
        oAc0QjgAAAAASUVORK5CYII=
@ -1058,7 +1058,7 @@
  <data name="BindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        wgAADsIBFShKgAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
        h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
        twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
        kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
@ -1093,7 +1093,7 @@
  <data name="BindingNavigatorDeleteItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        xAAADsQBlSsOGwAAAUlJREFUOE+lU6GOg1AQ5BP6Cf2E+4QLnqQWV4EHjUJhGzxJJbICDxpFQvCHg4DA
+        wwAADsMBx2+oZAAAAUlJREFUOE+lU6GOg1AQ5BP6Cf2E+4QLnqQWV4EHjUJhGzxJJbICDxpFQvCHg4DA
        Yd/tLPvK4wJ34iaZ9GVndxh4WwtYluVCfBIVcSYGLPwA1SPp0bxpIaiqSjmOw2zbdhMJdL4S6yzLlG3b
        qigK6JHI3FCmacoi6HmeGscRSZAswDmOY9bQR7WXjK5AExJoAzBJEjTOXdexIWowoVpNvMjoChQg5Hm+
        M8HT8Eo4G6muMrbHmQkIk2ma8PRPaT8G3Ikc1TSAKdWf0nYMGT5M4Lrun/E/iDM+nDlofgPf9/kDysgG
@ -1183,7 +1183,7 @@
 </value>
  </data>
  <data name="TabPos.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1201, 250</value>
+    <value>1201, 264</value>
  </data>
  <data name="TabPos.Text" xml:space="preserve">
    <value>Positionen</value>
@ -1212,7 +1212,7 @@
  <data name="cmDoc1FileProperties.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAHlJREFUOE+VkUEKwDAIBH1b/v+XtpdcWxbcoBKrEaYi6iSksos559tFV3ygMcYo
+        wgAADsIBFShKgAAAAHlJREFUOE+VkUEKwDAIBH1b/v+XtpdcWxbcoBKrEaYi6iSksos559tFV3ygMcYo
        KQX39aS0BTzNciTIaAuQCesjQcYS4NPFSp2ARZV/b2Cbkd2ME6CwzUj7BhTFzBnUliXgYAaHdxy9gf5l
        H2jwhCrrig80uuiKCZEPDBGoa/9+56EAAAAASUVORK5CYII=
 </value>
@ -1688,7 +1688,7 @@
    <value>2</value>
  </data>
  <data name="TabFollowUp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1201, 250</value>
+    <value>1201, 264</value>
  </data>
  <data name="TabFollowUp.Text" xml:space="preserve">
    <value>Wiedervorlage</value>
@ -1790,7 +1790,7 @@
    <value>5</value>
  </data>
  <data name="GridControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1201, 223</value>
+    <value>1201, 237</value>
  </data>
  <data name="GridControl1.TabIndex" type="System.Int32, mscorlib">
    <value>90</value>
@ -1862,7 +1862,7 @@
    <value>1</value>
  </data>
  <data name="TabPageVariant.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1201, 250</value>
+    <value>1201, 264</value>
  </data>
  <data name="TabPageVariant.Text" xml:space="preserve">
    <value>Vorgängervarianten</value>
@ -1889,7 +1889,7 @@
    <value>0, 0</value>
  </data>
  <data name="TreeListDevexpress.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1201, 250</value>
+    <value>1201, 264</value>
  </data>
  <metadata name="ImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>301, 17</value>
@ -1918,7 +1918,7 @@
    <value>0</value>
  </data>
  <data name="XtraTabPage1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1201, 250</value>
+    <value>1201, 264</value>
  </data>
  <data name="XtraTabPage1.Text" xml:space="preserve">
    <value>NodeNavigation(beta)</value>
@ -2109,7 +2109,7 @@
  <data name="docCM_Showlinks.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAINJREFUOE9jQAbfvn37TwyGKscEIEknJye8mH4GfHj/EQWTbAAuPIRcgAsPRwO+
+        wgAADsIBFShKgAAAAINJREFUOE9jQAbfvn37TwyGKscEIEknJye8mH4GfHj/EQWTbAAuPIRcgAsPRwO+
        f/+eABLEhX19ffEbABR4n5KSAlcA0rB582YwDRIHacAbjQ8ePABLgDSdPHny/5w5c8Ds5cuXg8VBYjDN
        WA2AuQDZZphimAvwGkAoDLBhqFYgYGAAAFMd0furxZnJAAAAAElFTkSuQmCC
 </value>
@ -2162,18 +2162,18 @@
  <data name="DateiVersionierenToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAFFJREFUKFOdj0EKACAIBH2b/3+P16JwRTQzWphD0dhKIjI81GU9YuZNlE/YD17A
+        wgAADsIBFShKgAAAAFFJREFUKFOdj0EKACAIBH2b/3+P16JwRTQzWphD0dhKIjI81GU9YuZNlE/YD17A
        gEgp3EiCNq0DAeh1nS/BL9VxXBoDIibg8EKqpE3reLsXiCYgi0Ps3hQ2TwAAAABJRU5ErkJggg==
 </value>
  </data>
  <data name="DateiVersionierenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>188, 26</value>
+    <value>184, 22</value>
  </data>
  <data name="DateiVersionierenToolStripMenuItem.Text" xml:space="preserve">
    <value>Datei versionieren</value>
  </data>
  <data name="DokumentartÄndernToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>188, 26</value>
+    <value>184, 22</value>
  </data>
  <data name="DokumentartÄndernToolStripMenuItem.Text" xml:space="preserve">
    <value>Dokumentart ändern</value>
@ -2242,7 +2242,7 @@
  <data name="docCM_showGridSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
-        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsTAAALEwEAmpwYAAAC+klE
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsSAAALEgHS3X78AAAC+klE
        QVQ4T42S+0+TZxiG+V/MYkycidHpNP7gIaTooAbQDwsC4qilHMqhYC1yKNKPOhmjtANKELSVTSbBMVo/
        goeI4AFD0GWZAw8YNZxMLZiJqQf0sq/LPlyyLPvhfvIm73tfb57nuaMAVaX1yvqIZGtdYKjcpczbm/uf
        H6rzX805csZmtHWu/fTt31IPZQ19eRVu5YFvcIgLD0ZRJvvwTVRRoBiQ5BNklvrG9WWnDJ+ahT6Ww04l
@ -2289,7 +2289,7 @@
    <value>Ansicht zurücksetzen</value>
  </data>
  <data name="ContextMenuStripResultFiles.Size" type="System.Drawing.Size, System.Drawing">
-    <value>256, 542</value>
+    <value>256, 520</value>
  </data>
  <data name="&gt;&gt;ContextMenuStripResultFiles.Name" xml:space="preserve">
    <value>ContextMenuStripResultFiles</value>
--- a/app/DD-Record-Organizer/frmConstructor_Main.vb
+++ b/app/DD-Record-Organizer/frmConstructor_Main.vb
@ -371,7 +371,7 @@ Public Class frmConstructor_Main
        Try
            SQL = String.Format("select T.* from VWPMO_STRUCTURE_NODES T INNER JOIN VWPMO_CONSTRUCTOR_FORMS T1 ON T.ENTITY_ID = T1.FORM_ID WHERE T1.CONSTRUCT_ID = {0}", CONSTRUCTORID)
            Dim DT As DataTable = ClassDatabase.Return_Datatable(SQL, True)
-            If DT.Rows.Count > 1 Then
+            If DT.Rows.Count >= 1 Then
                LOGGER.Info($"There are  [{DT.Rows.Count}] NODES.....")
                TreeView_perControl = True
                DT_TREEVIEW_NODES_ALL = DT
@ -4668,11 +4668,7 @@ Public Class frmConstructor_Main
                            CURRENT_ENTITY_ID = ENTITY_ID
                            CURRENT_FORMVIEW_ID = FORMVIEW_ID
                            frmWM_IndexFile.ShowDialog()
-                            'sql = String.Format("SELECT * FROM TBPMO_FILES_USER WHERE (UPPER(USER_WORK) = UPPER('{0}')) AND WORKED = 0", USER_USERNAME)
-                            'CURRENT_TBPMO_FILES_USER = ClassDatabase.Return_Datatable(sql, True)
-                            'If CURRENT_TBPMO_FILES_USER.Rows.Count > 0 Then
-                            '    Check_Dropped_Files()
-                            'End If
+
                        Else

                        End If
@ -5451,6 +5447,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                Dim selectedfile(0) As String

                selectedfile(0) = ClassWindreamDocGrid.SELECTED_DOC_PATH
+                selectedfile(0) = ClassHelper.FORMAT_WM_PATH(ClassWindreamDocGrid.SELECTED_DOC_PATH)

                Dim dataobj As New DataObject

@ -5552,11 +5549,12 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
        End If
        For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
            If row.Item("DOC_PATH") <> "" Then
+                Dim oFileFullPath = ClassHelper.FORMAT_WM_PATH(row.Item("DOC_PATH"))
                Cursor = Cursors.WaitCursor
                Dim sei As New SHELLEXECUTEINFO
                sei.cbSize = Marshal.SizeOf(sei)
                sei.lpVerb = "properties"
-                sei.lpFile = row.Item("DOC_PATH")
+                sei.lpFile = oFileFullPath
                sei.nShow = SW_SHOW
                sei.fMask = SEE_MASK_INVOKEIDLIST
                If Not ShellExecuteEx(sei) Then
@ -6638,9 +6636,10 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                    ' Define file names.
                    NewName = CMDoc_TextBoxRenameFile.Text
                    OnlyFilename = NewName
-                    Dim name1 = Path.Combine(Path.GetDirectoryName(ClassWindreamDocGrid.SELECTED_DOC_PATH), NewName)
-                    NewName = NewName & Path.GetExtension(ClassWindreamDocGrid.SELECTED_DOC_PATH)
-                    OnlyFilename &= Path.GetExtension(ClassWindreamDocGrid.SELECTED_DOC_PATH)
+                    Dim oFullFilename = ClassHelper.FORMAT_WM_PATH(ClassWindreamDocGrid.SELECTED_DOC_PATH)
+                    Dim name1 = Path.Combine(Path.GetDirectoryName(oFullFilename), NewName)
+                    NewName = NewName & Path.GetExtension(oFullFilename)
+                    OnlyFilename &= Path.GetExtension(oFullFilename)
                    ' Rename file.
                    LOGGER.Info($"Renaming Old: [{OldName}]")
                    LOGGER.Info($"Renaming New: [{NewName}]")
--- a/app/DD-Record-Organizer/frmDocLink_Record_Entities.vb
+++ b/app/DD-Record-Organizer/frmDocLink_Record_Entities.vb
@ -47,10 +47,6 @@ Public Class frmDocLink_Record_Entities
        End Try
    End Function

-    Private Sub frmWD_Link_to_Record_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
-        ClassDOC_SEARCH.REFRESH_DOC_TABLE_RESULTS()
-    End Sub
-
    Private Sub frmWD_Link_to_Record_Load(sender As Object, e As EventArgs) Handles MyBase.Load
        Dim DT_ENTITIES As DataTable = GetENTITIES()
        Dim selected As Integer = 0
--- a/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb
+++ b/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb
@ -42,8 +42,6 @@ Partial Class frmGlobalSearch
        Me.GridViewFiles = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.ToolStripDokumente = New System.Windows.Forms.ToolStrip()
        Me.tslblDocView = New System.Windows.Forms.ToolStripLabel()
-        Me.ToolStripMain = New System.Windows.Forms.ToolStrip()
-        Me.tsbtnRefresh = New System.Windows.Forms.ToolStripButton()
        Me.Label1 = New System.Windows.Forms.Label()
        Me.Label3 = New System.Windows.Forms.Label()
        Me.rbSearchRecord = New System.Windows.Forms.RadioButton()
@ -57,11 +55,11 @@ Partial Class frmGlobalSearch
        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
        Me.bsiInfo = New DevExpress.XtraBars.BarStaticItem()
+        Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
        Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
        Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
-        Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
        CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.SplitContainerMain.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainerMain.Panel1.SuspendLayout()
@ -76,7 +74,6 @@ Partial Class frmGlobalSearch
        Me.ContextMenuStrip1.SuspendLayout()
        CType(Me.GridViewFiles, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.ToolStripDokumente.SuspendLayout()
-        Me.ToolStripMain.SuspendLayout()
        Me.Panel1.SuspendLayout()
        Me.GroupBox1.SuspendLayout()
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
@ -232,18 +229,6 @@ Partial Class frmGlobalSearch
        resources.ApplyResources(Me.tslblDocView, "tslblDocView")
        Me.tslblDocView.Name = "tslblDocView"
        '
-        'ToolStripMain
-        '
-        resources.ApplyResources(Me.ToolStripMain, "ToolStripMain")
-        Me.ToolStripMain.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnRefresh})
-        Me.ToolStripMain.Name = "ToolStripMain"
-        '
-        'tsbtnRefresh
-        '
-        Me.tsbtnRefresh.Image = Global.DD_Record_Organizer.My.Resources.Resources.refresh_16xLG
-        resources.ApplyResources(Me.tsbtnRefresh, "tsbtnRefresh")
-        Me.tsbtnRefresh.Name = "tsbtnRefresh"
-        '
        'Label1
        '
        resources.ApplyResources(Me.Label1, "Label1")
@ -280,7 +265,6 @@ Partial Class frmGlobalSearch
        Me.Panel1.Controls.Add(Me.Label2)
        Me.Panel1.Controls.Add(Me.GroupBox1)
        Me.Panel1.Controls.Add(Me.Label1)
-        Me.Panel1.Controls.Add(Me.ToolStripMain)
        Me.Panel1.Controls.Add(Me.Label3)
        resources.ApplyResources(Me.Panel1, "Panel1")
        Me.Panel1.Name = "Panel1"
@ -336,6 +320,13 @@ Partial Class frmGlobalSearch
        Me.bsiInfo.ItemAppearance.Normal.Options.UseFont = True
        Me.bsiInfo.Name = "bsiInfo"
        '
+        'BarButtonItem3
+        '
+        resources.ApplyResources(Me.BarButtonItem3, "BarButtonItem3")
+        Me.BarButtonItem3.Id = 4
+        Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem3.Name = "BarButtonItem3"
+        '
        'RibbonPage1
        '
        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1})
@ -362,13 +353,6 @@ Partial Class frmGlobalSearch
        Me.RibbonPage2.Name = "RibbonPage2"
        resources.ApplyResources(Me.RibbonPage2, "RibbonPage2")
        '
-        'BarButtonItem3
-        '
-        resources.ApplyResources(Me.BarButtonItem3, "BarButtonItem3")
-        Me.BarButtonItem3.Id = 4
-        Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.BarButtonItem3.Name = "BarButtonItem3"
-        '
        'frmGlobalSearch
        '
        resources.ApplyResources(Me, "$this")
@ -400,8 +384,6 @@ Partial Class frmGlobalSearch
        CType(Me.GridViewFiles, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ToolStripDokumente.ResumeLayout(False)
        Me.ToolStripDokumente.PerformLayout()
-        Me.ToolStripMain.ResumeLayout(False)
-        Me.ToolStripMain.PerformLayout()
        Me.Panel1.ResumeLayout(False)
        Me.Panel1.PerformLayout()
        Me.GroupBox1.ResumeLayout(False)
@ -411,7 +393,6 @@ Partial Class frmGlobalSearch
        Me.PerformLayout()

    End Sub
-    Friend WithEvents ToolStripMain As System.Windows.Forms.ToolStrip
    Friend WithEvents Label1 As System.Windows.Forms.Label
    Friend WithEvents Label3 As System.Windows.Forms.Label
    Friend WithEvents rbSearchRecord As System.Windows.Forms.RadioButton
@ -419,7 +400,6 @@ Partial Class frmGlobalSearch
    Friend WithEvents rbSearchCombined As System.Windows.Forms.RadioButton
    Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox
    Friend WithEvents SplitContainerMain As DevExpress.XtraEditors.SplitContainerControl
-    Friend WithEvents tsbtnRefresh As System.Windows.Forms.ToolStripButton
    Friend WithEvents txtSearch As System.Windows.Forms.TextBox
    Friend WithEvents Label2 As System.Windows.Forms.Label
    Friend WithEvents GridControlRecords As DevExpress.XtraGrid.GridControl
--- a/app/DD-Record-Organizer/frmGlobalSearch.resx
+++ b/app/DD-Record-Organizer/frmGlobalSearch.resx
@ -123,7 +123,7 @@
  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="SplitContainerMain.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 275</value>
+    <value>0, 252</value>
  </data>
  <metadata name="cmsRecords.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>454, 17</value>
@ -159,7 +159,7 @@
    <value>ADDI-Datensätze</value>
  </data>
  <data name="GridControlRecords.Size" type="System.Drawing.Size, System.Drawing">
-    <value>751, 131</value>
+    <value>751, 155</value>
  </data>
  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="GridControlRecords.TabIndex" type="System.Int32, mscorlib">
@ -271,7 +271,7 @@
    <value>windream-Dokumente</value>
  </data>
  <data name="GridControlFiles.Size" type="System.Drawing.Size, System.Drawing">
-    <value>408, 131</value>
+    <value>406, 155</value>
  </data>
  <data name="GridControlFiles.TabIndex" type="System.Int32, mscorlib">
    <value>4</value>
@ -304,7 +304,7 @@
    <value>0, 0</value>
  </data>
  <data name="ToolStripDokumente.Size" type="System.Drawing.Size, System.Drawing">
-    <value>408, 25</value>
+    <value>406, 25</value>
  </data>
  <data name="ToolStripDokumente.TabIndex" type="System.Int32, mscorlib">
    <value>3</value>
@ -340,7 +340,7 @@
    <value>1</value>
  </data>
  <data name="SplitContainerMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1169, 156</value>
+    <value>1169, 180</value>
  </data>
  <data name="SplitContainerMain.TabIndex" type="System.Int32, mscorlib">
    <value>8</value>
@ -360,45 +360,6 @@
  <data name="&gt;&gt;SplitContainerMain.ZOrder" xml:space="preserve">
    <value>2</value>
  </data>
-  <metadata name="ToolStripMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <data name="ToolStripMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Bottom</value>
-  </data>
-  <data name="tsbtnRefresh.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
-    <value>Magenta</value>
-  </data>
-  <data name="tsbtnRefresh.Size" type="System.Drawing.Size, System.Drawing">
-    <value>92, 22</value>
-  </data>
-  <data name="tsbtnRefresh.Text" xml:space="preserve">
-    <value>Starte Suche</value>
-  </data>
-  <data name="ToolStripMain.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 92</value>
-  </data>
-  <data name="ToolStripMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1169, 25</value>
-  </data>
-  <data name="ToolStripMain.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="ToolStripMain.Text" xml:space="preserve">
-    <value>ToolStrip1</value>
-  </data>
-  <data name="&gt;&gt;ToolStripMain.Name" xml:space="preserve">
-    <value>ToolStripMain</value>
-  </data>
-  <data name="&gt;&gt;ToolStripMain.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ToolStripMain.Parent" xml:space="preserve">
-    <value>Panel1</value>
-  </data>
-  <data name="&gt;&gt;ToolStripMain.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
  <data name="Label1.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
@ -454,7 +415,7 @@
    <value>Panel1</value>
  </data>
  <data name="&gt;&gt;Label3.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>4</value>
  </data>
  <data name="rbSearchRecord.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
@ -589,7 +550,7 @@
    <value>538, 31</value>
  </data>
  <data name="GroupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>765, 78</value>
+    <value>619, 74</value>
  </data>
  <data name="GroupBox1.TabIndex" type="System.Int32, mscorlib">
    <value>7</value>
@ -613,10 +574,10 @@
    <value>Top</value>
  </data>
  <data name="Panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 158</value>
+    <value>0, 147</value>
  </data>
  <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1169, 117</value>
+    <value>1169, 105</value>
  </data>
  <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
    <value>7</value>
@ -726,13 +687,13 @@
    <value>Global Search</value>
  </data>
  <data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1169, 158</value>
+    <value>1169, 147</value>
  </data>
  <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 431</value>
+    <value>0, 432</value>
  </data>
  <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1169, 24</value>
+    <value>1169, 23</value>
  </data>
  <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
    <value>RibbonStatusBar1</value>
@ -891,12 +852,6 @@
  <data name="&gt;&gt;tslblDocView.Type" xml:space="preserve">
    <value>System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="&gt;&gt;tsbtnRefresh.Name" xml:space="preserve">
-    <value>tsbtnRefresh</value>
-  </data>
-  <data name="&gt;&gt;tsbtnRefresh.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
  <data name="&gt;&gt;BarButtonItem1.Name" xml:space="preserve">
    <value>BarButtonItem1</value>
  </data>
@ -915,6 +870,12 @@
  <data name="&gt;&gt;bsiInfo.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="&gt;&gt;BarButtonItem3.Name" xml:space="preserve">
+    <value>BarButtonItem3</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem3.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve">
    <value>RibbonPage1</value>
  </data>
@ -933,12 +894,6 @@
  <data name="&gt;&gt;RibbonPage2.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="&gt;&gt;BarButtonItem3.Name" xml:space="preserve">
-    <value>BarButtonItem3</value>
-  </data>
-  <data name="&gt;&gt;BarButtonItem3.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmGlobalSearch</value>
  </data>
--- a/app/DD-Record-Organizer/frmGlobalSearch.vb
+++ b/app/DD-Record-Organizer/frmGlobalSearch.vb
@ -4,6 +4,9 @@ Imports System.IO
 Imports DevExpress.XtraGrid.Views.Grid
 Imports System.Runtime.InteropServices
 Imports DevExpress.XtraPrinting
+Imports DevExpress.Data.Filtering.Helpers.SubExprHelper.CriteriaTokens
+Imports DevExpress.XtraSplashScreen
+Imports System.Threading

 Public Class frmGlobalSearch
    Inherits DevExpress.XtraBars.Ribbon.RibbonForm
@ -34,47 +37,59 @@ Public Class frmGlobalSearch
    Private _Helper As ClassHelper
    Dim sel_Records, sel_FT As String
    Private SelectedGrid As DevExpress.XtraGrid.GridControl
-    Private Sub tsbtnRefresh_Click(sender As Object, e As EventArgs) Handles tsbtnRefresh.Click
-        Refresh_Search()
-    End Sub
+
    Sub Refresh_Search()
        If txtSearch.Text = "" Then
            Exit Sub
        End If
-        sel_Records = ""
-        sel_FT = ""
+        Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
+        Try
+            sel_Records = ""
+            sel_FT = ""

-        If rbSearchCombined.Checked = True Then
-            PREPARE_RECORD_SQL()
-            PREPARE_FT_SQL()
-        End If
-        If rbSearchRecord.Checked = True Then
-            PREPARE_RECORD_SQL()
-        End If
-        If rbSearchFulltext.Checked Then
-            PREPARE_FT_SQL()
-        End If
-        Dim DT_Files As DataTable
-        Dim DT_RECORD_RESULT As DataTable
-        If rbSearchCombined.Checked Or rbSearchRecord.Checked Then
-            DT_RECORD_RESULT = Refresh_Records()
-        Else
-            SplitContainerMain.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel1
-            SplitContainerMain.Collapsed = True
-            tslblRecordsResult.Text = String.Format("No records found")
-            GridControlRecords.DataSource = Nothing
-        End If
-        If rbSearchCombined.Checked Or rbSearchFulltext.Checked Then
-            DT_Files = Refresh_Files()
+            If rbSearchCombined.Checked = True Then
+                PREPARE_RECORD_SQL()
+                PREPARE_FT_SQL()
+            End If
+            If rbSearchRecord.Checked = True Then
+                PREPARE_RECORD_SQL()
+            End If
            If rbSearchFulltext.Checked Then
+                PREPARE_FT_SQL()
+            End If
+            Dim DT_Files As DataTable
+            Dim DT_RECORD_RESULT As DataTable
+            If rbSearchCombined.Checked Or rbSearchRecord.Checked Then
+                DT_RECORD_RESULT = Refresh_Records()
+            Else
                SplitContainerMain.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel1
                SplitContainerMain.Collapsed = True
+                tslblRecordsResult.Text = String.Format("No records found")
+                GridControlRecords.DataSource = Nothing
            End If
-        Else
-            SplitContainerMain.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
-            SplitContainerMain.Collapsed = True
-            GridControlFiles.DataSource = Nothing
-        End If
+            If rbSearchCombined.Checked Or rbSearchFulltext.Checked Then
+                DT_Files = Refresh_Files()
+                If rbSearchFulltext.Checked Then
+                    SplitContainerMain.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel1
+                    SplitContainerMain.Collapsed = True
+                End If
+            Else
+                SplitContainerMain.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
+                SplitContainerMain.Collapsed = True
+                GridControlFiles.DataSource = Nothing
+            End If
+
+
+
+        Catch ex As Exception
+
+        Finally
+            SplashScreenManager.CloseOverlayForm(oHandle)
+        End Try
+
+
+
+
    End Sub
    Sub PREPARE_FT_SQL()
        Dim oFTSearchtext = txtSearch.Text
--- a/app/DD-Record-Organizer/frmMain.Designer.vb
+++ b/app/DD-Record-Organizer/frmMain.Designer.vb
@ -68,7 +68,6 @@ Partial Class frmMain
        Me.BarButtonItem22 = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonItem9 = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem23 = New DevExpress.XtraBars.BarButtonItem()
        Me.btnGlobalSearch = New DevExpress.XtraBars.BarButtonItem()
        Me.LabelUser = New DevExpress.XtraBars.BarButtonItem()
        Me.bbtnItemViewsUser = New DevExpress.XtraBars.BarButtonItem()
@ -198,7 +197,7 @@ Partial Class frmMain
        Me.ribbonMain.ApplicationButtonDropDownControl = Me.MainMenu
        Me.ribbonMain.BackColor = System.Drawing.Color.DarkGray
        Me.ribbonMain.ExpandCollapseItem.Id = 0
-        Me.ribbonMain.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonMain.ExpandCollapseItem, Me.ribbonMain.SearchEditItem, Me.LabelMachine, Me.LabelLoggedIn, Me.LabelVersion, Me.itemInfo, Me.itemExit, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.itemSettings, Me.BarButtonItem2, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItemConnections, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.LabelLanguage, Me.BarButtonItem20, Me.BarButtonItemSAPConnect, Me.BarButtonItemStructureNOdes, Me.BarSubItem1, Me.BarButtonItem14, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem8, Me.BarButtonItem9, Me.itemAbout, Me.BarButtonItem19, Me.btnGlobalSearch, Me.LabelUser, Me.bbtnItemViewsUser, Me.BarButtonItem23, Me.LabelProxyServer, Me.BarSubItem2, Me.BarButtonItem25, Me.StatusPersonifiedLogin, Me.itemScanInbox, Me.BarButtonItem13, Me.BarButtonItemSwitchCon, Me.LabelConString, Me.StatusVersionDB})
+        Me.ribbonMain.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonMain.ExpandCollapseItem, Me.ribbonMain.SearchEditItem, Me.LabelMachine, Me.LabelLoggedIn, Me.LabelVersion, Me.itemInfo, Me.itemExit, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.itemSettings, Me.BarButtonItem2, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItemConnections, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.LabelLanguage, Me.BarButtonItem20, Me.BarButtonItemSAPConnect, Me.BarButtonItemStructureNOdes, Me.BarSubItem1, Me.BarButtonItem14, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem8, Me.BarButtonItem9, Me.itemAbout, Me.BarButtonItem19, Me.btnGlobalSearch, Me.LabelUser, Me.bbtnItemViewsUser, Me.LabelProxyServer, Me.BarSubItem2, Me.BarButtonItem25, Me.StatusPersonifiedLogin, Me.itemScanInbox, Me.BarButtonItem13, Me.BarButtonItemSwitchCon, Me.LabelConString, Me.StatusVersionDB})
        resources.ApplyResources(Me.ribbonMain, "ribbonMain")
        Me.ribbonMain.MaxItemId = 1
        Me.ribbonMain.Name = "ribbonMain"
@ -435,7 +434,7 @@ Partial Class frmMain
        '
        resources.ApplyResources(Me.BarSubItem1, "BarSubItem1")
        Me.BarSubItem1.Id = 38
-        Me.BarSubItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem14), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem21), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem22), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem8), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem9), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem23)})
+        Me.BarSubItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem14), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem21), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem22), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem8), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem9)})
        Me.BarSubItem1.Name = "BarSubItem1"
        Me.BarSubItem1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
        '
@ -474,14 +473,6 @@ Partial Class frmMain
        Me.BarButtonItem9.ImageOptions.Image = CType(resources.GetObject("BarButtonItem9.ImageOptions.Image"), System.Drawing.Image)
        Me.BarButtonItem9.Name = "BarButtonItem9"
        '
-        'BarButtonItem23
-        '
-        resources.ApplyResources(Me.BarButtonItem23, "BarButtonItem23")
-        Me.BarButtonItem23.Id = 9
-        Me.BarButtonItem23.ImageOptions.Image = CType(resources.GetObject("BarButtonItem23.ImageOptions.Image"), System.Drawing.Image)
-        Me.BarButtonItem23.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem23.ImageOptions.LargeImage"), System.Drawing.Image)
-        Me.BarButtonItem23.Name = "BarButtonItem23"
-        '
        'btnGlobalSearch
        '
        resources.ApplyResources(Me.btnGlobalSearch, "btnGlobalSearch")
@ -819,7 +810,6 @@ Partial Class frmMain
    Friend WithEvents LabelUser As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem
    Friend WithEvents bbtnItemViewsUser As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents BarButtonItem23 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents LabelProxyServer As DevExpress.XtraBars.BarStaticItem
    Friend WithEvents BarSubItem2 As DevExpress.XtraBars.BarSubItem
    Friend WithEvents BarButtonItem25 As DevExpress.XtraBars.BarButtonItem
--- a/app/DD-Record-Organizer/frmMain.resx
+++ b/app/DD-Record-Organizer/frmMain.resx
@ -1294,7 +1294,7 @@
  <data name="BarButtonItem19.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAD3JJREFUaEPFWQtczmna7jWs846cdoyZYQx27O6McVpjYlfMt8bYGZMadmRGTskh
+        wgAADsIBFShKgAAAD3JJREFUaEPFWQtczmna7jWs846cdoyZYQx27O6McVpjYlfMt8bYGZMadmRGTskh
        WnJIEUVU5FCiUKGDSkI5q3GqKNP5ICRFiCgd6KCu77qfmn4x+Kam/fb+/a5f9b7Pv/e+7uc+XM/zav1a
        mzhxovbUqVNHTpkyxY7wIyKJqLqYPHly4KRJkzbo6+uP5SOtiTcIjTz/X7Pp06ePmDZtWoixsTEsrW3h
        4u4Jv6AQRMbEISUtHenp6UhOTsWFC9Hw8wuCi4s7rKysIet/+OGHMAMDgwX8N+2IpvL/stZ+pP1g00cj
@ -1531,7 +1531,7 @@
  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="LabelMachine.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPgBAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@ -1550,7 +1550,7 @@
  </data>
  <data name="LabelLoggedIn.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAACEEAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@ -1581,7 +1581,7 @@
  </data>
  <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAAoGAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@ -2258,7 +2258,7 @@
  </data>
  <data name="BarButtonItem21.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJQCAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@ -2279,7 +2279,7 @@
  </data>
  <data name="BarButtonItem22.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAAMDAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@ -2382,105 +2382,6 @@
        rGVfvYI98TWlNa9PnJGLMGDjunfB71xCckbODKy2/jgAln/eXvihrcNlZ8s+M+l3XnAsLt75Z+/2Vnxq
        3VuxbKCBYrmRgXjPPNVdUWINbcGQISPf6BVwYl7NvE359uCFxlG70jtXN/HfF33ijFw4KcMCLMTblOF6
        z5X+PxSF4t+qN/szT9oWSwAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="BarButtonItem23.Caption" xml:space="preserve">
-    <value>Synchronisation windream-Dateien</value>
-  </data>
-  <data name="BarButtonItem23.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-</value>
-  </data>
-  <data name="BarButtonItem23.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
 </value>
  </data>
  <data name="btnGlobalSearch.Caption" xml:space="preserve">
@ -2488,7 +2389,7 @@
  </data>
  <data name="btnGlobalSearch.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPcCAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@ -2511,7 +2412,7 @@
  </data>
  <data name="LabelUser.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAMgFAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@ -2584,7 +2485,7 @@
  </data>
  <data name="LabelProxyServer.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIQDAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@ -2615,7 +2516,7 @@
  </data>
  <data name="StatusPersonifiedLogin.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKEDAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@ -2708,7 +2609,7 @@
  </data>
  <data name="BarButtonItemSwitchCon.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIECAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@ -2729,7 +2630,7 @@
  </data>
  <data name="LabelConString.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAADIDAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@ -4018,12 +3919,6 @@
  <data name="&gt;&gt;BarButtonItem9.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="&gt;&gt;BarButtonItem23.Name" xml:space="preserve">
-    <value>BarButtonItem23</value>
-  </data>
-  <data name="&gt;&gt;BarButtonItem23.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
  <data name="&gt;&gt;btnGlobalSearch.Name" xml:space="preserve">
    <value>btnGlobalSearch</value>
  </data>
--- a/app/DD-Record-Organizer/frmMain.vb
+++ b/app/DD-Record-Organizer/frmMain.vb
@ -1011,15 +1011,6 @@ Public Class frmMain
    Private Sub BarButtonItem25_ItemClick(sender As Object, e As ItemClickEventArgs) Handles bbtnItemViewsUser.ItemClick
        OpenViewsUser()
    End Sub
-    Private Sub BarButtonItem23_ItemClick_1(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem23.ItemClick
-        Cursor = Cursors.WaitCursor
-        If ClassDOC_SEARCH.REFRESH_DOC_TABLE_RESULTS() = True Then
-            MsgBox("All files were synced successfully!", MsgBoxStyle.Information)
-        Else
-            MsgBox("Error while synchronizing files! Check the log!", MsgBoxStyle.Critical)
-        End If
-        Cursor = Cursors.Default
-    End Sub

    Private Sub BarButtonItem25_ItemClick_1(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem25.ItemClick
        OpenStatisticsADDI()
--- a/app/DD-Record-Organizer/frmWM_IndexFile.vb
+++ b/app/DD-Record-Organizer/frmWM_IndexFile.vb
@ -4,6 +4,7 @@ Imports System.Security.Principal
 Imports System.Data.SqlClient
 Imports Oracle.ManagedDataAccess.Client
 Imports DD_LIB_Standards
+Imports DigitalData.Modules.Windream

 Public Class frmWM_IndexFile
    Dim droptype As String
@ -11,6 +12,8 @@ Public Class frmWM_IndexFile
    Dim MULTIFILES As Integer = 0
    Dim formloaded As Boolean = False
    Dim DTVWPMO_DOKUMENTTYPES As DataTable
+    Dim _wm As Windream
+    Dim oWMObjecttype As String

    Public Class SW
        Public label As String
@ -52,7 +55,7 @@ Public Class frmWM_IndexFile
            sw = New SW("CheckFileExists")
            Dim existsonlyasMaster = False

-            If clsWD_GET.WDFile_exists(CURRENT_NEWFILENAME.Substring(2), clsDatabase.DB_PROXY_INITIALIZED, ClassProxy.MyLinkedServer) = True Then
+            If _wm.TestFileExists(CURRENT_NEWFILENAME) = True Then ' clsWM_GET.WDFile_exists(CURRENT_NEWFILENAME.Substring(2), clsDatabase.DB_PROXY_INITIALIZED, ClassProxy.MyLinkedServer) = True Then
                Dim msg = "Eine Datei mit identischem Namen existiert bereits! Wollen Sie die bestehende Datei ersetzen?"
                If USER_LANGUAGE <> "de-DE" Then
                    msg = "There is already a file with the same name! Would You like to replace the file?"
@ -60,7 +63,7 @@ Public Class frmWM_IndexFile
                Dim result As MsgBoxResult
                result = MessageBox.Show(msg, "File alredy exists:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
                If result = MsgBoxResult.Yes Then
-                    If clsWD_SET.Delete_WDFile(CURRENT_NEWFILENAME.Substring(2)) = False Then
+                    If _wm.RemoveFile(CURRENT_NEWFILENAME) Then 'clsWM_SET.Delete_WDFile(CURRENT_NEWFILENAME) = False Then
                        swWORK_FILE.Done()
                        Return False
                    End If
@ -69,7 +72,7 @@ Public Class frmWM_IndexFile
                End If

            Else
-                If clsWD_GET.WDFile_exists(CURRENT_NEWFILENAME.Substring(2), clsDatabase.DB_PROXY_INITIALIZED, ClassProxy.MyLinkedServer, True) = True Then
+                If _wm.TestFileExists(CURRENT_NEWFILENAME) = True Then ' clsWM_GET.WDFile_exists(CURRENT_NEWFILENAME.Substring(2), clsDatabase.DB_PROXY_INITIALIZED, ClassProxy.MyLinkedServer, True)
                    ClassHelper.InsertEssential_Log(CURRENT_RECORD_ID, "RECORD-ID", "FILE ALREADY EXISTED WITH NON-USER RIGHTS: " & CURRENT_NEWFILENAME)
                    CURRENT_NEWFILENAME = ClassHelper.Versionierung_Datei(CURRENT_NEWFILENAME)
                    existsonlyasMaster = True
@ -85,7 +88,7 @@ Public Class frmWM_IndexFile
            'Stream File to windream
            '#################################################################
            sw = New SW("File Stream")
-            Dim streamresult = clsWD_SET.Stream_File(ImportFilePath, CURRENT_NEWFILENAME, False)
+            Dim streamresult = _wm.NewFileStream(ImportFilePath, CURRENT_NEWFILENAME) 'clsWM_SET.Stream_File(ImportFilePath, CURRENT_NEWFILENAME, False)
            sw.Done()
            '#################################################################
            If streamresult = True Then
@ -93,13 +96,13 @@ Public Class frmWM_IndexFile
                sw = New SW("File Indexing")
                CURRENT_FILEIN_WD = CURRENT_NEWFILENAME
                Dim DOCID
-                DOCID = clsWD_GET.Index_GetVariableValue(CURRENT_FILEIN_WD, "Dokument-ID")
+                DOCID = _wm.GetIndexValue(CURRENT_FILEIN_WD, "Dokument-ID") ' clsWM_GET.Index_GetVariableValue(CURRENT_FILEIN_WD, "Dokument-ID")
                If Not IsNothing(DOCID) Then
-                    CURRENT_DOC_ID = DOCID
+                    CURRENT_DOC_ID = DOCID(0)
                Else
-                    DOCID = clsWD_GET.Index_GetVariableValue(CURRENT_FILEIN_WD, "Document-ID")
+                    DOCID = _wm.GetIndexValue(CURRENT_FILEIN_WD, "Document-ID") ' clsWM_GET.Index_GetVariableValue(CURRENT_FILEIN_WD, "Document-ID")
                    If Not IsNothing(DOCID) Then
-                        CURRENT_DOC_ID = DOCID
+                        CURRENT_DOC_ID = DOCID(0)
                    End If
                End If

@ -124,58 +127,36 @@ Public Class frmWM_IndexFile
                    'Erst die Objekttyp-Indices indexieren
                    'den Entity-Key auslesen
                    Dim DTTBPMO_WD_OBJECTTYPE As DataTable
-                    sql = "Select Top 1 * from TBPMO_WD_OBJECTTYPE where Upper(object_type) = Upper('" & clsWindream.MY_WDOBJECTTYPE & "')"
-                    DTTBPMO_WD_OBJECTTYPE = ClassDatabase.Return_Datatable(sql, True)
+                sql = "Select Top 1 * from TBPMO_WD_OBJECTTYPE" '   where Upper(object_type) = Upper('" & clsWM.MY_WDOBJECTTYPE & "')"
+                DTTBPMO_WD_OBJECTTYPE = ClassDatabase.Return_Datatable(sql, True)
                    If Not DTTBPMO_WD_OBJECTTYPE Is Nothing Then
-                        If DTTBPMO_WD_OBJECTTYPE.Rows.Count = 1 Then
-                            Dim indexname
-                            ''den Record_Key auslesen
-                            'Dim indexname = DT.Rows(0).Item("IDXNAME_RECORDID").ToString
-                            'LOGGER.Debug("Record-ID: " & CURRENT_RECORD_ID.ToString, False)
-                            'indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, CURRENT_RECORD_ID, clsWindream.MY_WDOBJECTTYPE)
-                            'If indexierung_erfolgreich = False Then
-                            '    err = True
-                            '    ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in WorkFile-indexing RecordID '" & indexname & "') - Check logfile!")
-                            '    sw.Done()
-                            '    Return False
-                            'End If
-                            'den Entity-Key auslesen
-                            'indexname = DT.Rows(0).Item("IDXNAME_ENTITYID").ToString
-                            'LOGGER.Debug("Entity-ID: " & CURRENT_ENTITY_ID.ToString, False)
-                            'indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, CURRENT_ENTITY_ID, clsWindream.MY_WDOBJECTTYPE)
-                            'If indexierung_erfolgreich = False Then
-                            '    err = True
-                            '    ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in WorkFile-indexing EntityID '" & indexname & "') - Check logfile!")
-                            '    sw.Done()
-                            '    Return False
-                            'End If
-                            'If CURRENT_REDUNDANT_FORM_ID <> 0 Then
-                            '    indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, CURRENT_REDUNDANT_FORM_ID, clsWindream.MY_WDOBJECTTYPE)
-                            'End If
-                            'den Doctype auslesen
-                            indexname = DTTBPMO_WD_OBJECTTYPE.Rows(0).Item("IDXNAME_DOCTYPE").ToString
-                            LOGGER.Debug("Doctype: " & vDokart.ToString, False)
-                            indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, vDokart, clsWindream.MY_WDOBJECTTYPE)
-                            If indexierung_erfolgreich = False Then
-                                err = True
-                                ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in WorkFile-indexing Doctype '" & indexname & "') - Check logfile!")
-                                sw.Done()
-                                swWORK_FILE.Done()
-                                Return False
-                            End If
-
-                            indexname = DTTBPMO_WD_OBJECTTYPE.Rows(0).Item("IDXNAME_RELATION").ToString
-                            indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, "ADDI-RELATION", clsWindream.MY_WDOBJECTTYPE)
-                            If indexierung_erfolgreich = False Then
-                                err = True
-                                ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in WorkFile-indexing AddiRelation '" & indexname & "') - Check logfile!")
-                                sw.Done()
-                                swWORK_FILE.Done()
-                                Return False
-                            End If
-
+                    If DTTBPMO_WD_OBJECTTYPE.Rows.Count = 1 Then
+                        oWMObjecttype = DTTBPMO_WD_OBJECTTYPE.Rows(0).Item("OBJECT_TYPE").ToString
+                        Dim indexname
+                        'den Doctype auslesen
+                        indexname = DTTBPMO_WD_OBJECTTYPE.Rows(0).Item("IDXNAME_DOCTYPE").ToString
+                        LOGGER.Debug("Doctype: " & vDokart.ToString, False)
+                        indexierung_erfolgreich = _wm.SetFileIndex(CURRENT_FILEIN_WD, indexname, vDokart, oWMObjecttype) ' clsWM_SET.IndexFile(CURRENT_FILEIN_WD, indexname, vDokart, oWMObjecttype) 'clsWM.MY_WDOBJECTTYPE)
+                        If indexierung_erfolgreich = False Then
+                            err = True
+                            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in WorkFile-indexing Doctype '" & indexname & "') - Check logfile!")
+                            sw.Done()
+                            swWORK_FILE.Done()
+                            Return False
                        End If
+
+                        indexname = DTTBPMO_WD_OBJECTTYPE.Rows(0).Item("IDXNAME_RELATION").ToString
+                        indexierung_erfolgreich = _wm.SetFileIndex(CURRENT_FILEIN_WD, indexname, "ADDI-RELATION", oWMObjecttype) 'clsWM_SET.IndexFile(CURRENT_FILEIN_WD, indexname, "ADDI-RELATION", oWMObjecttype) 'clsWM.MY_WDOBJECTTYPE)
+                        If indexierung_erfolgreich = False Then
+                            err = True
+                            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in WorkFile-indexing AddiRelation '" & indexname & "') - Check logfile!")
+                            sw.Done()
+                            swWORK_FILE.Done()
+                            Return False
+                        End If
+
                    End If
+                End If
                    sw.Done()
                    If DT_AUTO_INDEXE Is Nothing = False Then 'CHECK DD
                        If DT_AUTO_INDEXE.Rows.Count > 0 Then
@ -238,14 +219,14 @@ Public Class frmWM_IndexFile
                                End If
                                LOGGER.Debug("Value for Indexing : '" & idxvalue.ToString & "'", False)
                                Count += 1
-                                indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, clsWindream.MY_WDOBJECTTYPE)
-                                If indexierung_erfolgreich = False Then
+                            indexierung_erfolgreich = _wm.SetFileIndex(CURRENT_FILEIN_WD, indexname, idxvalue, oWMObjecttype) 'clsWM_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, oWMObjecttype) 'clsWM.MY_WDOBJECTTYPE)
+                            If indexierung_erfolgreich = False Then
                                    MsgBox("Unexpected Error in indexing file - See log", MsgBoxStyle.Critical)
                                    err = True
                                    Exit For
                                End If
-                                'ByVal WD_File As String, ByVal _Indexname As String, ByVal _Value As String
-                            Next
+
+                        Next
                            If err = True Then
                                swWORK_FILE.Done()
                                Return False
@ -283,8 +264,8 @@ Public Class frmWM_IndexFile
                        Next
                        If IsNothing(CURRENT_DOC_ID) Then
                            sw = New SW("GettingDocID")
-                            sql = String.Format("SELECT DocID FROM VWPMO_DOC_SYNC WHERE UPPER(FULL_FILENAME) = UPPER('{0}') AND CONVERT(DATE,Change_DateTime) = CONVERT(DATE,GETDATE())", CURRENT_FILEIN_WD)
-                            CURRENT_DOC_ID = ClassDatabase.Execute_Scalar(sql)
+                        sql = String.Format("SELECT DocID FROM VWPMO_DOC_SYNC WHERE FULL_FILENAME = '{0}' AND CONVERT(DATE,Change_DateTime) = CONVERT(DATE,GETDATE())", CURRENT_FILEIN_WD)
+                        CURRENT_DOC_ID = ClassDatabase.Execute_Scalar(sql)
                            sw.Done()
                        End If

@ -314,11 +295,11 @@ Public Class frmWM_IndexFile
                                Next
                            End If

-                            If clsWindream.Create_Session() = False Then
-                                MsgBox("Could not create a windream-session!", MsgBoxStyle.Critical)
-                            Else
-                                'Create Session um Fehler bei windows Session nicht zu erzeugen
-                                FAU_AD_USER = ""
+                        If _wm.SessionLoggedin = False Then 'clsWM.Create_Session() = False Then
+                            MsgBox("Could not create a windream-session!", MsgBoxStyle.Critical)
+                        Else
+                            'Create Session um Fehler bei windows Session nicht zu erzeugen
+                            FAU_AD_USER = ""
                                ClassFileResult.DocID = CURRENT_DOC_ID
                                ClassFileResult.SET_DOCID_INDICES()
                                If ClassDOC_SEARCH.CREATE_DOC_RELATED_LINKS(CURRENT_DOC_ID, CURRENT_RECORD_ID) = False Then
@ -486,7 +467,8 @@ Public Class frmWM_IndexFile
            If cmbDokumentart.SelectedIndex <> -1 Then
                My.Settings.WD_INDEXDOKART_SAVE = cmbDokumentart.Text
                My.Settings.Save()
-                If clsWindream.Create_Session = True Then
+
+                If _wm.SessionLoggedin = True Then 'clsWM.Create_Session = True Then
                    Handle_File(cmbDokumentart.SelectedValue)
                Else
                    MsgBox("Could not create a windream-session! Please contact Your admin!", MsgBoxStyle.Critical)
@ -502,7 +484,7 @@ Public Class frmWM_IndexFile
        Try
            Me.Cursor = Cursors.WaitCursor
            SaveMySettingsValue("WD_IndexDeleteDocs", WD_IndexDeleteDocs, "ConfigMain")
-            clsWindream.MY_WDOBJECTTYPE = Me.OBJECT_TYPETextBox.Text
+            ' clsWM.MY_WDOBJECTTYPE = Me.OBJECT_TYPETextBox.Text
            'Multi-Indexer ist aktiv
            If chkMultiIndexer.Visible = True And chkMultiIndexer.Checked = True Then
                'Die erste Datei indexieren
@ -1153,6 +1135,7 @@ Public Class frmWM_IndexFile
            LOGGER.Debug("frmWD_Index_Dokart_Load", False)
            chkdelete_origin.Checked = False
            chkdelete_origin.Visible = False
+            _wm = New Windream(LOGCONFIG, False, WMDriveLetter, WMPATH_PREFIX, True, "", "", "", "")
            Dim HandleType As String
            For Each row As DataRow In CURRENT_TBPMO_FILES_USER.Rows
                If row.Item("GUID") = CURRENT_FILEID Then