diff --git a/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb b/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb index 545a15b7..78839a27 100644 --- a/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb +++ b/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb @@ -169,10 +169,8 @@ Public Class ClassFolderwatcher 'Die Datei übergeben Logger.Info(">> OnCreated-File:" & e.FullPath) - If FileHandle.CheckDuplicateFiles(e.FullPath, "FolderWatch/Scan") Then - FileHandle.Decide_FileHandle(e.FullPath, handleType) - Else - Logger.Info(">> Folderwatcher: File already exists:" & e.FullPath) + If FileHandle.Decide_FileHandle(e.FullPath, handleType) = True Then + My.Application.Globix.NEW_FILES = True End If Catch ex As Exception diff --git a/GUIs.ZooFlow/Modules/Globix/ClassUserFiles.vb b/GUIs.ZooFlow/Modules/Globix/ClassUserFiles.vb index 6dc90677..dfb33110 100644 --- a/GUIs.ZooFlow/Modules/Globix/ClassUserFiles.vb +++ b/GUIs.ZooFlow/Modules/Globix/ClassUserFiles.vb @@ -51,7 +51,7 @@ Public Class ClassUserFiles oHash = "" End Try - oSQL = "SELECT * FROM TBGI_FILES_USER WHERE FILE_HASH = '" & oHash & "' AND WORKED = 0 ORDER BY ADDED_WHEN" + oSQL = "SELECT * FROM TBGI_FILES_USER WHERE FILE_HASH = '" & oHash & "' AND WORKED = 0 ORDER BY ADDED_WHEN" Dim oResult As DataTable = My.DatabaseECM.GetDatatable(oSQL) If oResult Is Nothing Then diff --git a/GUIs.ZooFlow/Modules/Globix/State.vb b/GUIs.ZooFlow/Modules/Globix/State.vb index 9d5e710f..737b3667 100644 --- a/GUIs.ZooFlow/Modules/Globix/State.vb +++ b/GUIs.ZooFlow/Modules/Globix/State.vb @@ -10,6 +10,7 @@ Namespace Globix Public Property CURRENT_SCAN_FOLDERWATCH As String Public Property CurrentWorkfile As Models.WorkFile Public Property INDEXING_ACTIVE As Boolean = False + Public Property NEW_FILES As Boolean = False Public Property ABORT_INDEXING As Boolean = False Public Property CURRENT_ISATTACHMENT As Boolean = False Public Property DeleteOriginalFile As Boolean = False diff --git a/GUIs.ZooFlow/My Project/AssemblyInfo.vb b/GUIs.ZooFlow/My Project/AssemblyInfo.vb index 3576174f..cefd29a4 100644 --- a/GUIs.ZooFlow/My Project/AssemblyInfo.vb +++ b/GUIs.ZooFlow/My Project/AssemblyInfo.vb @@ -32,5 +32,5 @@ Imports System.Runtime.InteropServices ' You can specify all the values or you can default the Build and Revision Numbers ' by using the '*' as shown below: ' [assembly: AssemblyVersion("1.0.*")] - - + + diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index a419c2e0..094cda1a 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -41,7 +41,7 @@ Partial Class frmFlowForm Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) Me.PictureBoxPM = New DevExpress.XtraEditors.SvgImageBox() Me.PictureBoxSearch = New DevExpress.XtraEditors.SvgImageBox() - Me.TimerFolderwatch = New System.Windows.Forms.Timer(Me.components) + Me.TimerCheckFolderWatchTable = New System.Windows.Forms.Timer(Me.components) Me.pnlQuicksearch1 = New System.Windows.Forms.Panel() Me.txtQuicksearch1 = New DevExpress.XtraEditors.TextEdit() Me.PictureEditQuicksearch1 = New DevExpress.XtraEditors.PictureEdit() @@ -184,9 +184,9 @@ Partial Class frmFlowForm Me.PictureBoxSearch.Text = "X" Me.ToolTip1.SetToolTip(Me.PictureBoxSearch, "FlowSearch öffnen") ' - 'TimerFolderwatch + 'TimerCheckFolderWatchTable ' - Me.TimerFolderwatch.Interval = 2000 + Me.TimerCheckFolderWatchTable.Interval = 2000 ' 'pnlQuicksearch1 ' @@ -554,7 +554,7 @@ Partial Class frmFlowForm Friend WithEvents ZooFlowBeendenToolStripMenuItem As ToolStripMenuItem Friend WithEvents ToolTip1 As ToolTip Friend WithEvents ToolStripSeparator1 As ToolStripSeparator - Friend WithEvents TimerFolderwatch As Timer + Friend WithEvents TimerCheckFolderWatchTable As Timer Friend WithEvents TestToolStripMenuItem As ToolStripMenuItem Friend WithEvents PictureBoxSearch As DevExpress.XtraEditors.SvgImageBox Friend WithEvents PictureBoxPM As DevExpress.XtraEditors.SvgImageBox diff --git a/GUIs.ZooFlow/frmFlowForm.resx b/GUIs.ZooFlow/frmFlowForm.resx index 1a234b61..ffbd0fcb 100644 --- a/GUIs.ZooFlow/frmFlowForm.resx +++ b/GUIs.ZooFlow/frmFlowForm.resx @@ -1959,11 +1959,11 @@ 468, 17 - + 567, 17 - 716, 17 + 781, 17 @@ -2039,6 +2039,6 @@ - 841, 17 + 17, 56 \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 1e592c53..a097b67c 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -834,8 +834,8 @@ Public Class frmFlowForm ShowErrorMessage(ex) End Try - If TimerFolderwatch.Enabled = False Then - TimerFolderwatch.Start() + If TimerCheckFolderWatchTable.Enabled = False Then + TimerCheckFolderWatchTable.Start() End If End If @@ -846,7 +846,7 @@ Public Class frmFlowForm My.UIConfigManager.Save() End Sub - Private Sub TimerFolderwatch_Tick(sender As Object, e As EventArgs) Handles TimerFolderwatch.Tick + Private Sub TimerFolderwatch_Tick(sender As Object, e As EventArgs) Handles TimerCheckFolderWatchTable.Tick Try ' JenneJ, 11.02.2019: @@ -864,8 +864,7 @@ Public Class frmFlowForm If My.Application.Globix.DTACTUAL_FILES.Rows.Count > 0 Then My.Application.Globix.ABORT_INDEXING = False - ' Dim fil As String - Me.TimerFolderwatch.Stop() + TimerCheckFolderWatchTable.Enabled = False For Each row As DataRow In My.Application.Globix.DTACTUAL_FILES.Rows Dim FILEGUID = row.Item("GUID") Dim oDel = String.Format("DELETE FROM TBGI_FILES_USER WHERE GUID = {0}", FILEGUID) @@ -911,7 +910,9 @@ Public Class frmFlowForm End If Next - Me.TimerFolderwatch.Start() + If TimerCheckFolderWatchTable.Enabled = False Then + TimerCheckFolderWatchTable.Start() + End If End If 'tslblFW.Visible = True Else