From 70694273f237d00bc337749391db718f834064a3 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 30 Apr 2020 15:31:19 +0200 Subject: [PATCH] add distinct to regex doctype query, make on top button enabled by default --- Global_Indexer/frmIndex.designer.vb | 2 ++ Global_Indexer/frmIndex.resx | 2 +- Global_Indexer/frmIndex.vb | 37 ++++++++++++++++------------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/Global_Indexer/frmIndex.designer.vb b/Global_Indexer/frmIndex.designer.vb index 199fafe..a67acb3 100644 --- a/Global_Indexer/frmIndex.designer.vb +++ b/Global_Indexer/frmIndex.designer.vb @@ -164,7 +164,9 @@ Partial Class frmIndex ' 'BarCheckItem1 ' + Me.BarCheckItem1.BindableChecked = True resources.ApplyResources(Me.BarCheckItem1, "BarCheckItem1") + Me.BarCheckItem1.Checked = True Me.BarCheckItem1.Id = 5 Me.BarCheckItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarCheckItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarCheckItem1.Name = "BarCheckItem1" diff --git a/Global_Indexer/frmIndex.resx b/Global_Indexer/frmIndex.resx index 1969603..39dfa58 100644 --- a/Global_Indexer/frmIndex.resx +++ b/Global_Indexer/frmIndex.resx @@ -639,7 +639,7 @@ DocumentViewer1 - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.0.0.1, Culture=neutral, PublicKeyToken=null + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.0.3.0, Culture=neutral, PublicKeyToken=null SplitContainer1.Panel2 diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index dc3b869..427b3f5 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -1455,7 +1455,7 @@ Public Class frmIndex Load_String() - DTTBGI_REGEX_DOCTYPE = ClassDatabase.Return_Datatable("SELECT T1.DOCTYPE as DocType, T.* FROM TBGI_REGEX_DOCTYPE T, VWGI_DOCTYPE T1 WHERE T.DOCTYPE_ID = T1.DOCTYPE_ID") + DTTBGI_REGEX_DOCTYPE = ClassDatabase.Return_Datatable("SELECT DISTINCT T1.DOCTYPE as DocType, T.* FROM TBGI_REGEX_DOCTYPE T, VWGI_DOCTYPE T1 WHERE T.DOCTYPE_ID = T1.DOCTYPE_ID") MULTIFILES = ClassDatabase.Execute_Scalar("SELECT COUNT(*) FROM TBGI_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_WORKFILE_GUID & " AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')", MyConnectionString, True) MULTIINDEXING_ACTIVE = False If MULTIFILES > 0 Then @@ -1507,24 +1507,27 @@ Public Class frmIndex FormLoaded = True - If CONFIG.Config.ProfilePreselection Then - checkItemPreselection.Checked = True + Try - If CURRENT_LASTDOKART <> "" Then - cmbDokumentart.SelectedIndex = cmbDokumentart.FindStringExact(CURRENT_LASTDOKART) - End If - End If - Try - If DTTBGI_REGEX_DOCTYPE.Rows.Count > 0 Then - For Each oRoW As DataRow In DTTBGI_REGEX_DOCTYPE.Rows - Dim oOnlyFilename = Path.GetFileName(CURRENT_WORKFILE) - If Regex.IsMatch(oOnlyFilename, oRoW.Item("Regex")) Then - LOGGER.Info($"There is a match on REGEX_DOCTYPE: {oRoW.Item("DOCTYPE")}") - cmbDokumentart.SelectedIndex = cmbDokumentart.FindStringExact(oRoW.Item("DOCTYPE")) - Exit For - End If - Next + ' Letzte Auswahl merken überschreibt die automatische selektion + If CONFIG.Config.ProfilePreselection Then + checkItemPreselection.Checked = True + + If CURRENT_LASTDOKART <> "" Then + cmbDokumentart.SelectedIndex = cmbDokumentart.FindStringExact(CURRENT_LASTDOKART) + End If + Else + If DTTBGI_REGEX_DOCTYPE.Rows.Count > 0 Then + For Each oRoW As DataRow In DTTBGI_REGEX_DOCTYPE.Rows + Dim oOnlyFilename = Path.GetFileName(CURRENT_WORKFILE) + If Regex.IsMatch(oOnlyFilename, oRoW.Item("Regex")) Then + LOGGER.Info($"There is a match on REGEX_DOCTYPE: {oRoW.Item("DOCTYPE")}") + cmbDokumentart.SelectedIndex = cmbDokumentart.FindStringExact(oRoW.Item("DOCTYPE")) + Exit For + End If + Next + End If End If Catch ex As Exception LOGGER.Info(" - Unexpected error DTTBGI_REGEX_DOCTYPE - ErrorMessage: " & vbNewLine & ex.Message)