Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/FileFlow

2025-05-16 11:54:33 +02:00
parent 5f965857c8 1b24e778ae
commit 1c83ed44ed
4 changed files with 124 additions and 94 deletions
--- a/Global_Indexer/frmConfig_Basic.designer.vb
+++ b/Global_Indexer/frmConfig_Basic.designer.vb
@@ -39,10 +39,10 @@ Partial Class frmConfig_Basic
        Me.txtPasswort = New System.Windows.Forms.TextBox()
        Me.BtnConnect = New System.Windows.Forms.Button()
        Me.TabPage2 = New System.Windows.Forms.TabPage()
+        Me.LinkLabel_SupportPortal = New System.Windows.Forms.LinkLabel()
        Me.Label10 = New System.Windows.Forms.Label()
        Me.Button5 = New System.Windows.Forms.Button()
        Me.cmbDesign = New System.Windows.Forms.ComboBox()
-        Me.LinkLabel1 = New System.Windows.Forms.LinkLabel()
        Me.Button3 = New System.Windows.Forms.Button()
        Me.cmbLanguage = New System.Windows.Forms.ComboBox()
        Me.Label9 = New System.Windows.Forms.Label()
@@ -172,10 +172,10 @@ Partial Class frmConfig_Basic
        '
        'TabPage2
        '
+        Me.TabPage2.Controls.Add(Me.LinkLabel_SupportPortal)
        Me.TabPage2.Controls.Add(Me.Label10)
        Me.TabPage2.Controls.Add(Me.Button5)
        Me.TabPage2.Controls.Add(Me.cmbDesign)
-        Me.TabPage2.Controls.Add(Me.LinkLabel1)
        Me.TabPage2.Controls.Add(Me.Button3)
        Me.TabPage2.Controls.Add(Me.cmbLanguage)
        Me.TabPage2.Controls.Add(Me.Label9)
@@ -188,6 +188,12 @@ Partial Class frmConfig_Basic
        Me.TabPage2.Name = "TabPage2"
        Me.TabPage2.UseVisualStyleBackColor = True
        '
+        'LinkLabel_SupportPortal
+        '
+        resources.ApplyResources(Me.LinkLabel_SupportPortal, "LinkLabel_SupportPortal")
+        Me.LinkLabel_SupportPortal.Name = "LinkLabel_SupportPortal"
+        Me.LinkLabel_SupportPortal.TabStop = True
+        '
        'Label10
        '
        resources.ApplyResources(Me.Label10, "Label10")
@@ -206,12 +212,6 @@ Partial Class frmConfig_Basic
        Me.cmbDesign.Items.AddRange(New Object() {resources.GetString("cmbDesign.Items"), resources.GetString("cmbDesign.Items1"), resources.GetString("cmbDesign.Items2"), resources.GetString("cmbDesign.Items3"), resources.GetString("cmbDesign.Items4"), resources.GetString("cmbDesign.Items5"), resources.GetString("cmbDesign.Items6")})
        Me.cmbDesign.Name = "cmbDesign"
        '
-        'LinkLabel1
-        '
-        resources.ApplyResources(Me.LinkLabel1, "LinkLabel1")
-        Me.LinkLabel1.Name = "LinkLabel1"
-        Me.LinkLabel1.TabStop = True
-        '
        'Button3
        '
        resources.ApplyResources(Me.Button3, "Button3")
@@ -424,8 +424,8 @@ Partial Class frmConfig_Basic
    Friend WithEvents cmbLanguage As System.Windows.Forms.ComboBox
    Friend WithEvents Label9 As System.Windows.Forms.Label
    Friend WithEvents Button3 As System.Windows.Forms.Button
-    Friend WithEvents LinkLabel1 As System.Windows.Forms.LinkLabel
    Friend WithEvents Label10 As Label
    Friend WithEvents Button5 As Button
    Friend WithEvents cmbDesign As ComboBox
+    Friend WithEvents LinkLabel_SupportPortal As LinkLabel
 End Class
--- a/Global_Indexer/frmConfig_Basic.resx
+++ b/Global_Indexer/frmConfig_Basic.resx
@@ -427,7 +427,7 @@
    <value>3, 3, 3, 3</value>
  </data>
  <data name="TabPage1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>582, 280</value>
+    <value>526, 275</value>
  </data>
  <data name="TabPage1.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -447,6 +447,33 @@
  <data name="&gt;&gt;TabPage1.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
+  <data name="LinkLabel_SupportPortal.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="LinkLabel_SupportPortal.Location" type="System.Drawing.Point, System.Drawing">
+    <value>8, 235</value>
+  </data>
+  <data name="LinkLabel_SupportPortal.Size" type="System.Drawing.Size, System.Drawing">
+    <value>153, 13</value>
+  </data>
+  <data name="LinkLabel_SupportPortal.TabIndex" type="System.Int32, mscorlib">
+    <value>49</value>
+  </data>
+  <data name="LinkLabel_SupportPortal.Text" xml:space="preserve">
+    <value>Support Portal - Digital Data</value>
+  </data>
+  <data name="&gt;&gt;LinkLabel_SupportPortal.Name" xml:space="preserve">
+    <value>LinkLabel_SupportPortal</value>
+  </data>
+  <data name="&gt;&gt;LinkLabel_SupportPortal.Type" xml:space="preserve">
+    <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;LinkLabel_SupportPortal.Parent" xml:space="preserve">
+    <value>TabPage2</value>
+  </data>
+  <data name="&gt;&gt;LinkLabel_SupportPortal.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
  <data name="Label10.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
@@ -475,7 +502,7 @@
    <value>TabPage2</value>
  </data>
  <data name="&gt;&gt;Label10.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
  </data>
  <data name="Button5.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt</value>
@@ -505,7 +532,7 @@
    <value>TabPage2</value>
  </data>
  <data name="&gt;&gt;Button5.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
  </data>
  <data name="cmbDesign.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt</value>
@@ -550,33 +577,6 @@
    <value>TabPage2</value>
  </data>
  <data name="&gt;&gt;cmbDesign.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="LinkLabel1.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="LinkLabel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 226</value>
-  </data>
-  <data name="LinkLabel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>153, 13</value>
-  </data>
-  <data name="LinkLabel1.TabIndex" type="System.Int32, mscorlib">
-    <value>45</value>
-  </data>
-  <data name="LinkLabel1.Text" xml:space="preserve">
-    <value>Support Portal - Digital Data</value>
-  </data>
-  <data name="&gt;&gt;LinkLabel1.Name" xml:space="preserve">
-    <value>LinkLabel1</value>
-  </data>
-  <data name="&gt;&gt;LinkLabel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;LinkLabel1.Parent" xml:space="preserve">
-    <value>TabPage2</value>
-  </data>
-  <data name="&gt;&gt;LinkLabel1.ZOrder" xml:space="preserve">
    <value>3</value>
  </data>
  <data name="Button3.Location" type="System.Drawing.Point, System.Drawing">
@@ -809,7 +809,7 @@
    <value>3, 3, 3, 3</value>
  </data>
  <data name="TabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>526, 244</value>
+    <value>526, 275</value>
  </data>
  <data name="TabPage2.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -1176,7 +1176,7 @@ ausgenommen werden sollen:</value>
    <value>3, 3, 3, 3</value>
  </data>
  <data name="TabPage3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>582, 280</value>
+    <value>526, 275</value>
  </data>
  <data name="TabPage3.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
@@ -1203,7 +1203,7 @@ ausgenommen werden sollen:</value>
    <value>0, 0</value>
  </data>
  <data name="TabControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>534, 270</value>
+    <value>534, 301</value>
  </data>
  <data name="TabControl1.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -1230,7 +1230,7 @@ ausgenommen werden sollen:</value>
    <value>6, 13</value>
  </data>
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>534, 270</value>
+    <value>534, 301</value>
  </data>
  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt</value>
--- a/Global_Indexer/frmConfig_Basic.vb
+++ b/Global_Indexer/frmConfig_Basic.vb
@@ -518,11 +518,22 @@ Public Class frmConfig_Basic
        End If
    End Sub

-    Private Sub LinkLabel1_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel1.LinkClicked
-        ' Specify that the link was visited.
-        Me.LinkLabel1.LinkVisited = True
-        ' Navigate to a URL.
-        Process.Start("https://support.digitaldata.works")
+    Private Sub LinkLabel_SupportPortal_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel_SupportPortal.LinkClicked
+        Try
+            Me.LinkLabel_SupportPortal.LinkVisited = True
+
+            Dim oSql As String = "SELECT CAT_STRING FROM TBDD_CATALOG WHERE CAT_TITLE = 'DDSUPPORT_PORTAL'"
+            Dim oSupportLink As String = DATABASE_ECM.GetScalarValue(oSql)?.ToString()
+
+            If Not String.IsNullOrEmpty(oSupportLink) Then
+                Process.Start(oSupportLink)
+            Else
+                MsgBox("Support-Link nicht gefunden.", MsgBoxStyle.Information)
+            End If
+
+        Catch ex As Exception
+            MsgBox("Fehler beim Öffnen des Support-Links: " & ex.Message, MsgBoxStyle.Critical)
+        End Try
    End Sub

    Private Sub Label10_Click(sender As Object, e As EventArgs) Handles Label10.Click
--- a/Global_Indexer/frmIndex.vb
+++ b/Global_Indexer/frmIndex.vb
@@ -11,6 +11,7 @@ Imports Limilabs.Mail
 Imports DevExpress.XtraEditors
 Imports DigitalData.GUIs.Common
 Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Windream
 'Imports DevExpress.DataAccess.Native.Json
 'Imports GdPicture.Internal.MSOfficeBinary.translator.Spreadsheet.XlsFileFormat.Records

@@ -922,13 +923,13 @@ Public Class frmIndex
                Next
            End If
            If DropType = "|OUTLOOK_MESSAGE|" Or DropType = "|FW_MSGONLY|" Or DropType = "|MSGONLY|" Or CURRENT_NEWFILENAME.ToUpper.EndsWith(".MSG") Or CURRENT_NEWFILENAME.ToUpper.EndsWith(".EML") Then
-                indexierung_erfolgreich = SetEmailIndicies(pIndexAttachment:=False)
+                indexierung_erfolgreich = SetEmailIndicies(False)
                If indexierung_erfolgreich = False Then
                    MsgBox("Error in SetEmailIndices - See log", MsgBoxStyle.Critical)
                    Return False
                End If
            ElseIf DropType = "|ATTMNTEXTRACTED|" Or DropType = "|OUTLOOK_ATTACHMENT|" Then
-                indexierung_erfolgreich = SetEmailIndicies(pIndexAttachment:=True)
+                indexierung_erfolgreich = SetEmailIndicies(True)
                If indexierung_erfolgreich = False Then
                    MsgBox("Error in SetEmailIndices - See log", MsgBoxStyle.Critical)
                    Return False
@@ -960,17 +961,18 @@ Public Class frmIndex
            Dim oTable As DataTable = DATABASE_ECM.GetDatatable(oSQL)

            If IsNothing(oTable) Then
-                _Logger.Info("Could not get Email Indicies for DocType = [{0}]. Exiting.", CURR_DOKART_OBJECTTYPE)
+                _Logger.Info("Could not get Email Indicies for OBJECTTYPE = [{0}]. Exiting.", CURR_DOKART_OBJECTTYPE)
                Return False
            End If

            If oTable.Rows.Count = 0 Then
-                LOGGER.Warn("Could not get Email Indicies for DocType = [{0}]. Exiting.")
+                LOGGER.Warn("Could not get Email Indicies for OBJECTTYPE = [{0}]. Exiting.", CURR_DOKART_OBJECTTYPE)
+                MsgBox($"Definition von Email Indizes für den Objekttyp [{oTable}] fehlt." + vbNewLine + "Bitte informieren Sie Ihren Systembetreuer.", MsgBoxStyle.Critical)
                Return False
            End If

            If oTable.Rows.Count > 1 Then
-                LOGGER.Warn("Got multiple rows for Email Indicies for DocType = [{0}]. Exiting.")
+                LOGGER.Warn("Got multiple rows for Email Indicies for OBJECTTYPE = [{0}]. Exiting.", CURR_DOKART_OBJECTTYPE)
                Return False
            End If

@@ -1004,13 +1006,18 @@ Public Class frmIndex

                CURRENT_MESSAGEID = oMessageId
                CURRENT_MESSAGEDATE = oDateIn
+
+                If oSubject IsNot Nothing Then
                    CURRENT_MESSAGESUBJECT = oSubject
+                Else
+                    CURRENT_MESSAGESUBJECT = "<No Subject>"
+                End If

                oIndexNames = New Dictionary(Of String, Object) From {
                    {"IDX_EMAIL_ID", oMessageId},
                    {"IDX_EMAIL_FROM", oMessageFrom},
                    {"IDX_EMAIL_TO", oMessageTo},
-                    {"IDX_EMAIL_SUBJECT", oSubject},
+                    {"IDX_EMAIL_SUBJECT", CURRENT_MESSAGESUBJECT},
                    {"IDX_EMAIL_DATE_IN", oDateIn}
                }
            Else
@@ -1841,6 +1848,11 @@ Public Class frmIndex

    Private Sub ComboBoxEdit1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboboxDoctype.EditValueChanged
        If ComboboxDoctype.EditValue IsNot Nothing And FormLoaded = True Then
+
+            WINDREAM = New Windream(LOGCONFIG, False, WMDrive, WINDREAM_BASEPATH, True, "", "", "", "")
+            If Not IsNothing(WINDREAM) Then
+                If WINDREAM.SessionLoggedin Then
+
                    Dim oSelectedItem As DocType = ComboboxDoctype.EditValue

                    CURRENT_DOKART_ID = oSelectedItem.Guid
@@ -1893,6 +1905,13 @@ Public Class frmIndex
                        CURRENT_DOKART_DUPLICATE_HANDLING = oDocType.Item("DUPLICATE_HANDLING")
                        Refresh_IndexeMan(oSelectedItem.Guid)
                    End If
+
+                Else
+                    MsgBox("Es konnte keine Session aufgebaut werden.")
+                End If
+            Else
+                MsgBox("Es konnte keine Windream-Verbindung aufgebaut werden.")
+            End If
        End If
    End Sub