From c754da55841f26a1506a913610448bbfc747a521 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 18 May 2020 16:14:53 +0200 Subject: [PATCH] make doctype_id unique for regex_doctype --- Global_Indexer/MyDataset.Designer.vb | 2 + Global_Indexer/MyDataset.xsd | 90 ++++++++++---------- Global_Indexer/MyDataset.xss | 2 +- Global_Indexer/frmAdministration.Designer.vb | 1 + Global_Indexer/frmConfig_Basic.vb | 1 + Global_Indexer/frmIndex.vb | 15 ++-- 6 files changed, 60 insertions(+), 51 deletions(-) diff --git a/Global_Indexer/MyDataset.Designer.vb b/Global_Indexer/MyDataset.Designer.vb index 7c9f9a2..04c2d7c 100644 --- a/Global_Indexer/MyDataset.Designer.vb +++ b/Global_Indexer/MyDataset.Designer.vb @@ -11140,6 +11140,7 @@ Partial Public Class MyDataset Me.columnCHANGED_WHEN = New Global.System.Data.DataColumn("CHANGED_WHEN", GetType(Date), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnCHANGED_WHEN) Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true)) + Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint2", New Global.System.Data.DataColumn() {Me.columnDOCTYPE_ID}, false)) Me.columnGUID.AutoIncrement = true Me.columnGUID.AutoIncrementSeed = 1 Me.columnGUID.AllowDBNull = false @@ -11147,6 +11148,7 @@ Partial Public Class MyDataset Me.columnGUID.Unique = true Me.columnREGEX.AllowDBNull = false Me.columnREGEX.MaxLength = 500 + Me.columnDOCTYPE_ID.Unique = true Me.columnADDED_WHO.AllowDBNull = false Me.columnADDED_WHO.MaxLength = 50 Me.columnCHANGED_WHO.MaxLength = 50 diff --git a/Global_Indexer/MyDataset.xsd b/Global_Indexer/MyDataset.xsd index 6ebf2c5..00b8cd1 100644 --- a/Global_Indexer/MyDataset.xsd +++ b/Global_Indexer/MyDataset.xsd @@ -1694,7 +1694,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1759,7 +1759,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1842,7 +1842,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1879,7 +1879,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1893,7 +1893,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1907,7 +1907,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1989,7 +1989,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2062,7 +2062,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2175,7 +2175,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2271,7 +2271,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2326,7 +2326,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2334,7 +2334,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2384,7 +2384,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2456,7 +2456,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2537,7 +2537,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2551,7 +2551,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2560,7 +2560,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2585,7 +2585,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2624,7 +2624,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2696,7 +2696,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2735,7 +2735,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2749,7 +2749,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2795,7 +2795,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2855,7 +2855,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2887,7 +2887,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2925,7 +2925,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2947,7 +2947,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2959,7 +2959,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -3092,24 +3092,28 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Global_Indexer/MyDataset.xss b/Global_Indexer/MyDataset.xss index a1a0e4c..fafc93c 100644 --- a/Global_Indexer/MyDataset.xss +++ b/Global_Indexer/MyDataset.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/Global_Indexer/frmAdministration.Designer.vb b/Global_Indexer/frmAdministration.Designer.vb index a79e554..b768390 100644 --- a/Global_Indexer/frmAdministration.Designer.vb +++ b/Global_Indexer/frmAdministration.Designer.vb @@ -1274,6 +1274,7 @@ Partial Class frmAdministration Me.GUIDTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "GUID", True)) resources.ApplyResources(Me.GUIDTextBox1, "GUIDTextBox1") Me.GUIDTextBox1.Name = "GUIDTextBox1" + Me.GUIDTextBox1.ReadOnly = True ' 'VKT_PREVENT_MULTIPLE_VALUESCheckbox ' diff --git a/Global_Indexer/frmConfig_Basic.vb b/Global_Indexer/frmConfig_Basic.vb index 845a61b..f314361 100644 --- a/Global_Indexer/frmConfig_Basic.vb +++ b/Global_Indexer/frmConfig_Basic.vb @@ -359,6 +359,7 @@ Public Class frmConfig_Basic 'SaveConfigValue("LogErrorsOnly", chkLogErrorsOnly.Checked) LOGGER.Info(" >> LogErrorsOnly changed to '" & chkLogErrorsOnly.Checked) LogErrorsOnly = chkLogErrorsOnly.Checked + LOGCONFIG.Debug = Not chkLogErrorsOnly.Checked End If End Sub _ diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index 1ebe854..0ec6d93 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -1482,11 +1482,11 @@ Public Class frmIndex End Sub Private Sub frmIndex_Shown(sender As Object, e As System.EventArgs) Handles Me.Shown - Me.BringToFront() - Me.Focus() - Me.Cursor = Cursors.Default + BringToFront() + Focus() + Cursor = Cursors.Default Refresh_Dokart() - Me.pnlIndex.Controls.Clear() + pnlIndex.Controls.Clear() CURR_DELETE_ORIGIN = CONFIG.Config.DeleteOriginalFile checkItemDeleteSource.Enabled = True @@ -1494,6 +1494,7 @@ Public Class frmIndex checkItemTopMost.Checked = CONFIG.Config.TopMost TopMost = CONFIG.Config.TopMost + BringToFront() FormLoaded = True @@ -1510,7 +1511,9 @@ Public Class frmIndex 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")}") + + LOGGER.Debug("There is a match on REGEX_DOCTYPE: [{0}]", oRoW.Item("DOCTYPE")) + LOGGER.Debug("Regex: [{0}], FileName: [{1}]", oRoW.Item("Regex"), oOnlyFilename) cmbDokumentart.SelectedIndex = cmbDokumentart.FindStringExact(oRoW.Item("DOCTYPE")) Exit For End If @@ -1521,8 +1524,6 @@ Public Class frmIndex LOGGER.Info(" - Unexpected error DTTBGI_REGEX_DOCTYPE - ErrorMessage: " & vbNewLine & ex.Message) LOGGER.Error(ex.Message) End Try - Me.TopMost = True - Me.BringToFront() End Sub Sub Refresh_Dokart() Try