From 15e350a47036b921194a230b7955f603a3d27bc5 Mon Sep 17 00:00:00 2001
From: Digital Data - Marlon Schreiber <m.schreiber@digitaldata.works>
Date: Mon, 16 Nov 2020 17:05:53 +0100
Subject: [PATCH] MS Globix Integration 2

---
 GUIs.ZooFlow/ClassFileDrop.vb   |  2 +-
 GUIs.ZooFlow/ClassFilehandle.vb |  2 +-
 GUIs.ZooFlow/ZooFlow.vbproj     |  4 ++--
 GUIs.ZooFlow/frmFlowForm.vb     | 24 +++++++++++++++---------
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/GUIs.ZooFlow/ClassFileDrop.vb b/GUIs.ZooFlow/ClassFileDrop.vb
index 35bc37a9..2f808b6f 100644
--- a/GUIs.ZooFlow/ClassFileDrop.vb
+++ b/GUIs.ZooFlow/ClassFileDrop.vb
@@ -15,7 +15,7 @@ Public Class ClassFileDrop
             _LOGGER.Info("Available Drop Formats:")
 
             For Each oFormat As String In e.Data.GetFormats()
-                _LOGGER.Info(oFormat)
+                _LOGGER.Debug(oFormat)
             Next
 
             _LOGGER.Info(">> Drop_File")
diff --git a/GUIs.ZooFlow/ClassFilehandle.vb b/GUIs.ZooFlow/ClassFilehandle.vb
index 6d85c4bc..e719051a 100644
--- a/GUIs.ZooFlow/ClassFilehandle.vb
+++ b/GUIs.ZooFlow/ClassFilehandle.vb
@@ -151,7 +151,7 @@ Public Class ClassFilehandle
 
             Dim filename_only As String = Path.GetFileName(filename)
             Dim ins As String = "INSERT INTO TBGI_FILES_USER (FILENAME2WORK, USER@WORK,HANDLE_TYPE,FILENAME_ONLY) VALUES ('" & filename & "','" & Environment.UserName & "','" & handleType & "','" & filename_only & "')"
-            Return My.Database.ExecuteNonQuery(ins, True)
+            Return My.Database.ExecuteNonQuery(ins)
 
         Catch ex As Exception
             Return False
diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj
index 66f1dac5..48fdee0e 100644
--- a/GUIs.ZooFlow/ZooFlow.vbproj
+++ b/GUIs.ZooFlow/ZooFlow.vbproj
@@ -61,8 +61,8 @@
     <Reference Include="DigitalData.GUIs.Common">
       <HintPath>..\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Independentsoft.Msg.2.0.570.21482">
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.2.0.570.21482.dll</HintPath>
+    <Reference Include="Independentsoft.Msg">
+      <HintPath>P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\22_11_19\Independentsoft.Msg.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Office.Interop.Outlook, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb
index 8a84d5f9..6d1396d9 100644
--- a/GUIs.ZooFlow/frmFlowForm.vb
+++ b/GUIs.ZooFlow/frmFlowForm.vb
@@ -236,11 +236,9 @@ Public Class frmFlowForm
         Next
 
     End Function
-    Private Function FormLoaded_Visible(ByVal pFormName As String) As Boolean
-
-
+    Private Function FormLoaded_Visible() As Boolean
         For Each frm As Form In Application.OpenForms
-            If frm.Name.Equals(pFormName) Then
+            If frm.Name.Equals("frmSearchStart") Or frm.Name.Equals("frmGlobix_Index") Then
                 Me.Visible = False
                 Exit Function
             End If
@@ -258,7 +256,7 @@ Public Class frmFlowForm
     End Sub
 
     Private Sub TimerCheckActiveForms_Tick(sender As Object, e As EventArgs) Handles TimerCheckActiveForms.Tick
-        FormLoaded_Visible("frmSearchStart")
+        FormLoaded_Visible()
         If Me.Visible = False Then Exit Sub
     End Sub
 
@@ -332,7 +330,7 @@ Public Class frmFlowForm
 
             Dim sql As String = "SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')"
             My.Application.Globix.DTACTUAL_FILES = Nothing
-            My.Application.Globix.DTACTUAL_FILES = My.Database.GetDatatable(sql, True)
+            My.Application.Globix.DTACTUAL_FILES = My.Database.GetDatatable(sql)
             My.Application.Globix.ABORT_INDEXING = False
 
             Dim oOnlyFilesFromFilesystem = True
@@ -362,18 +360,26 @@ Public Class frmFlowForm
             Show()
         Catch ex As Exception
             MsgBox("Unexpected Error in Check_Dropped_Files:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+            Show()
         End Try
 
     End Sub
     Sub Globix_Open_IndexDialog()
         Try
-            Hide()
-            IndexForm.ShowDialog()
+
+            'Hide()
+
+            IndexForm = New frmGlobix_Index(My.LogConfig)
+            IndexForm.Show()
+            Cursor = Cursors.Default
+            If TimerCheckActiveForms.Enabled = False Then
+                TimerCheckActiveForms.Enabled = True
+            End If
         Catch ex As Exception
             Logger.Error(ex)
             MsgBox(ex.Message, MsgBoxStyle.Critical)
         Finally
-            Show()
+            ' Show()
         End Try
     End Sub
 End Class
\ No newline at end of file