From 199904b69556fe25b6edb1ab5d4cea78134fa28f Mon Sep 17 00:00:00 2001 From: OlgunR Date: Tue, 6 May 2025 16:36:52 +0200 Subject: [PATCH 1/4] =?UTF-8?q?Defaultwert=20f=C3=BCr=20E-Mails=20ohne=20B?= =?UTF-8?q?etreff=20-=20frmIndex?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Global_Indexer/frmIndex.vb | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index e2f8b9f..cb9e9b2 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -922,13 +922,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 +960,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 +1005,18 @@ Public Class frmIndex CURRENT_MESSAGEID = oMessageId CURRENT_MESSAGEDATE = oDateIn - CURRENT_MESSAGESUBJECT = oSubject + + If oSubject IsNot Nothing Then + CURRENT_MESSAGESUBJECT = oSubject + Else + CURRENT_MESSAGESUBJECT = "" + 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 From 574fd88b99028a66459449a5b0d6c2d8a7f38588 Mon Sep 17 00:00:00 2001 From: OlgunR Date: Wed, 7 May 2025 13:28:09 +0200 Subject: [PATCH 2/4] =?UTF-8?q?Vor=20Profilauswahl=20pr=C3=BCfen,=20ob=20S?= =?UTF-8?q?ession=20vorhanden=20-=20frmIndex?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Global_Indexer/frmIndex.vb | 93 ++++++++++++++++++++++---------------- 1 file changed, 53 insertions(+), 40 deletions(-) diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index cb9e9b2..b0a1c90 100644 --- 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 @@ -1847,57 +1848,69 @@ 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 - Dim oSelectedItem As DocType = ComboboxDoctype.EditValue - CURRENT_DOKART_ID = oSelectedItem.Guid - CURRENT_LASTDOKART = oSelectedItem.Name + WINDREAM = New Windream(LOGCONFIG, False, WMDrive, WINDREAM_BASEPATH, True, "", "", "", "") + If Not IsNothing(WINDREAM) Then + If WINDREAM.SessionLoggedin Then - 'lblhinweis.Visible = False - ClearNotice() + Dim oSelectedItem As DocType = ComboboxDoctype.EditValue - 'lblerror.Visible = False - ClearError() + CURRENT_DOKART_ID = oSelectedItem.Guid + CURRENT_LASTDOKART = oSelectedItem.Name - pnlIndex.Controls.Clear() - Dim sql As String = "Select WINDREAM_DIRECT, ZIEL_PFAD, DUPLICATE_HANDLING from TBDD_DOKUMENTART WHERE GUID = " & oSelectedItem.Guid - Dim oDoctypes As DataTable = DATABASE_ECM.GetDatatable(sql) - - Dim oDocType As DataRow = oDoctypes.Rows.Item(0) - WMDirect = oDocType.Item("WINDREAM_DIRECT") - Dim oDestination As String = oDocType.Item("ZIEL_PFAD") - Dim oNewDestination As String - If WMDirect Then - Dim oNormalized As String = WINDREAM.GetNormalizedPath(oDestination, False) - oNewDestination = Path.Combine(WINDREAM.ClientBasePath, oNormalized) - Else - oNewDestination = oDestination - End If + 'lblhinweis.Visible = False + ClearNotice() + 'lblerror.Visible = False + ClearError() - LOGGER.Debug("Path from Database is [{0}]", oDestination) - LOGGER.Debug("Checking for path [{0}]", oNewDestination) - Dim oPathExists As Boolean - If WMDirect Then - oPathExists = WINDREAM.TestFolderExists(oNewDestination) - Else - oPathExists = Directory.Exists(oNewDestination) - End If + pnlIndex.Controls.Clear() + Dim sql As String = "Select WINDREAM_DIRECT, ZIEL_PFAD, DUPLICATE_HANDLING from TBDD_DOKUMENTART WHERE GUID = " & oSelectedItem.Guid + Dim oDoctypes As DataTable = DATABASE_ECM.GetDatatable(sql) + + Dim oDocType As DataRow = oDoctypes.Rows.Item(0) + WMDirect = oDocType.Item("WINDREAM_DIRECT") + Dim oDestination As String = oDocType.Item("ZIEL_PFAD") + Dim oNewDestination As String + If WMDirect Then + Dim oNormalized As String = WINDREAM.GetNormalizedPath(oDestination, False) + oNewDestination = Path.Combine(WINDREAM.ClientBasePath, oNormalized) + Else + oNewDestination = oDestination + End If + + + LOGGER.Debug("Path from Database is [{0}]", oDestination) + LOGGER.Debug("Checking for path [{0}]", oNewDestination) + Dim oPathExists As Boolean + If WMDirect Then + oPathExists = WINDREAM.TestFolderExists(oNewDestination) + Else + oPathExists = Directory.Exists(oNewDestination) + End If + + If oPathExists = False Then + Dim oMessage As String - If oPathExists = False Then - Dim oMessage As String + If USER_LANGUAGE = "de-DE" Then + oMessage = $"Der Pfad für das ausgewählte Profil ist nicht erreichbar:{vbNewLine}[{oNewDestination}].{vbNewLine}{vbNewLine}Bitte wählen Sie ein anderes Profil." + Else + oMessage = $"Profile Path is not available:{vbNewLine}[{oNewDestination}].{vbNewLine}{vbNewLine}Please select another profile." + End If + + MsgBox(oMessage, MsgBoxStyle.Information, Text) + ComboboxDoctype.EditValue = Nothing + Else + + CURRENT_DOKART_DUPLICATE_HANDLING = oDocType.Item("DUPLICATE_HANDLING") + Refresh_IndexeMan(oSelectedItem.Guid) + End If - If USER_LANGUAGE = "de-DE" Then - oMessage = $"Der Pfad für das ausgewählte Profil ist nicht erreichbar:{vbNewLine}[{oNewDestination}].{vbNewLine}{vbNewLine}Bitte wählen Sie ein anderes Profil." Else - oMessage = $"Profile Path is not available:{vbNewLine}[{oNewDestination}].{vbNewLine}{vbNewLine}Please select another profile." + MsgBox("Es konnte keine Session aufgebaut werden.") End If - - MsgBox(oMessage, MsgBoxStyle.Information, Text) - ComboboxDoctype.EditValue = Nothing Else - - CURRENT_DOKART_DUPLICATE_HANDLING = oDocType.Item("DUPLICATE_HANDLING") - Refresh_IndexeMan(oSelectedItem.Guid) + MsgBox("Es konnte keine Windream-Verbindung aufgebaut werden.") End If End If End Sub From 95b4fd6bd3890ac9653681cb208d2d7a161980bb Mon Sep 17 00:00:00 2001 From: OlgunR Date: Tue, 13 May 2025 14:37:01 +0200 Subject: [PATCH 3/4] Support Link aktualisiert - frmConfig_Basic --- Global_Indexer/frmConfig_Basic.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Global_Indexer/frmConfig_Basic.vb b/Global_Indexer/frmConfig_Basic.vb index c971ac1..c100595 100644 --- a/Global_Indexer/frmConfig_Basic.vb +++ b/Global_Indexer/frmConfig_Basic.vb @@ -522,7 +522,7 @@ Public Class frmConfig_Basic ' Specify that the link was visited. Me.LinkLabel1.LinkVisited = True ' Navigate to a URL. - Process.Start("https://support.digitaldata.works") + Process.Start("https://www.digitaldata.works/Support") End Sub Private Sub Label10_Click(sender As Object, e As EventArgs) Handles Label10.Click From 1b24e778aeee0cfd0a3d8bd11fe3e87d11f00a60 Mon Sep 17 00:00:00 2001 From: OlgunR Date: Thu, 15 May 2025 11:35:09 +0200 Subject: [PATCH 4/4] Support Link wird aus der DB geholt und ist nicht mehr hardcoded - frmConfigBasic --- Global_Indexer/frmConfig_Basic.designer.vb | 18 +++--- Global_Indexer/frmConfig_Basic.resx | 68 +++++++++++----------- Global_Indexer/frmConfig_Basic.vb | 21 +++++-- 3 files changed, 59 insertions(+), 48 deletions(-) diff --git a/Global_Indexer/frmConfig_Basic.designer.vb b/Global_Indexer/frmConfig_Basic.designer.vb index d5f01ca..d8850e4 100644 --- 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 diff --git a/Global_Indexer/frmConfig_Basic.resx b/Global_Indexer/frmConfig_Basic.resx index d385e85..e41ea61 100644 --- a/Global_Indexer/frmConfig_Basic.resx +++ b/Global_Indexer/frmConfig_Basic.resx @@ -427,7 +427,7 @@ 3, 3, 3, 3 - 582, 280 + 526, 275 0 @@ -447,6 +447,33 @@ 0 + + True + + + 8, 235 + + + 153, 13 + + + 49 + + + Support Portal - Digital Data + + + LinkLabel_SupportPortal + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 0 + True @@ -475,7 +502,7 @@ TabPage2 - 0 + 1 Segoe UI, 8.25pt @@ -505,7 +532,7 @@ TabPage2 - 1 + 2 Segoe UI, 8.25pt @@ -550,33 +577,6 @@ TabPage2 - 2 - - - True - - - 8, 226 - - - 153, 13 - - - 45 - - - Support Portal - Digital Data - - - LinkLabel1 - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - 3 @@ -809,7 +809,7 @@ 3, 3, 3, 3 - 526, 244 + 526, 275 1 @@ -1176,7 +1176,7 @@ ausgenommen werden sollen: 3, 3, 3, 3 - 582, 280 + 526, 275 2 @@ -1203,7 +1203,7 @@ ausgenommen werden sollen: 0, 0 - 534, 270 + 534, 301 0 @@ -1230,7 +1230,7 @@ ausgenommen werden sollen: 6, 13 - 534, 270 + 534, 301 Segoe UI, 8.25pt diff --git a/Global_Indexer/frmConfig_Basic.vb b/Global_Indexer/frmConfig_Basic.vb index c100595..7e76d0c 100644 --- 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://www.digitaldata.works/Support") + 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