AppStd/FileFlow
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove ClassDatabase, Replace with Database.MSSQL Module

Browse Source
This commit is contained in:
Jonathan Jenne
2021-09-22 16:33:24 +02:00
parent 01e0a9dcf8
commit 7e28e072df
27 changed files with 214 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Global_Indexer/frmStart.vb
View File

@@ -131,7 +131,7 @@ Public Class frmStart
Exit Sub
End If
'Erstmal alles löschen
ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')")
DATABASE_ECM.ExecuteNonQuery("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')")
If ClassFileDrop.Drop_File(e) = True Then
TimerCheckDroppedFiles.Start()
End If
@@ -159,7 +159,7 @@ Public Class frmStart
Sub Check_Dropped_Files()
Try
ClassDatabase.Execute_non_Query($"DELETE FROM TBGI_FILES_USER WHERE WORKED = 1 AND UPPER(USER@WORK) = UPPER('{Environment.UserName}')")
DATABASE_ECM.ExecuteNonQuery($"DELETE FROM TBGI_FILES_USER WHERE WORKED = 1 AND UPPER(USER@WORK) = UPPER('{Environment.UserName}')")
For Each oFiledropString As String In ClassFileDrop.FilesDropped
If oFiledropString IsNot Nothing Then
@@ -176,7 +176,7 @@ Public Class frmStart
Dim sql As String = $"SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND UPPER(USER@WORK) = UPPER('{Environment.UserName}')"
DTACTUAL_FILES = Nothing
DTACTUAL_FILES = ClassDatabase.Return_Datatable(sql, True)
DTACTUAL_FILES = DATABASE_ECM.GetDatatable(sql)
ABORT_INDEXING = False
Dim oOnlyFilesFromFilesystem = True
@@ -192,7 +192,7 @@ Public Class frmStart
LOGGER.Debug("Email Indexing Dialog closed, checking for files to be indexed")
DTACTUAL_FILES = Nothing
DTACTUAL_FILES = ClassDatabase.Return_Datatable(sql, True)
DTACTUAL_FILES = DATABASE_ECM.GetDatatable(sql)
End If
If DTACTUAL_FILES.Rows.Count = 0 Then
@@ -250,7 +250,7 @@ Public Class frmStart
Try
If START_INCOMPLETE = False Then
Dim Sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND UPPER(MODULE) = UPPER('Global-Indexer')"
ClassDatabase.Execute_non_Query(Sql, True)
DATABASE_ECM.ExecuteNonQuery(Sql)
End If
ClassWindowLocation.SaveFormLocationSize(Me)
Catch ex As Exception
@@ -320,7 +320,7 @@ Public Class frmStart
ToolStripSeparator1.Visible = False
AdministrationToolStripMenuItem.Visible = False
End If
ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')", True)
DATABASE_ECM.ExecuteNonQuery("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')")
TopMost = True
@@ -458,7 +458,7 @@ Public Class frmStart
End Sub
Private Sub TimerFolderWatch_Tick(sender As Object, e As EventArgs) Handles TimerFolderWatch.Tick
If ClassDatabase.DatabaseConnectionTimeout = True Then
If DATABASE_ECM.DBInitialized = False Then
TimerFolderWatch.Enabled = False
Dim title = "Critical Error"
@@ -487,7 +487,7 @@ Public Class frmStart
If FW_started = True Or CONFIG.Config.FolderWatchScanStarted = True Then
'Prüfen ob alle Files abgearbeitet wurden
Dim sql = "SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND HANDLE_TYPE like '%|FW%' AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')"
DTACTUAL_FILES = ClassDatabase.Return_Datatable(sql, True)
DTACTUAL_FILES = DATABASE_ECM.GetDatatable(sql)
If DTACTUAL_FILES.Rows.Count > 0 Then
ABORT_INDEXING = False
@@ -513,7 +513,7 @@ Public Class frmStart
Else
LOGGER.Info(">> File not existing - Row will be deleted!")
Dim del = String.Format("DELETE FROM TBGI_FILES_USER WHERE GUID = {0}", FILEGUID)
ClassDatabase.Execute_non_Query(del)
DATABASE_ECM.ExecuteNonQuery(del)
End If
Else
LOGGER.Info(">> file '" & row.Item(1) & "' could not be opened exclusively - fileInUse!")