diff --git a/app/DD-Record-Organizer/Classes/ClassDOC_SEARCH.vb b/app/DD-Record-Organizer/Classes/ClassDOC_SEARCH.vb
index 5b03336..dc75496 100644
--- a/app/DD-Record-Organizer/Classes/ClassDOC_SEARCH.vb
+++ b/app/DD-Record-Organizer/Classes/ClassDOC_SEARCH.vb
@@ -531,7 +531,7 @@ Public Class ClassDOC_SEARCH
Return False
End Try
End Function
- Public Shared Function SET_WD_RIGHTS(RESULT_DOCID As Integer, RESULT_DOC_PATH As String, DeleteRightsBefore As Boolean)
+ Public Shared Function SET_WD_RIGHTS(oWMObject As WINDREAMLib.WMObject, RESULT_DOCID As Integer, RESULT_DOC_PATH As String, DeleteRightsBefore As Boolean)
Try
If CURRENT_RECORD_ID = 0 Then
MsgBox("No Record selected - Please select one!", MsgBoxStyle.Exclamation)
@@ -539,7 +539,7 @@ Public Class ClassDOC_SEARCH
End If
LOGGER.Debug("#### SETTING RIGHTS FOR FILE ######")
If ClassWDRights.Init = True Then
- If ClassWDRights.Doc_Renew_Rights(RESULT_DOCID, RESULT_DOC_PATH, DeleteRightsBefore) Then
+ If ClassWDRights.Doc_Renew_Rights(oWMObject, RESULT_DOCID, RESULT_DOC_PATH, DeleteRightsBefore) Then
If ClassWDRights.MSG_RESULT <> "" Then
Dim msg = "Achtung: einige Rechte konnten nicht gesetzt werden: " & vbNewLine & ClassWDRights.MSG_RESULT
If USER_LANGUAGE <> "de-DE" Then
diff --git a/app/DD-Record-Organizer/Classes/ClassHelper.vb b/app/DD-Record-Organizer/Classes/ClassHelper.vb
index 2bca80e..5758e1c 100644
--- a/app/DD-Record-Organizer/Classes/ClassHelper.vb
+++ b/app/DD-Record-Organizer/Classes/ClassHelper.vb
@@ -172,20 +172,27 @@ Public Class ClassHelper
Public Shared Function File_open(RESULT_DOC_PATH As Object, DocID As String)
Try
RESULT_DOC_PATH = FORMAT_WM_PATH(RESULT_DOC_PATH)
- CURRENT_OFFICE_FILE_CHANGED = False
+ If SHARE_DRIVE_ACTIVE Then
+ If RESULT_DOC_PATH.ToString.StartsWith(constWMOBJECTS) Then
+ RESULT_DOC_PATH = RESULT_DOC_PATH.ToString.Replace(constWMOBJECTS, WMPATH_PREFIX)
+ End If
+
+
+ End If
+ CURRENT_OFFICE_FILE_CHANGED = False
If RESULT_DOC_PATH <> Nothing 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 FILE_EXTENSION = '{1}'", USER_GUID, EXT)
- Dim DT As DataTable = MYDB_ECM.GetDatatable(sql)
- If DT.Rows.Count = 1 Then
- Select Case DT.Rows(0).Item("VIEWER")
- Case "DOC_VIEW"
- OPEN_DOCVIEW(RESULT_DOC_PATH, DocID)
- End Select
- Else
- File_SYSOPEN(RESULT_DOC_PATH, DocID)
- End If
+ '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 FILE_EXTENSION = '{1}'", USER_GUID, EXT)
+ ' Dim DT As DataTable = MYDB_ECM.GetDatatable(sql)
+ ' If DT.Rows.Count = 1 Then
+ ' Select Case DT.Rows(0).Item("VIEWER")
+ ' Case "DOC_VIEW"
+ ' OPEN_DOCVIEW(RESULT_DOC_PATH, DocID)
+ ' End Select
+ ' Else
+ File_SYSOPEN(RESULT_DOC_PATH, DocID)
+ 'End If
Return True
Else
MSGBOX_Handler("ERROR", "", "Sorry, but the docpath for doc-id: " & DocID & " is nothing!")
@@ -264,7 +271,6 @@ Public Class ClassHelper
If FILE_FORMATS_CHANGE_DURING_EDIT.Contains(oExtension) Then
oSql = $"SELECT dwVersionID FROM VWPMO_DOC_SEARCH WHERE DocID = {BW_DocID}"
Dim odwVersionId = MYDB_ECM.GetScalarValue(oSql)
-
Dim oInsert = $"INSERT INTO TBPMO_DOC_ID_CHANGED (USER_ID,PROCESS_ID,VERSION_ID,OLD_DOC_ID,DOC_PATH) VALUES ({USER_GUID},'{ProcID.ToString}',{odwVersionId},{BW_DocID},'{BW_DocPath}')"
MYDB_ECM.ExecuteNonQuery(oInsert)
End If
@@ -272,6 +278,7 @@ Public Class ClassHelper
'oMyProcess.WaitForExit()
Catch ex As Exception
LOGGER.Warn("Error in Process1.Start(): " & ex.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID)
+ MsgBox("Error in OpenFile: " & ex.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID, MsgBoxStyle.Exclamation)
Exit Sub
End Try
diff --git a/app/DD-Record-Organizer/Classes/ClassInit.vb b/app/DD-Record-Organizer/Classes/ClassInit.vb
index bf99b75..14a7ff1 100644
--- a/app/DD-Record-Organizer/Classes/ClassInit.vb
+++ b/app/DD-Record-Organizer/Classes/ClassInit.vb
@@ -181,7 +181,9 @@ Public Class ClassInit
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
+
+
+ If Not WMPATH_PREFIX.ToUpper.StartsWith(constWMOBJECTS) Then
SHARE_DRIVE_ACTIVE = True
LOGGER.Info($"WM SHARE_DRIVE [{WMPATH_PREFIX}] via TBPMO_KONFIGURATION is active")
End If
@@ -254,6 +256,20 @@ Public Class ClassInit
ClassHelper.InsertEssential_Log(0, "USER-ID", String.Format("User '{0}' not listed in Userconfiguration", USER_USERNAME))
Return False
Else
+ DTTBPMO_SERVICE_RIGHT_CONFIG = MYDB_ECM.GetDatatable("SELECT * FROM TBPMO_SERVICE_RIGHT_CONFIG WHERE GUID = 1")
+ WM_DOMAIN = DTTBPMO_SERVICE_RIGHT_CONFIG.Rows(0).Item("AD_DOMAIN")
+ WM_USER = DTTBPMO_SERVICE_RIGHT_CONFIG.Rows(0).Item("AD_USER")
+ WM_SERVER = DTTBPMO_SERVICE_RIGHT_CONFIG.Rows(0).Item("AD_SERVER")
+ Dim PWplainText As String
+ Dim wrapper As New ClassEncryption("!35452didalog=")
+ ' DecryptData throws if the wrong password is used.
+ Try
+ PWplainText = wrapper.DecryptData(DTTBPMO_SERVICE_RIGHT_CONFIG.Rows(0).Item("AD_USER_PW"))
+ Catch ex As Exception
+ LOGGER.Warn("The Userpassword could not be decrypted")
+ PWplainText = ""
+ End Try
+ WM_USER_PW = PWplainText
USER_GUID = USER_DT.Rows(0).Item("USER_ID")
Try
@@ -261,6 +277,7 @@ Public Class ClassInit
Catch ex As Exception
USERID_FK_INT_ECM = 0
End Try
+ USER_IS_ADMIN = USER_DT.Rows(0).Item("IS_ADMIN")
USER_LANGUAGE = USER_DT.Rows(0).Item("USER_LANGUAGE")
clsCURRENT.USER_LANGUAGE = USER_LANGUAGE
USER_DATE_FORMAT = USER_DT.Rows(0).Item("USER_DATE_FORMAT")
@@ -276,13 +293,16 @@ Public Class ClassInit
If oMode.StartsWith("WMMODE") Then
WorkMode_WMMODE = oMode.Replace("WMMODE=", "")
+ LOGGER.Debug($"oWorkmode WMMODE = [{WorkMode_WMMODE}]")
If WorkMode_WMMODE = "READ" Then
WM_READ_ONLY = True
LOGGER.Info("WINDREAM IS CONFIGURED READ ONLY FOR USER!")
End If
ElseIf oMode.StartsWith("WM_PRAEFIX") Then
WMPATH_PREFIX = oMode.Replace("WM_PRAEFIX=", "")
- If Not WMPATH_PREFIX.ToUpper.StartsWith("\\WINDREAM\OBJECTS") Then
+ WMPATH_via_WMA = True
+ LOGGER.Debug($"oWorkmode WM_PRAEFIX = [{WMPATH_PREFIX}]")
+ If Not WMPATH_PREFIX.ToUpper.StartsWith(constWMOBJECTS) Then
SHARE_DRIVE_ACTIVE = True
LOGGER.Info($"WM SHARE_DRIVE [{WMPATH_PREFIX}] via WORKING_MODE is active")
End If
@@ -297,6 +317,10 @@ Public Class ClassInit
LOGGER.Info("WINDREAM IS CONFIGURED READ ONLY AS No Workmode was configured and Sharedrive is active!")
WM_READ_ONLY = True
End If
+ If USER_IS_ADMIN And SHARE_DRIVE_ACTIVE = True Then
+ LOGGER.Info($"User configured as an admin, but SHAREDRIVE ACTIVE - So WM_READ_ONLY = False!")
+ WM_READ_ONLY = False
+ End If
End If
@@ -353,7 +377,7 @@ Public Class ClassInit
oFNSQL = String.Format("INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,CLIENT_ID,MODULE,VERSION_CLIENT,MACHINE_NAME,CONNECTION_STRING) VALUES ({0},{1},'Record-Organizer','{2}','{3}','{4}')", USER_GUID, CLIENT_SELECTED, My.Application.Info.Version.ToString, Environment.MachineName, ConStringMain)
MYDB_ECM.ExecuteNonQuery(oFNSQL)
- USER_IS_ADMIN = USER_DT.Rows(0).Item("IS_ADMIN") 'vorher RECORD_ADMIN
+
If USER_IS_ADMIN = True Then
If ESC_Hidden = True Then
frmLoginUserSelect.ShowDialog()
@@ -364,12 +388,18 @@ Public Class ClassInit
End If
End If
+
+
+
Try
If WM_READ_ONLY = False Then
Try
- WMMOD = New DigitalData.Modules.Windream.Windream(LOGCONFIG, False, WMDriveLetter, WMPATH_PREFIX, True, "", "", "", "")
+ LOGGER.Debug($"Connecting to windream-Server via DigitalData.Modules.Windream.Windream...")
+ WMMOD = New DigitalData.Modules.Windream.Windream(LOGCONFIG, False, WMDriveLetter, WMPATH_PREFIX, True, WM_SERVER, WM_USER, WM_USER_PW, WM_DOMAIN)
If IsNothing(WMMOD) Then
MsgBox("Could not connect to windream! Check Your configuration", MsgBoxStyle.Exclamation)
+ Else
+ LOGGER.Debug($"..Successfully connected to Modules.Windream!")
End If
Catch ex As Exception
LOGGER.Error(ex)
diff --git a/app/DD-Record-Organizer/Classes/ClassWDRights.vb b/app/DD-Record-Organizer/Classes/ClassWDRights.vb
index 1074468..25dbe3e 100644
--- a/app/DD-Record-Organizer/Classes/ClassWDRights.vb
+++ b/app/DD-Record-Organizer/Classes/ClassWDRights.vb
@@ -67,13 +67,13 @@ Public Class ClassWDRights
Return False
End Try
End Function
- Public Shared Function Doc_Renew_Rights(doc_id As Integer, reldocpath As String, deleterights As Boolean) As Boolean
+ Public Shared Function Doc_Renew_Rights(oWMObject As WMObject, doc_id As Integer, reldocpath As String, deleterights As Boolean) As Boolean
Try
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
- Dim oWMObject As WINDREAMLib.WMObject
+ ' Dim oWMObject As WINDREAMLib.WMObject
Dim UserGroupRelation
Dim UserOrGroup
Dim oUSer
@@ -81,7 +81,7 @@ Public Class ClassWDRights
Try
'Dedizierte Session herstellen
- oSession = GetWMSessionAsUser(AD_DOMAIN, AD_SERVER, AD_USER, AD_USER_PW)
+ oSession = GetWMSessionAsUser(WM_DOMAIN, WM_SERVER, WM_USER, WM_USER_PW)
Catch ex As Exception
Dim msg = "Error in Doc_Renew_Rights-GetWMSessionAsUser : " & ex.Message
LOGGER.Warn(msg)
@@ -102,16 +102,17 @@ Public Class ClassWDRights
LOGGER.Debug(String.Format("Amount of Userrights: {0}", DT_USER_RIGHT.Rows.Count))
End If
LOGGER.Debug(String.Format("Amount of Grouprights: {0}", DT_GROUP_RIGHT.Rows.Count))
- Try
- 'Object definieren
- oWMObject = oSession.GetWMObjectByPath(1, reldocpath)
- LOGGER.Debug("Object created.")
- Catch ex As Exception
- Dim msg = "Error GetWMObjectByPath: " & reldocpath & vbNewLine & Err.Description
- LOGGER.Warn(msg)
- LOGGER.Error(ex)
- Return False
- End Try
+ 'Try
+ ' 'Object definieren
+
+ ' oWMObject = WMCLASS.GetFileByPath(reldocpath) ' oSession.GetWMObjectByPath(1, reldocpath)
+ ' LOGGER.Debug("oWMObject created.")
+ 'Catch ex As Exception
+ ' Dim msg = "ClassWDRights - Error GetWMObjectByPath: " & reldocpath & vbNewLine & Err.Description
+ ' LOGGER.Warn(msg)
+ ' LOGGER.Error(ex)
+ ' Return False
+ 'End Try
Dim lret
Try
' Objekt muss zur Rechteänderung gelockt werden
diff --git a/app/DD-Record-Organizer/ModuleMySettings.vb b/app/DD-Record-Organizer/ModuleMySettings.vb
index 711dd56..448e1b4 100644
--- a/app/DD-Record-Organizer/ModuleMySettings.vb
+++ b/app/DD-Record-Organizer/ModuleMySettings.vb
@@ -6,6 +6,7 @@ Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Windream
Module ModuleMySettings
+ Public Const constWMOBJECTS = "\\WINDREAM\OBJECTS"
Public PATH_FileExclusions As String = Path.Combine(Application.UserAppDataPath(), "FileExclusions.xml")
Dim ConfigPath As String = Path.Combine(Application.UserAppDataPath(), "UserConfig2.xml")
@@ -21,10 +22,17 @@ Module ModuleMySettings
Public WD_UNICODE As Boolean = False
Public WMDriveLetter As String
Public WMPATH_PREFIX As String = ""
+ Public WMPATH_via_WMA As Boolean = False
+ Public DTTBPMO_SERVICE_RIGHT_CONFIG As DataTable
Public WMMOD As Windream
+ Public CURRENT_WM_OBJECT As WINDREAMLib.WMObject
Public SHARE_DRIVE_ACTIVE As Boolean = False
Public WorkMode_WMMODE As String = "NORMAL"
Public WM_READ_ONLY As Boolean = False
+ Public WM_SERVER As String = ""
+ Public WM_DOMAIN As String = ""
+ Public WM_USER As String = ""
+ Public WM_USER_PW As String = ""
Public GridDocResult_BestFitColumns As Boolean = True
Public SQL_FULLTEXT As String
Public CAPTION_CONFIRMATION As String = "Bestätigung"
diff --git a/app/DD-Record-Organizer/OrgFlow.vbproj b/app/DD-Record-Organizer/OrgFlow.vbproj
index fd8cdd8..89303be 100644
--- a/app/DD-Record-Organizer/OrgFlow.vbproj
+++ b/app/DD-Record-Organizer/OrgFlow.vbproj
@@ -779,12 +779,6 @@
Form
-
- frmWMView_Config.vb
-
-
- Form
-
@@ -1204,12 +1198,6 @@
frmFollowUp.vb
Designer
-
- frmWMView_Config.vb
-
-
- frmWMView_Config.vb
-
VbMyResourcesResXFileCodeGenerator
My.Resources
diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb
index 1c8084d..8533802 100644
--- a/app/DD-Record-Organizer/frmConstructor_Main.vb
+++ b/app/DD-Record-Organizer/frmConstructor_Main.vb
@@ -6091,7 +6091,11 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
Dim err As Boolean = False
Cursor = Cursors.WaitCursor
For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
- If ClassDOC_SEARCH.SET_WD_RIGHTS(row.Item("DOC_ID"), row.Item("DOC_PATH"), True) = True Then
+ Dim oWMObject As WINDREAMLib.WMObject
+ Dim oReldocpath = ClassHelper.GetRelPath(row.Item("DOC_PATH"))
+ LOGGER.Info("oReldocpath: " & oReldocpath)
+ oWMObject = WMMOD.GetFileByPath(oReldocpath)
+ If ClassDOC_SEARCH.SET_WD_RIGHTS(oWMObject, row.Item("DOC_ID"), row.Item("DOC_PATH"), True) = True Then
Else
err = True
diff --git a/app/DD-Record-Organizer/frmWMView_Config.Designer.vb b/app/DD-Record-Organizer/frmWMView_Config.Designer.vb
deleted file mode 100644
index 58f94dc..0000000
--- a/app/DD-Record-Organizer/frmWMView_Config.Designer.vb
+++ /dev/null
@@ -1,48 +0,0 @@
- _
-Partial Class frmWMView_Config
- Inherits System.Windows.Forms.Form
-
- 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
- _
- Protected Overrides Sub Dispose(ByVal disposing As Boolean)
- Try
- If disposing AndAlso components IsNot Nothing Then
- components.Dispose()
- End If
- Finally
- MyBase.Dispose(disposing)
- End Try
- End Sub
-
- 'Wird vom Windows Form-Designer benötigt.
- Private components As System.ComponentModel.IContainer
-
- 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
- 'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
- 'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
- _
- Private Sub InitializeComponent()
- Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmWMView_Config))
- Me.CheckBoxWD_ShowDocs = New System.Windows.Forms.CheckBox()
- Me.SuspendLayout()
- '
- 'CheckBoxWD_ShowDocs
- '
- resources.ApplyResources(Me.CheckBoxWD_ShowDocs, "CheckBoxWD_ShowDocs")
- Me.CheckBoxWD_ShowDocs.Name = "CheckBoxWD_ShowDocs"
- Me.CheckBoxWD_ShowDocs.UseVisualStyleBackColor = True
- '
- 'frmwindreamView_Config
- '
- resources.ApplyResources(Me, "$this")
- Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.Controls.Add(Me.CheckBoxWD_ShowDocs)
- Me.MaximizeBox = False
- Me.MinimizeBox = False
- Me.Name = "frmwindreamView_Config"
- Me.ResumeLayout(False)
- Me.PerformLayout()
-
- End Sub
- Friend WithEvents CheckBoxWD_ShowDocs As System.Windows.Forms.CheckBox
-End Class
diff --git a/app/DD-Record-Organizer/frmWMView_Config.en-US.resx b/app/DD-Record-Organizer/frmWMView_Config.en-US.resx
deleted file mode 100644
index 7e6cf1d..0000000
--- a/app/DD-Record-Organizer/frmWMView_Config.en-US.resx
+++ /dev/null
@@ -1,130 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
-
- 104, 19
-
-
- Show DocView
-
-
- Configuration of userspecific windream-View
-
-
\ No newline at end of file
diff --git a/app/DD-Record-Organizer/frmWMView_Config.resx b/app/DD-Record-Organizer/frmWMView_Config.resx
deleted file mode 100644
index 18f98ea..0000000
--- a/app/DD-Record-Organizer/frmWMView_Config.resx
+++ /dev/null
@@ -1,170 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
-
- True
-
-
-
- 12, 12
-
-
- 122, 19
-
-
- 0
-
-
- DocView anzeigen
-
-
- CheckBoxWD_ShowDocs
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 0
-
-
- True
-
-
- 7, 15
-
-
- 436, 161
-
-
- Segoe UI, 9pt
-
-
- Konfiguration der Userspezifischen windream-Ansicht
-
-
- frmwindreamView_Config
-
-
- System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/app/DD-Record-Organizer/frmWMView_Config.vb b/app/DD-Record-Organizer/frmWMView_Config.vb
deleted file mode 100644
index a034a97..0000000
--- a/app/DD-Record-Organizer/frmWMView_Config.vb
+++ /dev/null
@@ -1,11 +0,0 @@
-Public Class frmWMView_Config
-
- Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBoxWD_ShowDocs.CheckedChanged
- WD_ShowDocs = CheckBoxWD_ShowDocs.Checked
- SaveMySettingsValue("WD_ShowDocs", WD_ShowDocs, "ConfigMain")
- End Sub
-
- Private Sub frmwindreamView_Config_Load(sender As Object, e As EventArgs) Handles Me.Load
- CheckBoxWD_ShowDocs.Checked = WD_ShowDocs
- End Sub
-End Class
\ No newline at end of file
diff --git a/app/DD-Record-Organizer/frmWM_IndexFile.vb b/app/DD-Record-Organizer/frmWM_IndexFile.vb
index b4cd583..98287ac 100644
--- a/app/DD-Record-Organizer/frmWM_IndexFile.vb
+++ b/app/DD-Record-Organizer/frmWM_IndexFile.vb
@@ -3,7 +3,6 @@ Imports System.Security.AccessControl
Imports System.Security.Principal
Imports System.Data.SqlClient
Imports Oracle.ManagedDataAccess.Client
-'Imports DD_LIB_Standards
Imports DigitalData.Modules.Windream
Public Class frmWM_IndexFile
@@ -246,6 +245,14 @@ Public Class frmWM_IndexFile
If indexierung_erfolgreich = True Then
LOGGER.Info("File was correctly imported and indexed: " & CURRENT_FILEIN_WD)
+ Dim oReldocpath = ClassHelper.GetRelPath(CURRENT_FILEIN_WD)
+ LOGGER.Info("oReldocpath: " & oReldocpath)
+ CURRENT_WM_OBJECT = WMMOD.GetFileByPath(oReldocpath)
+ If IsNothing(CURRENT_WM_OBJECT) Then
+ MsgBox("Attention in Work-File:" & vbNewLine & "Could not create final windream-object!", MsgBoxStyle.Critical)
+ Return False
+ End If
+ LOGGER.Info("..CURRENT_WM_OBJECT created: " & oReldocpath)
Dim stg As String = "Datei erfolgreich nach windream übertragen"
Dim stg1 As String = "Erfolgsmeldung"
If USER_LANGUAGE <> "de-DE" Then
@@ -309,7 +316,7 @@ Public Class frmWM_IndexFile
MsgBox(stg, MsgBoxStyle.Critical, stg1)
Else
sw = New SW("Setting_Rights")
- If ClassDOC_SEARCH.SET_WD_RIGHTS(CURRENT_DOC_ID, CURRENT_FILEIN_WD, odeleteRights) = False Then
+ If ClassDOC_SEARCH.SET_WD_RIGHTS(CURRENT_WM_OBJECT, CURRENT_DOC_ID, CURRENT_FILEIN_WD, odeleteRights) = False Then
MsgBox("The rights for the new file could not be created! Please check the logfile!" & vbNewLine &
"ADDI will try to give You at least reading rights!", MsgBoxStyle.Exclamation)
DD_Rights.ClassRights.SetRightExplicit(CURRENT_DOC_ID, CURRENT_FILEIN_WD, USER_USERNAME, 1)
@@ -1131,7 +1138,7 @@ Public Class frmWM_IndexFile
LOGGER.Debug("frmWD_Index_Dokart_Load")
chkdelete_origin.Checked = False
chkdelete_origin.Visible = False
- _wm = New Windream(LOGCONFIG, False, WMDriveLetter, WMPATH_PREFIX, True, "", "", "", "")
+ _wm = New Windream(LOGCONFIG, False, WMDriveLetter, WMPATH_PREFIX, True, WM_SERVER, WM_USER, WM_USER_PW, WM_DOMAIN)
Dim HandleType As String
For Each row As DataRow In CURRENT_TBPMO_FILES_USER.Rows
If row.Item("GUID") = CURRENT_FILEID Then