Compare commits
18 Commits
9ff5840626
...
2.9.8-Rele
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7694da3192 | ||
|
|
eb826009f8 | ||
|
|
018cbc5ae0 | ||
|
|
e4d6734b03 | ||
|
|
61f6029001 | ||
|
|
de47ed9f3b | ||
|
|
e9a78cf6a4 | ||
|
|
b3848af701 | ||
|
|
a374b55ba2 | ||
|
|
a0ec897784 | ||
|
|
8f894d582d | ||
|
|
c3c214dfed | ||
|
|
db6b5b9c0b | ||
|
|
ad1e6e88ac | ||
|
|
001d4f6f02 | ||
|
|
002a988dca | ||
|
|
f71246c5a6 | ||
|
|
b7f67af9b2 |
@@ -14,7 +14,6 @@ Public Class ClassNIProfile
|
||||
xmlConfigFile = oConfigPath
|
||||
ClassNIProfile.LoadFromXmlFile()
|
||||
' 3b. Windream initialisieren (Connection, Session, ... aufbauen)
|
||||
_windream.Init()
|
||||
End Sub
|
||||
Public Shared Function IsXmlAccessable() As Boolean
|
||||
Dim xml As New Xml.XmlDocument
|
||||
|
||||
@@ -393,13 +393,13 @@ Public Class ClassWD_Rechte
|
||||
End Function
|
||||
Private Function WorkRight(_methode As String, createdFolder As String, _form As Boolean, oWMObject As WINDREAMLib.WMObject, deleteRights As Boolean, folgeRegel As Boolean, _UserOrGroup As String,
|
||||
_GruppenUserRecht As String, _lRight As Integer) As Boolean
|
||||
Dim Object2Change As WINDREAMLib.WMObject = Nothing
|
||||
Try
|
||||
Dim _Erfolgreich As Boolean = True
|
||||
Dim UserGroupRelation
|
||||
Dim UserOrGroup
|
||||
Dim oGroup
|
||||
Dim oUSer
|
||||
Dim Object2Change As WINDREAMLib.WMObject
|
||||
If _methode = "AddRightFolder" Then
|
||||
Object2Change = oWMObject.aParentWMObject
|
||||
ElseIf _methode = "AddRightCreatedFolder" Then
|
||||
@@ -731,6 +731,13 @@ Public Class ClassWD_Rechte
|
||||
Return _Erfolgreich
|
||||
Catch ex As Exception
|
||||
_Logger.Error(ex)
|
||||
Try
|
||||
If Object2Change IsNot Nothing AndAlso Object2Change.aLocked Then
|
||||
Object2Change.unlock()
|
||||
_Logger.Debug("WorkRight Catch: Object2Change unlocked after error.")
|
||||
End If
|
||||
Catch
|
||||
End Try
|
||||
Return False
|
||||
End Try
|
||||
End Function
|
||||
|
||||
@@ -49,7 +49,20 @@ Public Class ClassWindream_allgemein
|
||||
' Process.GetCurrentProcess.Kill()
|
||||
End If
|
||||
End Sub
|
||||
Private Sub LogoutCurrentSession()
|
||||
If Not IsNothing(CURRENToWMSession) Then
|
||||
Try
|
||||
CURRENToWMSession.Logout()
|
||||
Catch
|
||||
' ignorieren – Session war evtl. schon tot
|
||||
End Try
|
||||
CURRENToWMSession = Nothing
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Public Function GetWMSessionAsUser(Domain, ServerName, UserName, Password)
|
||||
LogoutCurrentSession()
|
||||
|
||||
Dim SessionAsUser
|
||||
Dim aConnect, aUserId, aSession
|
||||
On Error Resume Next
|
||||
@@ -95,10 +108,24 @@ Public Class ClassWindream_allgemein
|
||||
SessionAsUser = aSession
|
||||
If aSession.aLoggedin = True Then
|
||||
_Logger.Debug($"#Impersonate login [{UserName}] successfull!")
|
||||
Return SessionAsUser
|
||||
Me.oWMSession = aSession
|
||||
CURRENToWMSession = aSession
|
||||
CURRENToWMSession_Created = Now
|
||||
Me.oObjekttypen = aSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument)
|
||||
If Err.Number <> 0 Then
|
||||
_Logger.Warn("Fehler beim Laden der Objekttypen nach Impersonate-Login: " & Err.Description)
|
||||
Err.Clear()
|
||||
End If
|
||||
Me.oOrdnerTypen = aSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityFolder)
|
||||
If Err.Number <> 0 Then
|
||||
_Logger.Warn("Fehler beim Laden der Ordnertypen nach Impersonate-Login: " & Err.Description)
|
||||
Err.Clear()
|
||||
End If
|
||||
Return True
|
||||
End If
|
||||
|
||||
End If
|
||||
Return False
|
||||
End Function
|
||||
|
||||
''' <summary>
|
||||
@@ -107,25 +134,30 @@ Public Class ClassWindream_allgemein
|
||||
''' <returns>Liefert True wenn das Anmelden erfolgreich war, sonst False</returns>
|
||||
''' <remarks></remarks>
|
||||
Public Function Init() As Boolean
|
||||
Dim oHourDifference As Integer
|
||||
oHourDifference = CInt(DateDiff(DateInterval.Hour, CURRENToWMSession_Created, Now))
|
||||
|
||||
If IsNothing(CURRENToWMSession) Or oHourDifference >= 2 Then
|
||||
If IsNothing(CURRENToWMSession) OrElse Not CBool(CURRENToWMSession.aLoggedin) Then
|
||||
If WMLOGIN_DOMAIN <> String.Empty Then
|
||||
GetWMSessionAsUser(WMLOGIN_DOMAIN, Me.GetCurrentServer, WMLOGIN_USER, WMLOGIN_PW)
|
||||
Return GetWMSessionAsUser(WMLOGIN_DOMAIN, Me.GetCurrentServer, WMLOGIN_USER, WMLOGIN_PW)
|
||||
Else
|
||||
GetWMSession()
|
||||
Return GetWMSession()
|
||||
End If
|
||||
|
||||
Else
|
||||
If My.Settings.vLogErrorsonly = False Then _Logger.Debug("WMSession already created!")
|
||||
oWMSession = CURRENToWMSession
|
||||
If IsNothing(oObjekttypen) Then
|
||||
oObjekttypen = oWMSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument)
|
||||
End If
|
||||
If IsNothing(oOrdnerTypen) Then
|
||||
oOrdnerTypen = oWMSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityFolder)
|
||||
End If
|
||||
Return True
|
||||
End If
|
||||
|
||||
|
||||
End Function
|
||||
Private Function GetWMSession()
|
||||
LogoutCurrentSession()
|
||||
|
||||
Try
|
||||
Try
|
||||
' Session-Objekt instanziieren und mit dem im Client ausgewählten Server belegen
|
||||
@@ -361,7 +393,7 @@ Public Class ClassWindream_allgemein
|
||||
Dim oIndexAttributes As WMObjectRelation
|
||||
Dim oIndexAttribute As WMObject
|
||||
Dim oIndex As WMObject
|
||||
Dim oRelProperties As WMObjectRelationClass
|
||||
Dim oRelProperties As Object
|
||||
|
||||
' den Objekttyp laden
|
||||
oObjectType = Me.oWMSession.GetWMObjectByName(WMEntityObjectType, name)
|
||||
@@ -419,7 +451,7 @@ Public Class ClassWindream_allgemein
|
||||
Dim oIndexAttributes As WMObjectRelation
|
||||
Dim oIndexAttribute As WMObject
|
||||
Dim oIndex As WMObject
|
||||
Dim oRelProperties As WMObjectRelationClass
|
||||
Dim oRelProperties As Object
|
||||
For Each OrdnerType In Me.oOrdnerTypen
|
||||
If OrdnerType.aName = Ordnertyp Then
|
||||
oOrdnerType = OrdnerType
|
||||
@@ -530,6 +562,9 @@ Public Class ClassWindream_allgemein
|
||||
''' <remarks></remarks>
|
||||
Public Function IsLoggedIn() As Boolean
|
||||
Try
|
||||
If IsNothing(Me.oWMSession) Then
|
||||
Return False
|
||||
End If
|
||||
Return Me.oWMSession.aLoggedin
|
||||
Catch ex As Exception
|
||||
clsHelper.Add_Application_log("Unexpected error in Windream.IsLoggedIn: " & ex.Message)
|
||||
|
||||
Binary file not shown.
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("2.9.9.0")>
|
||||
<Assembly: AssemblyVersion("2.10.1.0")>
|
||||
<Assembly: AssemblyFileVersion("2.9.9.0")>
|
||||
|
||||
@@ -116,24 +116,23 @@
|
||||
<HintPath>packages\EntityFramework.6.0.2\lib\net45\EntityFramework.SqlServer.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Interop.Scripting">
|
||||
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.Scripting.dll</HintPath>
|
||||
<HintPath>M:\Bibliotheken\3rdParty\windream\Interop.Scripting.dll</HintPath>
|
||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
||||
</Reference>
|
||||
<Reference Include="Interop.WINDREAMLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<EmbedInteropTypes>False</EmbedInteropTypes>
|
||||
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll</HintPath>
|
||||
<Reference Include="Interop.WINDREAMLib">
|
||||
<HintPath>M:\Bibliotheken\3rdParty\windream\Interop.WINDREAMLib.dll</HintPath>
|
||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
||||
</Reference>
|
||||
<Reference Include="Interop.WMOBRWSLib">
|
||||
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll</HintPath>
|
||||
<HintPath>M:\Bibliotheken\3rdParty\windream\Interop.WMOBRWSLib.dll</HintPath>
|
||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
||||
</Reference>
|
||||
<Reference Include="Interop.WMOSRCHLib">
|
||||
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll</HintPath>
|
||||
<HintPath>M:\Bibliotheken\3rdParty\windream\Interop.WMOSRCHLib.dll</HintPath>
|
||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
||||
</Reference>
|
||||
<Reference Include="Interop.WMOTOOLLib">
|
||||
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll</HintPath>
|
||||
<HintPath>M:\Bibliotheken\3rdParty\windream\Interop.WMOTOOLLib.dll</HintPath>
|
||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
@@ -141,7 +140,7 @@
|
||||
<HintPath>..\packages\NLog.5.0.2\lib\net46\NLog.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Oracle.ManagedDataAccess">
|
||||
<HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Oracle.ManagedDataAccess.dll</HintPath>
|
||||
<HintPath>M:\App&Service\0 Partner Bibliotheken\Oracle.ManagedDataAccess.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.ComponentModel.DataAnnotations" />
|
||||
@@ -825,6 +824,7 @@
|
||||
<None Include="Resources\database_refresh.png" />
|
||||
<None Include="Resources\arrow_up.png" />
|
||||
<None Include="Resources\bullet_arrow_down1.png" />
|
||||
<Content Include="Interop.Scripting.dll" />
|
||||
<Content Include="Interop.WINDREAMLib.dll" />
|
||||
<None Include="Resources\action_add_16xMD.png" />
|
||||
<None Include="Resources\folder_Closed_16xMD.png" />
|
||||
|
||||
@@ -87,7 +87,7 @@ Public Class clsNIFulltext
|
||||
End If
|
||||
Else
|
||||
'Es gibt nur From, also auch nur einen Wert
|
||||
If Pos_From = oCountMatchedElements Then
|
||||
If Pos_From = i Then
|
||||
'Das Ende ist erreicht - Ausstieg
|
||||
ReDim Preserve Ergebnis(0)
|
||||
Ergebnis(0) = Convert.ToString(g.ToString)
|
||||
|
||||
29
ToolCollection/frmDIProfilHinzufuegen.Designer.vb
generated
29
ToolCollection/frmDIProfilHinzufuegen.Designer.vb
generated
@@ -50,9 +50,9 @@ Partial Class frmDIProfilHinzufuegen
|
||||
Me.btnZielverzeichnisLöschen = New System.Windows.Forms.Button()
|
||||
Me.btnQuellverzeichnisLöschen = New System.Windows.Forms.Button()
|
||||
Me.GroupBox1 = New System.Windows.Forms.GroupBox()
|
||||
Me.Label6 = New System.Windows.Forms.Label()
|
||||
Me.chkb_DateUV = New System.Windows.Forms.CheckBox()
|
||||
Me.chkb_Subdirectories = New System.Windows.Forms.CheckBox()
|
||||
Me.Label6 = New System.Windows.Forms.Label()
|
||||
Me.boxImportoptionenLoeschen.SuspendLayout()
|
||||
Me.boxImportoptionenBackup.SuspendLayout()
|
||||
Me.GroupBox1.SuspendLayout()
|
||||
@@ -74,7 +74,7 @@ Partial Class frmDIProfilHinzufuegen
|
||||
'
|
||||
Me.chkUVloeschen.AutoSize = True
|
||||
Me.chkUVloeschen.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.chkUVloeschen.Location = New System.Drawing.Point(250, 42)
|
||||
Me.chkUVloeschen.Location = New System.Drawing.Point(8, 42)
|
||||
Me.chkUVloeschen.Name = "chkUVloeschen"
|
||||
Me.chkUVloeschen.Size = New System.Drawing.Size(230, 17)
|
||||
Me.chkUVloeschen.TabIndex = 18
|
||||
@@ -86,12 +86,13 @@ Partial Class frmDIProfilHinzufuegen
|
||||
'
|
||||
Me.chkQuellverzeichnisLoeschen.AutoSize = True
|
||||
Me.chkQuellverzeichnisLoeschen.Enabled = False
|
||||
Me.chkQuellverzeichnisLoeschen.Location = New System.Drawing.Point(8, 42)
|
||||
Me.chkQuellverzeichnisLoeschen.Location = New System.Drawing.Point(250, 19)
|
||||
Me.chkQuellverzeichnisLoeschen.Name = "chkQuellverzeichnisLoeschen"
|
||||
Me.chkQuellverzeichnisLoeschen.Size = New System.Drawing.Size(217, 17)
|
||||
Me.chkQuellverzeichnisLoeschen.TabIndex = 17
|
||||
Me.chkQuellverzeichnisLoeschen.Text = "Quellverzeichnis nach Import löschen"
|
||||
Me.chkQuellverzeichnisLoeschen.UseVisualStyleBackColor = True
|
||||
Me.chkQuellverzeichnisLoeschen.Visible = False
|
||||
'
|
||||
'chkDateienLoeschen
|
||||
'
|
||||
@@ -326,6 +327,17 @@ Partial Class frmDIProfilHinzufuegen
|
||||
Me.GroupBox1.TabStop = False
|
||||
Me.GroupBox1.Text = "Erweiterte Ordnerstrukturen"
|
||||
'
|
||||
'Label6
|
||||
'
|
||||
Me.Label6.AutoSize = True
|
||||
Me.Label6.Font = New System.Drawing.Font("Segoe UI Semibold", 9.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.Label6.Location = New System.Drawing.Point(28, 40)
|
||||
Me.Label6.Name = "Label6"
|
||||
Me.Label6.Size = New System.Drawing.Size(243, 15)
|
||||
Me.Label6.TabIndex = 1
|
||||
Me.Label6.Text = "Detaileinstellungen nach Speichern im Profil"
|
||||
Me.Label6.Visible = False
|
||||
'
|
||||
'chkb_DateUV
|
||||
'
|
||||
Me.chkb_DateUV.AutoSize = True
|
||||
@@ -346,17 +358,6 @@ Partial Class frmDIProfilHinzufuegen
|
||||
Me.chkb_Subdirectories.Text = "Unterverzeichnisse einbeziehen (Ordnerstruktur wird komplett übernommen)"
|
||||
Me.chkb_Subdirectories.UseVisualStyleBackColor = True
|
||||
'
|
||||
'Label6
|
||||
'
|
||||
Me.Label6.AutoSize = True
|
||||
Me.Label6.Font = New System.Drawing.Font("Segoe UI Semibold", 9.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.Label6.Location = New System.Drawing.Point(28, 40)
|
||||
Me.Label6.Name = "Label6"
|
||||
Me.Label6.Size = New System.Drawing.Size(243, 15)
|
||||
Me.Label6.TabIndex = 1
|
||||
Me.Label6.Text = "Detaileinstellungen nach Speichern im Profil"
|
||||
Me.Label6.Visible = False
|
||||
'
|
||||
'frmDIProfilHinzufuegen
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
|
||||
@@ -121,17 +121,17 @@
|
||||
<data name="btnBackupverzeichnisLöschen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m
|
||||
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIySURBVDhPlZJrTxNBFIaJicnG36BWiYbISkDiDaEt
|
||||
C5TWBgQT6P1Cu5UC0pZe0qZQG/WDJv4SfxeIir1hpbu97Pb1TEmXbvqJD08yc2be98w5Z0YAXIvmlnhr
|
||||
cK87RCZnIHhdbIBmMMzLXn+i4XCb+rGrC0ycO0Q3m4eaSA2ZNAMhvhmKoLWzh39vN77XV9cesbhOjOIn
|
||||
dAk1mUFnd18zkf1bPGVHJ5YACkWw9bnVnqguWG5cGqSzXDeZUbuHH4Cv36DmC8wArZDIy74gT9nR3o8D
|
||||
dC4HQzhffq1UhaWbVy8g1HiSU97HFTWTAz5/gZLOohmOgLKjvRcD8ke9dc1iI/Ei19dpBoxOdJdridtK
|
||||
J3ZA5XwEjookLAC5PGRfALUlq1KdX9DEDJ0Bg57LSR6/ijyV4w0ALi+QyaK2uKxWzIJOzNBtGJLbx0YF
|
||||
0DTgcAMbTuAgRXXbUJqZG5qObiO5vLzk8aEdiQKpDAnTQJzKoQbKm05UjWb8nprWmWiLhtPDS24v2uI2
|
||||
QGOUXB5Qs5TynEm9WF0HojtovFlH6elznI6NayaXYoebp+xoh99R1iQkejo1SynPmrjSixnubPqZUrdY
|
||||
gbCIC5sdZxOTOLk32jPpGdDPEhoOF9ohEdKmC9QspfzKqDXs18QU93P8sfLXLECyr+DP5BMc3zEImgGD
|
||||
fpZQX1lDxTSvUrOGun36cIz7MfpAGRQzdJcqRrNQejk7JO5zYrjPHd++q4kZugvXByP/AXK7pMeJCyzg
|
||||
AAAAAElFTkSuQmCC
|
||||
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAItSURBVDhPnZHbThNhFEaJicnEZ1BRojEyEpB4QqBl
|
||||
OBUbEEig9FymRU5CDzBpMxwa8UITn8TnAlGxtFSgM6Wd6TIFHanjjV58yfcn/1rJ3rsJaPqXlGdj1y6/
|
||||
Gz8omWaUjPgnZMGRqKgHQomSx+ewC+pwZoNaWsVMrNkk5bAsluU5zhaXOZmc+ng8Nn7/t+AnTHaHWnYH
|
||||
M6VQXVqxJHpoVixHolRXE7CVpd6LLnei0D905UKwnhZqKcWsbWzD+w+Y6lZdwJkcE/VgRCyHZSorcdjY
|
||||
Ro/IFIdfGAVp8GrDCGY8JRiv44apZODtO4z1NOXoHHpolsryKqib5/1oaMQoSAOCfQfQVF1YEs5i80Z1
|
||||
NQnZN7CZBXULMip6MMzRoMso9PVbsE1QTzksC5o/ZKJuQyAM3gAoaY4Ghs28U2qA/yrQfMH6qSCtgscH
|
||||
UzOQXKM4PEKuq8d2nUbYGxA1f5DK3AKsKZBch3gSVuLo0zMUep187ehskFilNOMXNV+ASmweUgqa109B
|
||||
GjAOexzm6dgELCxSejlB7tET9u+1WpIL2OMTNW+ASvQVJFNoHh+Fvn7jsNsh5J52CQedj43jIRdEY5yO
|
||||
uDloa2fvVsu55FxwMjkllTxeKnIMbdpL3ikZh897rYV9aesQPrc+ML47JTT3KN/aH7J7o1lqGKHockvH
|
||||
o+PkHX1mrqvHtu39u/eETy13jMtwg6CefK9Tyj3rtsG/std8W9i9ftOCbYL/yQ9yu6TH5dYZBAAAAABJ
|
||||
RU5ErkJggg==
|
||||
</value>
|
||||
</data>
|
||||
<metadata name="dlgQuellordner.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
@@ -146,33 +146,33 @@
|
||||
<data name="btnZielverzeichnisLöschen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m
|
||||
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIySURBVDhPlZJrTxNBFIaJicnG36BWiYbISkDiDaEt
|
||||
C5TWBgQT6P1Cu5UC0pZe0qZQG/WDJv4SfxeIir1hpbu97Pb1TEmXbvqJD08yc2be98w5Z0YAXIvmlnhr
|
||||
cK87RCZnIHhdbIBmMMzLXn+i4XCb+rGrC0ycO0Q3m4eaSA2ZNAMhvhmKoLWzh39vN77XV9cesbhOjOIn
|
||||
dAk1mUFnd18zkf1bPGVHJ5YACkWw9bnVnqguWG5cGqSzXDeZUbuHH4Cv36DmC8wArZDIy74gT9nR3o8D
|
||||
dC4HQzhffq1UhaWbVy8g1HiSU97HFTWTAz5/gZLOohmOgLKjvRcD8ke9dc1iI/Ei19dpBoxOdJdridtK
|
||||
J3ZA5XwEjookLAC5PGRfALUlq1KdX9DEDJ0Bg57LSR6/ijyV4w0ALi+QyaK2uKxWzIJOzNBtGJLbx0YF
|
||||
0DTgcAMbTuAgRXXbUJqZG5qObiO5vLzk8aEdiQKpDAnTQJzKoQbKm05UjWb8nprWmWiLhtPDS24v2uI2
|
||||
QGOUXB5Qs5TynEm9WF0HojtovFlH6elznI6NayaXYoebp+xoh99R1iQkejo1SynPmrjSixnubPqZUrdY
|
||||
gbCIC5sdZxOTOLk32jPpGdDPEhoOF9ohEdKmC9QspfzKqDXs18QU93P8sfLXLECyr+DP5BMc3zEImgGD
|
||||
fpZQX1lDxTSvUrOGun36cIz7MfpAGRQzdJcqRrNQejk7JO5zYrjPHd++q4kZugvXByP/AXK7pMeJCyzg
|
||||
AAAAAElFTkSuQmCC
|
||||
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAItSURBVDhPnZHbThNhFEaJicnEZ1BRojEyEpB4QqBl
|
||||
OBUbEEig9FymRU5CDzBpMxwa8UITn8TnAlGxtFSgM6Wd6TIFHanjjV58yfcn/1rJ3rsJaPqXlGdj1y6/
|
||||
Gz8omWaUjPgnZMGRqKgHQomSx+ewC+pwZoNaWsVMrNkk5bAsluU5zhaXOZmc+ng8Nn7/t+AnTHaHWnYH
|
||||
M6VQXVqxJHpoVixHolRXE7CVpd6LLnei0D905UKwnhZqKcWsbWzD+w+Y6lZdwJkcE/VgRCyHZSorcdjY
|
||||
Ro/IFIdfGAVp8GrDCGY8JRiv44apZODtO4z1NOXoHHpolsryKqib5/1oaMQoSAOCfQfQVF1YEs5i80Z1
|
||||
NQnZN7CZBXULMip6MMzRoMso9PVbsE1QTzksC5o/ZKJuQyAM3gAoaY4Ghs28U2qA/yrQfMH6qSCtgscH
|
||||
UzOQXKM4PEKuq8d2nUbYGxA1f5DK3AKsKZBch3gSVuLo0zMUep187ehskFilNOMXNV+ASmweUgqa109B
|
||||
GjAOexzm6dgELCxSejlB7tET9u+1WpIL2OMTNW+ASvQVJFNoHh+Fvn7jsNsh5J52CQedj43jIRdEY5yO
|
||||
uDloa2fvVsu55FxwMjkllTxeKnIMbdpL3ikZh897rYV9aesQPrc+ML47JTT3KN/aH7J7o1lqGKHockvH
|
||||
o+PkHX1mrqvHtu39u/eETy13jMtwg6CefK9Tyj3rtsG/std8W9i9ftOCbYL/yQ9yu6TH5dYZBAAAAABJ
|
||||
RU5ErkJggg==
|
||||
</value>
|
||||
</data>
|
||||
<data name="btnQuellverzeichnisLöschen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m
|
||||
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIySURBVDhPlZJrTxNBFIaJicnG36BWiYbISkDiDaEt
|
||||
C5TWBgQT6P1Cu5UC0pZe0qZQG/WDJv4SfxeIir1hpbu97Pb1TEmXbvqJD08yc2be98w5Z0YAXIvmlnhr
|
||||
cK87RCZnIHhdbIBmMMzLXn+i4XCb+rGrC0ycO0Q3m4eaSA2ZNAMhvhmKoLWzh39vN77XV9cesbhOjOIn
|
||||
dAk1mUFnd18zkf1bPGVHJ5YACkWw9bnVnqguWG5cGqSzXDeZUbuHH4Cv36DmC8wArZDIy74gT9nR3o8D
|
||||
dC4HQzhffq1UhaWbVy8g1HiSU97HFTWTAz5/gZLOohmOgLKjvRcD8ke9dc1iI/Ei19dpBoxOdJdridtK
|
||||
J3ZA5XwEjookLAC5PGRfALUlq1KdX9DEDJ0Bg57LSR6/ijyV4w0ALi+QyaK2uKxWzIJOzNBtGJLbx0YF
|
||||
0DTgcAMbTuAgRXXbUJqZG5qObiO5vLzk8aEdiQKpDAnTQJzKoQbKm05UjWb8nprWmWiLhtPDS24v2uI2
|
||||
QGOUXB5Qs5TynEm9WF0HojtovFlH6elznI6NayaXYoebp+xoh99R1iQkejo1SynPmrjSixnubPqZUrdY
|
||||
gbCIC5sdZxOTOLk32jPpGdDPEhoOF9ohEdKmC9QspfzKqDXs18QU93P8sfLXLECyr+DP5BMc3zEImgGD
|
||||
fpZQX1lDxTSvUrOGun36cIz7MfpAGRQzdJcqRrNQejk7JO5zYrjPHd++q4kZugvXByP/AXK7pMeJCyzg
|
||||
AAAAAElFTkSuQmCC
|
||||
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAItSURBVDhPnZHbThNhFEaJicnEZ1BRojEyEpB4QqBl
|
||||
OBUbEEig9FymRU5CDzBpMxwa8UITn8TnAlGxtFSgM6Wd6TIFHanjjV58yfcn/1rJ3rsJaPqXlGdj1y6/
|
||||
Gz8omWaUjPgnZMGRqKgHQomSx+ewC+pwZoNaWsVMrNkk5bAsluU5zhaXOZmc+ng8Nn7/t+AnTHaHWnYH
|
||||
M6VQXVqxJHpoVixHolRXE7CVpd6LLnei0D905UKwnhZqKcWsbWzD+w+Y6lZdwJkcE/VgRCyHZSorcdjY
|
||||
Ro/IFIdfGAVp8GrDCGY8JRiv44apZODtO4z1NOXoHHpolsryKqib5/1oaMQoSAOCfQfQVF1YEs5i80Z1
|
||||
NQnZN7CZBXULMip6MMzRoMso9PVbsE1QTzksC5o/ZKJuQyAM3gAoaY4Ghs28U2qA/yrQfMH6qSCtgscH
|
||||
UzOQXKM4PEKuq8d2nUbYGxA1f5DK3AKsKZBch3gSVuLo0zMUep187ehskFilNOMXNV+ASmweUgqa109B
|
||||
GjAOexzm6dgELCxSejlB7tET9u+1WpIL2OMTNW+ASvQVJFNoHh+Fvn7jsNsh5J52CQedj43jIRdEY5yO
|
||||
uDloa2fvVsu55FxwMjkllTxeKnIMbdpL3ikZh897rYV9aesQPrc+ML47JTT3KN/aH7J7o1lqGKHockvH
|
||||
o+PkHX1mrqvHtu39u/eETy13jMtwg6CefK9Tyj3rtsG/std8W9i9ftOCbYL/yQ9yu6TH5dYZBAAAAABJ
|
||||
RU5ErkJggg==
|
||||
</value>
|
||||
</data>
|
||||
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
|
||||
@@ -68,17 +68,9 @@ Public Class frmNIHauptseite
|
||||
_windreamNI = New ClassNIWindream(_MyLogger)
|
||||
database = New ClassNIDatenbankzugriff(_MyLogger)
|
||||
|
||||
|
||||
' 3b. Windream initialisieren (Connection, Session, ... aufbauen)
|
||||
If _windreamNI.Init() = False Then
|
||||
_Logger.Warn("Die Windream-Klasse konnte nicht initialisiert werden. Windream-Client unvollständig gestartert.")
|
||||
Exit Sub
|
||||
|
||||
End If
|
||||
'ClassMoveRenameLogger.Init("", "MoveRename_", True)
|
||||
|
||||
|
||||
|
||||
AddHandler bwProfil.DoWork, AddressOf bwProfil_DoWork
|
||||
AddHandler bwProfil.RunWorkerCompleted, AddressOf bwProfil_RunWorkerCompleted
|
||||
AddHandler bwProfil.ProgressChanged, AddressOf bwProfil_ProgressChanged
|
||||
@@ -932,9 +924,9 @@ Public Class frmNIHauptseite
|
||||
_Logger.Debug(">> _fulltext initialized.")
|
||||
fulltext = pMyWMDoc.GetVariableValue(aktivesProfil.Desk_windreamIndex)
|
||||
If Len(fulltext) > 0 Then
|
||||
_Logger.Info($"{aktivesProfil.Desk_windreamIndex} is empty...")
|
||||
_Logger.Info($"Volltext aus [{aktivesProfil.Desk_windreamIndex}] erfolgreich extrahiert.")
|
||||
Else
|
||||
_Logger.Info($"## No fulltext from [{aktivesProfil.Desk_windreamIndex}] extracted!")
|
||||
_Logger.Info($"## Kein Volltext aus [{aktivesProfil.Desk_windreamIndex}] extrahiert - versuche 'Manueller Volltext'...")
|
||||
fulltext = pMyWMDoc.GetVariableValue("Manueller Volltext")
|
||||
End If
|
||||
If Len(fulltext) > 0 Then
|
||||
@@ -1921,7 +1913,7 @@ Public Class frmNIHauptseite
|
||||
If adReworkOk = False Then
|
||||
_Logger.Warn($"## Nachbearbeitung AD für [{pMyWMDoc.aName}] fehlgeschlagen - Error-Index wird gesetzt")
|
||||
File_SetBooleanIndex(True, pMyWMDoc, aktivesProfil.IndexValidation)
|
||||
SetErrorMeldung("Rechtevergabe fehlgeschlagen", pMyWMDoc, aktivesProfil.IndexFehler)
|
||||
File_SetBooleanIndex(True, pMyWMDoc, aktivesProfil.IndexFehler)
|
||||
End If
|
||||
Else
|
||||
If aktivesProfil.NachbearbeitungAD = True Then
|
||||
@@ -2555,12 +2547,22 @@ Public Class frmNIHauptseite
|
||||
'Ab Hier Error prüfen
|
||||
Sub File_SetBooleanIndex(ByVal _value As Boolean, ByVal _dok As WINDREAMLib.WMObject, ByVal _Indexname As String)
|
||||
Try
|
||||
_Logger.Debug($"File_SetBooleanIndex called: Index=[{_Indexname}] Value=[{_value}] Doc=[{If(_dok IsNot Nothing, _dok.aName, "NULL")}]")
|
||||
If _Indexname <> "" Then
|
||||
'Überprüfen ob Boolean-Value bereits gesetzt wurde?
|
||||
Dim akt_Status As Boolean = CBool(_dok.GetVariableValue(_Indexname))
|
||||
Dim akt_Status As Boolean = False
|
||||
Try
|
||||
Dim rawValue As Object = _dok.GetVariableValue(_Indexname)
|
||||
_Logger.Debug($"File_SetBooleanIndex: rawValue=[{If(rawValue IsNot Nothing, rawValue.ToString, "NULL")}]")
|
||||
If rawValue IsNot Nothing Then
|
||||
akt_Status = CBool(rawValue)
|
||||
End If
|
||||
Catch ex As Exception
|
||||
_Logger.Debug($"File_SetBooleanIndex: GetVariableValue threw exception - treating as False. Error: {ex.Message}")
|
||||
akt_Status = False
|
||||
End Try
|
||||
If akt_Status <> _value Then
|
||||
'Index muß angepasst werden
|
||||
_Logger.Debug("Validation Index not set to '" & _value.ToString & "'.")
|
||||
_Logger.Debug($"File_SetBooleanIndex: writing [{_value}] to index [{_Indexname}]")
|
||||
Dim arrIndex() As String = Nothing
|
||||
Dim arrValue() As String = Nothing
|
||||
'Nun die Datei indexieren
|
||||
@@ -2585,6 +2587,8 @@ Public Class frmNIHauptseite
|
||||
'Validation muß nicht angepasst werden
|
||||
_Logger.Debug("Validation Index already set to '" & _value & "'.")
|
||||
End If
|
||||
Else
|
||||
_Logger.Warn($"File_SetBooleanIndex: _Indexname is empty - no index written! (Doc=[{If(_dok IsNot Nothing, _dok.aName, "NULL")}] Value=[{_value}])")
|
||||
End If
|
||||
Catch ex As Exception
|
||||
_Logger.Warn("Error in File_SetBooleanIndex")
|
||||
|
||||
@@ -635,7 +635,7 @@ Partial Class frmNIProfileigenschaften
|
||||
Me.GroupBox1.Size = New System.Drawing.Size(624, 83)
|
||||
Me.GroupBox1.TabIndex = 70
|
||||
Me.GroupBox1.TabStop = False
|
||||
Me.GroupBox1.Text = "Indexname - Nachindexierung fehlerhaft:"
|
||||
Me.GroupBox1.Text = "Indexname - Nachindexierung/Nachbearbeitung fehlerhaft:"
|
||||
'
|
||||
'Label6
|
||||
'
|
||||
@@ -701,7 +701,7 @@ Partial Class frmNIProfileigenschaften
|
||||
Me.GroupBox2.Size = New System.Drawing.Size(624, 83)
|
||||
Me.GroupBox2.TabIndex = 75
|
||||
Me.GroupBox2.TabStop = False
|
||||
Me.GroupBox2.Text = "Dauerhafte Kennzeichnung - Fehler bei Indexierung:"
|
||||
Me.GroupBox2.Text = "Dauerhafte Kennzeichnung - Fehler bei Nachindexierung/Nachbearbeitung:"
|
||||
'
|
||||
'Label8
|
||||
'
|
||||
@@ -1007,7 +1007,6 @@ Partial Class frmNIProfileigenschaften
|
||||
'
|
||||
Me.grpbxMORE.Controls.Add(Me.btnMoveRename)
|
||||
Me.grpbxMORE.Controls.Add(Me.Label21)
|
||||
Me.grpbxMORE.Enabled = False
|
||||
Me.grpbxMORE.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.grpbxMORE.Location = New System.Drawing.Point(6, 104)
|
||||
Me.grpbxMORE.Name = "grpbxMORE"
|
||||
|
||||
@@ -161,7 +161,7 @@ einen Startindex erhält, der nicht in der Datenbank existiert. Diese Kennzeichn
|
||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAK
|
||||
CQAAAk1TRnQBSQFMAgEBAgEAAdABAAHQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
CQAAAk1TRnQBSQFMAgEBAgEAAeABAAHgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
||||
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
||||
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
||||
|
||||
@@ -1109,11 +1109,6 @@ Public Class frmNIProfileigenschaften
|
||||
End Sub
|
||||
|
||||
Private Sub frmNIProfileigenschaften_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
If LICENSE_MoveRename = True Then
|
||||
grpbxMORE.Enabled = True
|
||||
Else
|
||||
grpbxMORE.Enabled = False
|
||||
End If
|
||||
If Me._selectedProfile Is Nothing Then
|
||||
Me.pnlProfileigenschaften.Visible = False
|
||||
Else
|
||||
|
||||
5
ToolCollection/frmNIVerknuepfungen.Designer.vb
generated
5
ToolCollection/frmNIVerknuepfungen.Designer.vb
generated
@@ -1461,9 +1461,10 @@ Partial Class frmNIVerknuepfungen
|
||||
Me.Label27.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.Label27.Location = New System.Drawing.Point(7, 14)
|
||||
Me.Label27.Name = "Label27"
|
||||
Me.Label27.Size = New System.Drawing.Size(120, 13)
|
||||
Me.Label27.Size = New System.Drawing.Size(761, 13)
|
||||
Me.Label27.TabIndex = 22
|
||||
Me.Label27.Text = "2. Regular Expression:"
|
||||
Me.Label27.Text = "2. Regular Expression: ACHTUNG: REGEX DARF NUR AUS EINER MATCHING GROUP BESTEHEN," &
|
||||
" DA ES SONST FEHLER BEIM INDEXIEREN VERURSACHT!"
|
||||
'
|
||||
'GroupBox4
|
||||
'
|
||||
|
||||
@@ -486,25 +486,23 @@ Public Class frmNIVerknuepfungen
|
||||
''' </summary>
|
||||
''' <remarks></remarks>
|
||||
Private Sub cmbProfilauswahl_DropDownItemClicked(ByVal sender As System.Object, ByVal e As System.Windows.Forms.ToolStripItemClickedEventArgs) Handles cmbProfilauswahl.DropDownItemClicked
|
||||
ClassNIProfile.aktivesProfil = ClassNIProfile.getProfilByName(e.ClickedItem.Text)
|
||||
Me._selectedProfil = ClassNIProfile.aktivesProfil
|
||||
Try
|
||||
'wenn noch kein Profil geladen wurde soll das ausgewählte auf jeden Fall geladen werden
|
||||
If Me._selectedProfil IsNot Nothing Then
|
||||
Me.LoadSelectedProfile(e.ClickedItem.Text)
|
||||
Me.pnlZielQuelle.Enabled = True
|
||||
Else ' wenn bereits ein Profil geladen war
|
||||
If e.ClickedItem.Text = Me._selectedProfil.Profilname Then Exit Sub
|
||||
If Me._selectedProfil.HasChanges Then
|
||||
Me._selectedProfil.Save(True, "profile")
|
||||
End If
|
||||
' wenn ein anderes Profil ausgewählt wurde
|
||||
If Not e.ClickedItem.Text = Me._selectedProfil.OriginalProfilname Then
|
||||
Me.LoadSelectedProfile(e.ClickedItem.Text)
|
||||
Else
|
||||
'MsgBox("Keine Änderung")
|
||||
End If
|
||||
End If
|
||||
|
||||
Me.LoadSelectedProfile(e.ClickedItem.Text)
|
||||
Me.pnlZielQuelle.Enabled = True
|
||||
|
||||
For i = 0 To arrProfile.GetUpperBound(0)
|
||||
If arrProfile(i, 0) = e.ClickedItem.Text Then
|
||||
_pos = arrProfile(i, 1)
|
||||
End If
|
||||
Next
|
||||
|
||||
Catch ex As Exception
|
||||
MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei der Auswahl der Profile")
|
||||
End Try
|
||||
|
||||
1
ToolCollection/frmStart.Designer.vb
generated
1
ToolCollection/frmStart.Designer.vb
generated
@@ -282,6 +282,7 @@ Partial Class frmStart
|
||||
Me.grbxMoRe.TabIndex = 4
|
||||
Me.grbxMoRe.TabStop = False
|
||||
Me.grbxMoRe.Text = "Move and Rename"
|
||||
Me.grbxMoRe.Visible = False
|
||||
'
|
||||
'btnOpen_MoReProfile
|
||||
'
|
||||
|
||||
@@ -5,6 +5,7 @@ Imports DigitalData.Modules.Logging
|
||||
Imports System.IO
|
||||
Imports DigitalData.Modules.Database
|
||||
Imports System.Text.RegularExpressions
|
||||
Imports System.ComponentModel
|
||||
|
||||
Public Class frmStart
|
||||
Private _MyLogger As LogConfig
|
||||
@@ -127,6 +128,18 @@ Public Class frmStart
|
||||
Dim result As MsgBoxResult = MsgBox("Sind Sie sicher, dass sie " & Application.ProductName & " wirklich schließen wollen?" & vbNewLine & "Alle Vorgänge/Module werden gestoppt und nicht mehr ausgeführt!", MsgBoxStyle.YesNo, "Bestätigung erforderlich:")
|
||||
If result = MsgBoxResult.No Then
|
||||
e.Cancel = True
|
||||
Return ' ← wichtig: hier sofort raus, kein Logout
|
||||
End If
|
||||
|
||||
If Not IsNothing(CURRENToWMSession) Then
|
||||
_Logger.Debug("Closing frmStart - Now logging out of windream session...")
|
||||
Try
|
||||
CURRENToWMSession.Logout()
|
||||
_Logger.Debug("windream session logged out successfully.")
|
||||
Catch ex As Exception
|
||||
_Logger.Warn("Error while logging out windream session: " & ex.Message)
|
||||
_Logger.Error(ex)
|
||||
End Try
|
||||
End If
|
||||
End Sub
|
||||
|
||||
@@ -313,7 +326,6 @@ Public Class frmStart
|
||||
Public Sub ClearGroupBoxes()
|
||||
Me.grbDI.Visible = False
|
||||
Me.GBNachindexierung.Visible = False
|
||||
Me.GroupBoxIntegration.Visible = False
|
||||
Me.grbxMoRe.Visible = False
|
||||
LICENSE_MoveRename = False
|
||||
LICENSE_AD = False
|
||||
|
||||
Reference in New Issue
Block a user