diff --git a/Global_Indexer/ClassControls.vb b/Global_Indexer/ClassControls.vb index c964d97..4f8a658 100644 --- a/Global_Indexer/ClassControls.vb +++ b/Global_Indexer/ClassControls.vb @@ -107,7 +107,7 @@ Public Class ClassControls ' oSql = ClassPatterns.ReplaceInternalValues(oSql) ' oSql = ClassPatterns.ReplaceUserValues(oSql, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_DOKART_ID) - ' Dim oDatatable = ClassDatabase.Return_Datatable_Combined(oSql, oConnectionString, False) + ' Dim oDatatable = DATABASE_ECM.GetDatatable(.Return_Datatable_Combined(oSql, oConnectionString, False) ' oControl.DataSource = oDatatable ' End If ' Else @@ -188,7 +188,7 @@ Public Class ClassControls Try Dim indexname = cmb.Name.Replace("cmb", "") Dim sql = "SELECT GUID,NAME,SQL_RESULT FROM TBDD_INDEX_MAN where SUGGESTION = 1 AND SQL_RESULT like '%@" & indexname & "%' and DOK_ID = " & CURRENT_DOKART_ID & " ORDER BY SEQUENCE" - Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, True) + Dim DT As DataTable = DATABASE_ECM.GetDatatable(sql) If Not IsNothing(DT) Then If DT.Rows.Count > 0 Then Dim cmbname = "cmb" & DT.Rows(0).Item("NAME") @@ -215,7 +215,7 @@ Public Class ClassControls Dim NewDataset As New DataSet Dim i As Integer - Dim DT_INDEX As DataTable = ClassDatabase.Return_Datatable("select * FROM TBDD_INDEX_MAN WHERE GUID = " & INDEX_GUID, True) + Dim DT_INDEX As DataTable = DATABASE_ECM.GetDatatable("select * FROM TBDD_INDEX_MAN WHERE GUID = " & INDEX_GUID) If IsNothing(DT_INDEX) Then Exit Sub End If @@ -400,7 +400,7 @@ Public Class ClassControls Dim oMeta = DirectCast(Control.Tag, ClassControls.ControlMeta) Dim oIndexName As String = oMeta.IndexName Dim oSQL = $"SELECT * FROM TBDD_INDEX_MAN WHERE SQL_RESULT LIKE '%{oIndexName}%'" - Dim oDatatable As DataTable = ClassDatabase.Return_Datatable(oSQL) + Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable(oSQL) If Not IsNothing(oDatatable) Then LOGGER.Debug("Found [{0}] depending controls for [{1}]", oDatatable.Rows.Count, Control.Name) @@ -437,7 +437,7 @@ Public Class ClassControls End If Dim oConnectionString = ClassFormFunctions.GetConnectionString(SqlConnectionId) - Dim oDatatable As DataTable = ClassDatabase.Return_Datatable_CS(SqlCommand, oConnectionString) + Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable(SqlCommand) Dim oFoundControl As Control = Nothing For Each oControl As Control In Panel.Controls diff --git a/Global_Indexer/ClassDatatables.vb b/Global_Indexer/ClassDatatables.vb index c2d2be1..7436e3d 100644 --- a/Global_Indexer/ClassDatatables.vb +++ b/Global_Indexer/ClassDatatables.vb @@ -8,7 +8,7 @@ (DOCTYPE_ID, GROUP_ID, ADDED_WHO) VALUES ({ProfileId}, {GroupId}, '{Environment.UserName}') " - Return ClassDatabase.Execute_non_Query(oSQL, True) + Return DATABASE_ECM.ExecuteNonQuery(oSQL) Catch ex As Exception LOGGER.Error(ex) Return False @@ -18,7 +18,7 @@ Public Shared Function RemoveGroupFromProfile(GroupId As Integer, ProfileId As Integer) As Boolean Try Dim oSQL = $"DELETE FROM TBDD_USRGRP_DOKTYPE WHERE DOCTYPE_ID = {ProfileId} AND GROUP_ID = {GroupId}" - Return ClassDatabase.Execute_non_Query(oSQL, True) + Return DATABASE_ECM.ExecuteNonQuery(oSQL) Catch ex As Exception LOGGER.Error(ex) Return False @@ -36,7 +36,7 @@ WHERE DOCTYPE_ID = {ProfileId} ) " - Dim oDatatable As DataTable = ClassDatabase.Return_Datatable(oSQL) + Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable(oSQL) Return oDatatable Catch ex As Exception @@ -56,7 +56,7 @@ WHERE DOCTYPE_ID = {ProfileId} ) " - Dim oDatatable As DataTable = ClassDatabase.Return_Datatable(oSQL) + Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable(oSQL) Return oDatatable Catch ex As Exception @@ -75,7 +75,7 @@ (DOCTYPE_ID, USER_ID, ADDED_WHO) VALUES ({ProfileId}, {UserId}, '{Environment.UserName}') " - Return ClassDatabase.Execute_non_Query(oSQL, True) + Return DATABASE_ECM.ExecuteNonQuery(oSQL) Catch ex As Exception LOGGER.Error(ex) Return False @@ -85,7 +85,7 @@ Public Shared Function RemoveUserFromProfile(UserId As Integer, ProfileId As Integer) As Boolean Try Dim oSQL = $"DELETE FROM TBDD_USER_DOKTYPE WHERE DOCTYPE_ID = {ProfileId} AND USER_ID = {UserId}" - Return ClassDatabase.Execute_non_Query(oSQL, True) + Return DATABASE_ECM.ExecuteNonQuery(oSQL) Catch ex As Exception LOGGER.Error(ex) Return False @@ -102,7 +102,7 @@ WHERE DOCTYPE_ID = {ProfileId} ) " - Dim oDatatable As DataTable = ClassDatabase.Return_Datatable(oSQL) + Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable(oSQL) Return oDatatable Catch ex As Exception @@ -122,7 +122,7 @@ ) AND GUID IN (SELECT USER_ID FROM [dbo].[FNDD_GET_USER_FOR_MODULE] ('GLOBIX', 1)) " - Dim oDatatable As DataTable = ClassDatabase.Return_Datatable(oSQL) + Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable(oSQL) Return oDatatable Catch ex As Exception diff --git a/Global_Indexer/ClassEmailHeaderExtractor.vb b/Global_Indexer/ClassEmailHeaderExtractor.vb deleted file mode 100644 index 4778409..0000000 --- a/Global_Indexer/ClassEmailHeaderExtractor.vb +++ /dev/null @@ -1,105 +0,0 @@ -Imports Limilabs.Mail -Imports Limilabs.Mail.MSG -Imports System.Text.RegularExpressions - -Public Class ClassEmailHeaderExtractor - '''' - '''' Extrahiert die Headerinformationen aus einem msg Objekt mithilfe der MSG.NET Klasse - '''' - '''' Eine Email vom Typ Msg.Message - '''' Headerinformationen als String oder Nothing wenn ein Fehler aufgetreten ist. - 'Public Shared Function getMessageHeaders(msg As Msg.Message) - ' Try - ' Dim headers = msg.TransportMessageHeaders.Replace(vbCrLf, " ") - ' Return headers - ' Catch ex As Exception - ' Return Nothing - ' End Try - 'End Function - - '''' - '''' Extrahiert aus den Headerinformationen anhand einer Liste von Regular Expressions eine Absenderadresse. - '''' - '''' Headerinformationen die von getMessageHeaders erzeugt wurden. - '''' Eine Liste von Regular Expressions - '''' Die Ergebnisgruppe, die die Adresse enthält - '''' Eine Emailadresse oder Nothing, wenn keine der Regular Expressions ein Ergebnis lieferte. - 'Public Shared Function extractFromAddress(messageHeaders As String, RegexList As List(Of Regex), Optional RegexGroup As Integer = 1) - ' If IsNothing(messageHeaders) Then - ' Return Nothing - ' End If - - ' For Each rx In RegexList - ' Dim match As Match = rx.Match(messageHeaders) - ' Dim email As String = match.Groups(RegexGroup).Value - - ' If Not String.IsNullOrWhiteSpace(email) Then - ' Return email - ' End If - ' Next - - ' Return Nothing - 'End Function - 'Public Shared Function extractFromHeader(messageHeaders As String, Regex As String) - ' Try - ' Dim result = Nothing - ' Dim i As Integer = 0 - ' If IsNothing(messageHeaders) Then - ' Return Nothing - ' End If - ' ' einen Regulären Ausdruck laden - ' Dim strRegex As String = Regex - ' Dim myRegex As New Regex(strRegex, RegexOptions.IgnorePatternWhitespace Or RegexOptions.IgnoreCase) - ' Dim strTargetString As String = messageHeaders.Trim - ' ' die Vorkommen im String auslesen - ' For Each myMatch As Match In myRegex.Matches(strTargetString) - ' If myMatch.Success Then - ' LOGGER.Debug("Match success. Matched Value: [{0}]", myMatch.Value) - - ' If myMatch.Value <> "" Then - ' If i = 0 Then - ' result = myMatch.Value.ToString - ' Else - ' result = result & ";" & myMatch.Value.ToString - ' End If - ' i += 1 - ' End If - ' Else - ' LOGGER.Debug("Match failed!") - ' End If - ' Next - - ' LOGGER.Debug("Extracted value: [{0}]", result) - - ' Return result - ' Catch ex As Exception - ' LOGGER.Error(ex) - ' MsgBox("Unexpected Error in extractFromHeader: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) - ' Return Nothing - ' End Try - 'End Function - - '''' - '''' Extrahiert aus den Headerinformationen anhand einer Liste von Regular Expressions eine Empfängeradresse. - '''' - '''' Headerinformationen die von getMessageHeaders erzeugt wurden. - '''' Eine Liste von Regular Expressions - '''' Die Ergebnisgruppe, die die Adresse enthält - '''' Eine Emailadresse oder Nothing, wenn keine der Regular Expressions ein Ergebnis lieferte. - 'Public Shared Function extractToAddress(messageHeaders As String, RegexList As List(Of Regex), Optional RegexGroup As Integer = 1) - ' If IsNothing(messageHeaders) Then - ' Return Nothing - ' End If - - ' For Each rx In RegexList - ' Dim match As Match = rx.Match(messageHeaders) - ' Dim email As String = match.Groups(RegexGroup).Value - - ' If Not String.IsNullOrWhiteSpace(email) Then - ' Return email - ' End If - ' Next - - ' Return Nothing - 'End Function -End Class diff --git a/Global_Indexer/ClassFilehandle.vb b/Global_Indexer/ClassFilehandle.vb index 8945951..4394da3 100644 --- a/Global_Indexer/ClassFilehandle.vb +++ b/Global_Indexer/ClassFilehandle.vb @@ -219,7 +219,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, FILE_HASH) VALUES ('{filename}','{Environment.UserName}','{handleType}','{filename_only}', '{oHash}')" - Return ClassDatabase.Execute_non_Query(ins, True) + Return DATABASE_ECM.ExecuteNonQuery(ins) Catch ex As Exception Return False diff --git a/Global_Indexer/ClassFolderWatcher.vb b/Global_Indexer/ClassFolderWatcher.vb index d17d887..3f87a60 100644 --- a/Global_Indexer/ClassFolderWatcher.vb +++ b/Global_Indexer/ClassFolderWatcher.vb @@ -171,11 +171,6 @@ Public Class ClassFolderWatcher End If End Function Private Shared Sub OnCreated(source As Object, e As FileSystemEventArgs) - If ClassDatabase.DatabaseConnectionTimeout = True Then - LOGGER.Info(">> File handling aborted because of database timeout error!") - Exit Sub - End If - Try For Each row As DataRow In DTEXCLUDE_FILES.Rows Dim content As String = row.Item(0).ToString.ToLower diff --git a/Global_Indexer/ClassFormFunctions.vb b/Global_Indexer/ClassFormFunctions.vb index c5f8ad9..31d89a0 100644 --- a/Global_Indexer/ClassFormFunctions.vb +++ b/Global_Indexer/ClassFormFunctions.vb @@ -4,7 +4,7 @@ Public Class ClassFormFunctions Dim connectionString As String = "" Try 'Me.TBCONNECTIONTableAdapter.FillByID(Me.DD_DMSLiteDataSet.TBCONNECTION, id) - Dim DTConnection As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_CONNECTION WHERE GUID = " & id) + Dim DTConnection As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_CONNECTION WHERE GUID = " & id) If DTConnection.Rows.Count = 1 Then Dim CSType = DTConnection.Rows(0).Item("SQL_PROVIDER").ToString.ToUpper Select Case CSType diff --git a/Global_Indexer/ClassHelper.vb b/Global_Indexer/ClassHelper.vb index 1c59b15..400bc16 100644 --- a/Global_Indexer/ClassHelper.vb +++ b/Global_Indexer/ClassHelper.vb @@ -45,7 +45,7 @@ Public Class ClassHelper End Try End Function Public Shared Sub Refresh_RegexTable() - CURRENT_DT_REGEX = ClassDatabase.Return_Datatable("SELECT * FROM TBGI_FUNCTION_REGEX") + CURRENT_DT_REGEX = DATABASE_ECM.GetDatatable("SELECT * FROM TBGI_FUNCTION_REGEX") End Sub ''' diff --git a/Global_Indexer/ClassIDBData.vb b/Global_Indexer/ClassIDBData.vb index 75cecf3..3229655 100644 --- a/Global_Indexer/ClassIDBData.vb +++ b/Global_Indexer/ClassIDBData.vb @@ -9,8 +9,11 @@ ''' Public Function Init() Dim oSQL = $"SELECT * FROM VWIDB_BE_ATTRIBUTE" - DTVWIDB_BE_ATTRIBUTE = ClassDatabase.Return_Datatable_CS(oSQL, CONNECTION_STRING_IDB) + 'DTVWIDB_BE_ATTRIBUTE = ClassDatabase.Return_Datatable_CS(oSQL, CONNECTION_STRING_IDB) + DTVWIDB_BE_ATTRIBUTE = DATABASE_IDB.GetDatatable(oSQL) + Return True End Function + Public IDBSystemIndices As List(Of String) Public Function GetIndicesByBE(ByVal BusinessEntity As String) As String() Try @@ -101,7 +104,10 @@ LOGGER.Debug($"oAttributeValue for Attribute [{oAttributeName}] is so far nothing..Now trying FNIDB_PM_GET_VARIABLE_VALUE ") End If Dim oFNSQL = $"SELECT * FROM [dbo].[FNIDB_PM_GET_VARIABLE_VALUE] ({IDB_DOC_ID},'{oAttributeName}','{USER_LANGUAGE}',CONVERT(BIT,'{IDB_USES_WMFILESTORE}'))" - oAttributeValue = ClassDatabase.Return_Datatable_CS(oFNSQL, CONNECTION_STRING_IDB) + + 'oAttributeValue = ClassDatabase.Return_Datatable_CS(oFNSQL, CONNECTION_STRING_IDB) + oAttributeValue = DATABASE_IDB.GetDatatable(oFNSQL) + Dim odt As DataTable = oAttributeValue If odt.Rows.Count = 1 Then oAttributeValue = odt.Rows(0).Item(0) @@ -122,7 +128,9 @@ oID_IS_FOREIGN = 1 End If Dim oDELSQL = $"EXEC PRIDB_DELETE_TERM_OBJECT_METADATA {IDB_DOC_ID},'{oAttributeName}','{oTerm2Delete}','{USER_USERNAME}','{USER_LANGUAGE}',{oID_IS_FOREIGN}" - ClassDatabase.Execute_non_Query_ConStr(oDELSQL, CONNECTION_STRING_IDB) + + 'DATABASE_ECM.ExecuteNonQuery_ConStr(oDELSQL, CONNECTION_STRING_IDB) + DATABASE_IDB.ExecuteNonQuery(oDELSQL) Catch ex As Exception LOGGER.Error(ex) @@ -133,7 +141,9 @@ Public Function Delete_AttributeData(pIDB_OBJID As Int64, pAttributeName As String) As Object Try Dim oDELSQL = $"EXEC PRIDB_DELETE_ATTRIBUTE_DATA {pIDB_OBJID},'{pAttributeName}','{USER_USERNAME}'" - ClassDatabase.Execute_non_Query_ConStr(oDELSQL, CONNECTION_STRING_IDB) + + 'DATABASE_ECM.ExecuteNonQuery_ConStr(oDELSQL, CONNECTION_STRING_IDB) + DATABASE_IDB.ExecuteNonQuery(oDELSQL) Catch ex As Exception LOGGER.Error(ex) @@ -207,7 +217,10 @@ For Each oNewValueRow As DataRow In oDTMyNewValues.Rows Dim oSuccess As Boolean = False Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {IDB_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oNewValueRow.Item(1).ToString}','{USER_LANGUAGE}',{IDB_DOC_ID},@OMD_ID = @NEW_OBJ_MD_ID OUTPUT" - oSuccess = ClassDatabase.Execute_non_Query_ConStr(oFNSQL, CONNECTION_STRING_IDB) + + 'oSuccess = DATABASE_ECM.ExecuteNonQuery_ConStr(oFNSQL, CONNECTION_STRING_IDB) + oSuccess = DATABASE_IDB.ExecuteNonQuery(oFNSQL) + If oSuccess = False Then Return False End If @@ -215,7 +228,9 @@ Return True Else Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {IDB_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oNewValue}','{USER_LANGUAGE}',{IDB_DOC_ID},@OMD_ID = @NEW_OBJ_MD_ID OUTPUT" - Return ClassDatabase.Execute_non_Query_ConStr(oFNSQL, CONNECTION_STRING_IDB) + + 'Return DATABASE_ECM.ExecuteNonQuery_ConStr(oFNSQL, CONNECTION_STRING_IDB) + Return DATABASE_IDB.ExecuteNonQuery(oFNSQL) End If Catch ex As Exception diff --git a/Global_Indexer/ClassIndexFunctions.vb b/Global_Indexer/ClassIndexFunctions.vb index b8fa9eb..3287a57 100644 --- a/Global_Indexer/ClassIndexFunctions.vb +++ b/Global_Indexer/ClassIndexFunctions.vb @@ -33,7 +33,8 @@ Public Class ClassIndexFunctions 'If oResult.Rows.Count = 0 Then oSQL = "SELECT * FROM TBGI_HISTORY WHERE UPPER(FILE_HASH) = UPPER('" & oHash & "') ORDER BY ADDED_WHEN" - Dim oResult = ClassDatabase.Return_Datatable_CS(oSQL, MyConnectionString, True) + 'Dim oResult = ClassDatabase.Return_Datatable_CS(oSQL, MyConnectionString, True) + Dim oResult = DATABASE_ECM.GetDatatable(oSQL) If oResult Is Nothing Then Return Nothing diff --git a/Global_Indexer/ClassInit.vb b/Global_Indexer/ClassInit.vb index a939efd..da326f5 100644 --- a/Global_Indexer/ClassInit.vb +++ b/Global_Indexer/ClassInit.vb @@ -4,6 +4,7 @@ Imports DigitalData.Modules.Config Imports DigitalData.Modules.Windream Imports DigitalData.Modules.Filesystem Imports DigitalData.Modules.Messaging +Imports DigitalData.Modules.Database Imports DLLLicenseManager Public Class ClassInit @@ -45,11 +46,22 @@ Public Class ClassInit End If If MyConnectionString <> String.Empty Then + ' === NEW === + DATABASE_ECM = New MSSQLServer(LOGCONFIG, MyConnectionString) + dbResult = DATABASE_ECM.DBInitialized + + ' === OLD === dbResult = ClassDatabase.Init() Else MsgBox("No Databaseconnection configured. (First Start or Appdata not accessible)" & vbNewLine & "Basic-Config will be loaded.", MsgBoxStyle.Information) ERROR_STATE = "NO DB-CONNECTION" frmConfig_Basic.ShowDialog() + + ' === NEW === + DATABASE_ECM = New MSSQLServer(LOGCONFIG, MyConnectionString) + dbResult = DATABASE_ECM.DBInitialized + + ' === OLD === dbResult = ClassDatabase.Init() End If @@ -100,13 +112,13 @@ Public Class ClassInit Try ClassDatabase.Init() Dim oSql As String = "SELECT * FROM TBDD_MODULES WHERE NAME = 'Global-Indexer'" - Dim DT As DataTable = ClassDatabase.Return_Datatable(oSql) + Dim DT As DataTable = DATABASE_ECM.GetDatatable(oSql) If DT.Rows.Count = 1 Then GI_withWindream = DT.Rows(0).Item("BIT1") 'vWLaufwerk = DT.Rows(0).Item("STRING1") End If oSql = "SELECT * FROM TBDD_BASECONFIG" - DT = ClassDatabase.Return_Datatable(oSql) + DT = DATABASE_ECM.GetDatatable(oSql) If DT.Rows.Count = 1 Then WMDrive = DT.Rows(0).Item("WM_DRIVE") Return True @@ -123,7 +135,7 @@ Public Class ClassInit Public Sub Init_Folderwatch() Try Dim sql As String = "SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'DEFAULT' AND USER_ID = " & USER_ID - Dim folderwatchPath = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) + Dim folderwatchPath = DATABASE_ECM.GetScalarValue(sql) folderwatchPath = IIf(IsDBNull(folderwatchPath), "", folderwatchPath) @@ -158,7 +170,7 @@ Public Class ClassInit Try Dim sql As String = "SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'SCAN' AND USER_ID = " & USER_ID - Dim folderwatchScanPath = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) + Dim folderwatchScanPath = DATABASE_ECM.GetScalarValue(sql) folderwatchScanPath = IIf(IsDBNull(folderwatchScanPath), "", folderwatchScanPath) @@ -186,50 +198,13 @@ Public Class ClassInit LOGGER.Info($"Init_Folderwatch: Unexpected error: {ex.Message}") START_INCOMPLETE = True End Try - - - - 'Try - ' 'Die FolderWatch starten - 'Dim sql1 = "SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'DEFAULT' AND USER_ID = " & CURRENT_USER_ID - ' Dim folderwatch = ClassDatabase.Execute_Scalar(sql1, MyConnectionString, True) - ' sql1 = "SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'SCAN' AND USER_ID = " & CURRENT_USER_ID - ' Dim folderwatch_SCAN = ClassDatabase.Execute_Scalar(sql1, MyConnectionString, True) - ' If Not folderwatch Is Nothing Then - ' CURRENT_FOLDERWATCH = folderwatch - ' If FW_started = True Then - ' If CURRENT_FOLDERWATCH = "" Then - ' FW_started = False - ' SaveConfigValue("FW_started", "False") - ' Else - ' FW_ISSTARTED = True - ' ClassFolderWatcher.StartStop_FolderWatch() - ' End If - - ' End If - ' Else - ' LOGGER.Info("Init_Folderwatch: folderwatch path is nothing!") - ' End If - ' If Not folderwatch_SCAN Is Nothing Then - ' CURRENT_SCAN_FOLDERWATCH = folderwatch_SCAN - ' If FWSCAN_started = True Then - ' FW_ISSTARTED = True - ' ClassFolderWatcher.StartStop_FolderWatchSCAN() - ' End If - ' Else - ' LOGGER.Info("Init_Folderwatch: folderwatch_SCAN path is nothing!") - ' End If - 'Catch ex As Exception - ' LOGGER.Info("Unexpected Error in Init_Folderwatch: " & ex.Message) - ' START_INCOMPLETE = True - 'End Try End Sub Public Sub InitUserLogin() Try Dim oSql As String oSql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','GLOBIX',{1})", Environment.UserName, 1) - Dim DT_CHECKUSER_MODULE As DataTable = ClassDatabase.Return_Datatable(oSql) + Dim DT_CHECKUSER_MODULE As DataTable = DATABASE_ECM.GetDatatable(oSql) If DT_CHECKUSER_MODULE.Rows.Count = 0 Then LOGGER.Info("DT_CHECKUSER_MODULE.Rows.Count = 0") START_INCOMPLETE = True @@ -268,7 +243,7 @@ Public Class ClassInit ClassLicence.Refresh_Licence() Dim sql1 = "SELECT COUNT(T.GUID) FROM TBDD_DOKUMENTART T, TBDD_DOKUMENTART_MODULE T1 WHERE T.AKTIV = 1 AND T.GUID = T1.DOKART_ID AND T1.MODULE_ID = 1" - DOCTYPE_COUNT_ACTUAL = ClassDatabase.Execute_Scalar(sql1, MyConnectionString, True) + DOCTYPE_COUNT_ACTUAL = DATABASE_ECM.GetScalarValue(sql1) If DOCTYPE_COUNT_ACTUAL > LICENSE_DOCTYPE_COUNT Then If USER_LANGUAGE = "de-DE" Then MsgBox("Ihre Anzahl von konfigurierbaren Dokumentarten ist limitiert auf: '" & LICENSE_DOCTYPE_COUNT.ToString & "'." & vbNewLine & "Bitte kontaktieren Sie Digital Data für weitere Details.", MsgBoxStyle.Information) @@ -279,21 +254,18 @@ Public Class ClassInit USER_LANGUAGE = DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE") oSql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND UPPER(MODULE) = UPPER('Global-Indexer')" - ClassDatabase.Execute_non_Query(oSql, True) + DATABASE_ECM.ExecuteNonQuery(oSql) oSql = "INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,MODULE, CLIENT_ID) VALUES (" & USER_ID & ",'Global-Indexer', 1)" - ClassDatabase.Execute_non_Query(oSql) + DATABASE_ECM.ExecuteNonQuery(oSql) oSql = "SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE Upper(MODULE) = UPPER('Global-Indexer')" - ' Dim anzahl = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) - 'LOGGER.Info(" >> Anzahl Angemeldete User: " & anzahl.ToString) - ' UserLoggedin = CInt(anzahl) - ' UserLoggedin += 1 + If LICENSE_COUNT < USERCOUNT_LOGGED_IN And LICENSE_EXPIRED = False Then MsgBox("Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:") LOGGER.Info(" >> Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der Lizenzen (" & LICENSE_COUNT & ") für Global Indexer!") If USER_IS_ADMIN = False Then 'Anmeldung wieder herausnehmen oSql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE= 'Global-Indexer'" - ClassDatabase.Execute_non_Query(oSql, True) + DATABASE_ECM.ExecuteNonQuery(oSql) LOGGER.Info(" - Wieder abgemeldet") START_INCOMPLETE = True End If diff --git a/Global_Indexer/ClassLicence.vb b/Global_Indexer/ClassLicence.vb index 6ad62df..bed816c 100644 --- a/Global_Indexer/ClassLicence.vb +++ b/Global_Indexer/ClassLicence.vb @@ -8,7 +8,7 @@ Public Class ClassLicence _lizenzManager = New ClassLicenseManager("#DigitalData35452!#", "") Dim sql As String = "SELECT LICENSEKEY FROM TBGI_CONFIGURATION WHERE GUID = 1" - Dim licEncoded As String = ClassDatabase.Execute_Scalar(sql, MyConnectionString) + Dim licEncoded As String = DATABASE_ECM.GetScalarValue(sql) Dim licString As String = _lizenzManager.DecodeLicenseKey(licEncoded) Dim licArray() As String = licString.ToString.Split("#") diff --git a/Global_Indexer/ClassParamRefresh.vb b/Global_Indexer/ClassParamRefresh.vb index b46c9f7..8e2c0b9 100644 --- a/Global_Indexer/ClassParamRefresh.vb +++ b/Global_Indexer/ClassParamRefresh.vb @@ -1,4 +1,6 @@ -Public Class ClassParamRefresh +Imports DigitalData.Modules.Database + +Public Class ClassParamRefresh Public Shared Sub Refresh_Params(DT_CHECKUSER As DataTable) If DT_CHECKUSER.Rows.Count = 1 Then USERCOUNT_LOGGED_IN = DT_CHECKUSER.Rows(0).Item("USERCOUNT_LOGGED_IN") @@ -23,19 +25,26 @@ For Each oMode In oSplitWorkMode LOGGER.Debug($"oWorkingMode Parameter: {oMode}") If oMode.StartsWith("IDB_CONID!") Then - Dim CON_ID = oMode.Replace("GLOBIX.IDB_CONID!", "") - Dim oConString = ClassDatabase.Get_ConnectionString(CON_ID) + Dim oConnectionId = oMode.Replace("GLOBIX.IDB_CONID!", "") + + 'Dim oConString = ClassDatabase.Get_ConnectionString(oConnectionId) + Dim oConString = DATABASE_ECM.Get_ConnectionStringforID(oConnectionId) + CONNECTION_STRING_IDB = oConString + DATABASE_IDB = New MSSQLServer(LOGCONFIG, CONNECTION_STRING_IDB) + Dim oSQL = $"SELECT * FROM TBIDB_ATTRIBUTE" - Dim oDT As DataTable = ClassDatabase.Return_Datatable_CS(oSQL, CONNECTION_STRING_IDB) + ' Dim oDT As DataTable = ClassDatabase.Return_Datatable_CS(oSQL, CONNECTION_STRING_IDB) + Dim oDT As DataTable = DATABASE_IDB.GetDatatable(oSQL) + If Not IsNothing(oDT) Then If oDT.Rows.Count > 0 Then IDB_ACTIVE = True Else - LOGGER.Warn($"Got an IDB-ConnID [{CON_ID}] but check DTAttribute.Row.Count is [{oDT.Rows.Count}]!!") + LOGGER.Warn($"Got an IDB-ConnID [{oConnectionId}] but check DTAttribute.Row.Count is [{oDT.Rows.Count}]!!") End If Else - LOGGER.Warn($"Got an IDB-ConnID [{CON_ID}] but check DT Attribute is Nothing!!") + LOGGER.Warn($"Got an IDB-ConnID [{oConnectionId}] but check DT Attribute is Nothing!!") End If ElseIf oMode.StartsWith("IDB.LOG_INDEX") Then IDB_LOG_INDEX = oMode.Replace("IDB.LOG_INDEX!", "") diff --git a/Global_Indexer/Global_Indexer.vbproj b/Global_Indexer/Global_Indexer.vbproj index f6a7415..6e3ccdd 100644 --- a/Global_Indexer/Global_Indexer.vbproj +++ b/Global_Indexer/Global_Indexer.vbproj @@ -163,6 +163,9 @@ ..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll + + ..\..\DDMonorepo\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll + ..\..\DDMonorepo\Modules.Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll False @@ -274,7 +277,6 @@ - frmAdministration.vb diff --git a/Global_Indexer/ModuleRuntime.vb b/Global_Indexer/ModuleRuntime.vb index 67ae00b..79be2e6 100644 --- a/Global_Indexer/ModuleRuntime.vb +++ b/Global_Indexer/ModuleRuntime.vb @@ -1,5 +1,6 @@ Imports System.IO Imports System.Xml +Imports DigitalData.Modules.Database Imports DigitalData.Modules.Windream Module ModuleRuntime 'Dim ConfigPath As String = Path.Combine(Application.UserAppDataPath(), "UserConfig.xml") @@ -15,7 +16,7 @@ Module ModuleRuntime Public FW_started As Boolean = False Public IDB_ACTIVE As Boolean = False Public WORKING_MODE As String - Public CONNECTION_STRING_IDB As String + Public Property CONNECTION_STRING_IDB As String Public IDBData As ClassIDBData Public IDB_USES_WMFILESTORE As Boolean = False @@ -25,4 +26,7 @@ Module ModuleRuntime Public IDB_LOG_INDEX As String Public Property WINDREAM As Windream + + Public Property DATABASE_ECM As MSSQLServer + Public Property DATABASE_IDB As MSSQLServer End Module diff --git a/Global_Indexer/frmAdministration.vb b/Global_Indexer/frmAdministration.vb index c082065..46d4f87 100644 --- a/Global_Indexer/frmAdministration.vb +++ b/Global_Indexer/frmAdministration.vb @@ -144,7 +144,7 @@ Public Class frmAdministration RibbonPageGroupAutoIndex.Enabled = True Case XtraTabPageFolderPath.Name Try - Dim Dt As DataTable = ClassDatabase.Return_Datatable("select NAME from VWDDINDICES_MAN_AUTO_ACTIVE where DOCTYPE_ID = " & DOKART_GUIDTextBox.Text & " order by NAME") + Dim Dt As DataTable = DATABASE_ECM.GetDatatable("select NAME from VWDDINDICES_MAN_AUTO_ACTIVE where DOCTYPE_ID = " & DOKART_GUIDTextBox.Text & " order by NAME") cmbCrFolderIndex.DataSource = Dt cmbCrFolderIndex.DisplayMember = Dt.Columns(0).ColumnName Catch ex As Exception @@ -210,10 +210,10 @@ Public Class frmAdministration If IsInsert = True Then Dim oNewID As Integer - oNewID = ClassDatabase.Execute_Scalar("SELECT MAX(GUID) FROM TBDD_DOKUMENTART", MyConnectionString) + oNewID = DATABASE_ECM.GetScalarValue("SELECT MAX(GUID) FROM TBDD_DOKUMENTART") If IsNumeric(oNewID) Then Dim osql = $"EXEC PRDD_CHECK_REL_DOCTYPE_MODULE 'GLOBIX', {oNewID}" - If ClassDatabase.Execute_non_Query(osql) = False Then + If DATABASE_ECM.ExecuteNonQuery(osql) = False Then MsgBox("Fehler beim zuweisen des neuen Profils zum Modul Global-Indexer!", MsgBoxStyle.Critical, Text) End If End If @@ -270,7 +270,7 @@ Public Class frmAdministration Save_Dokumentart() Try Dim sql = "SELECT COUNT(T.GUID) FROM TBDD_DOKUMENTART T, TBDD_DOKUMENTART_MODULE T1 WHERE T.AKTIV = 1 AND T.GUID = T1.DOKART_ID AND T1.MODULE_ID = 1" - Dim DoctypeCount = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) + Dim DoctypeCount = DATABASE_ECM.GetScalarValue(sql) If DoctypeCount = LICENSE_DOCTYPE_COUNT Then If USER_LANGUAGE = "de-DE" Then MsgBox("Ihre Anzahl von konfigurierbaren Dokuemntarten ist limitiert auf: '" & LICENSE_DOCTYPE_COUNT.ToString & "'. Sie können nun keine Dokumentart hinzufügen!" & vbNewLine & "Bitte kontaktieren Sie Digital Data für weitere Details.", MsgBoxStyle.Information) @@ -300,7 +300,7 @@ Public Class frmAdministration End Sub Private Sub btnadd_Click(sender As Object, e As EventArgs) Dim osql = $"EXEC PRDD_CHECK_REL_DOCTYPE_MODULE 'GLOBIX',{DOKART_GUIDTextBox.Text}" - ClassDatabase.Execute_non_Query(osql) + DATABASE_ECM.ExecuteNonQuery(osql) LoadGlobix_Doctypes() End Sub @@ -848,9 +848,9 @@ Public Class frmAdministration If GUIDTextBox1.Text <> "" Then Try Dim del = "DELETE FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & GUIDTextBox1.Text - If ClassDatabase.Execute_non_Query(del) = True Then + If DATABASE_ECM.ExecuteNonQuery(del) = True Then del = "DELETE FROM TBDD_INDEX_MAN WHERE GUID = " & GUIDTextBox1.Text - If ClassDatabase.Execute_non_Query(del) = True Then + If DATABASE_ECM.ExecuteNonQuery(del) = True Then Load_INDEXMAN(Me.DOKART_GUIDTextBox.Text) End If End If @@ -961,7 +961,7 @@ Public Class frmAdministration If result = MsgBoxResult.Yes Then Try Dim del As String = " EXEC PRDD_GLOBIX_DELETE_DOCTYPE " & DOKART_GUIDTextBox.Text - If ClassDatabase.Execute_non_Query(del, True) = True Then + If DATABASE_ECM.ExecuteNonQuery(del) = True Then Load_Dokart() TBDD_DOKUMENTARTBindingSource.ResetBindings(True) @@ -988,9 +988,9 @@ Public Class frmAdministration If result = MsgBoxResult.Yes Then Try - Dim oGlobixId = ClassDatabase.Execute_Scalar("SELECT GUID FROM TBDD_MODULES WHERE SHORT_NAME = 'GLOBIX'", MyConnectionString) + Dim oGlobixId = DATABASE_ECM.GetScalarValue("SELECT GUID FROM TBDD_MODULES WHERE SHORT_NAME = 'GLOBIX'") Dim copy = "exec PRDD_COPY_DOKPROFILE " & DOKART_GUIDTextBox.Text & ", " & oGlobixId - If ClassDatabase.Execute_non_Query(copy, True) Then + If DATABASE_ECM.ExecuteNonQuery(copy) Then If USER_LANGUAGE = "de-DE" Then MsgBox("Das Profil wurde erfolgreich kopiert und auf INAKTIV gesetzt." & vbNewLine & "Bitte beachten Sie:" & vbNewLine & "- Das Profil wurde keiner Usergruppe zugeordnet.", MsgBoxStyle.Information) @@ -1043,7 +1043,7 @@ Public Class frmAdministration Private Sub ToolStripButton9_Click(sender As Object, e As EventArgs) Try Dim oSQL = $"DELETE FROM TBGI_REGEX_DOCTYPE WHERE GUID = {TextBox3.Text}" - If ClassDatabase.Execute_non_Query(oSQL, True) = True Then + If DATABASE_ECM.ExecuteNonQuery(oSQL) = True Then Me.TBGI_REGEX_DOCTYPETableAdapter.Fill(Me.MyDataset.TBGI_REGEX_DOCTYPE, DOKART_GUIDTextBox.Text) End If Catch ex As Exception @@ -1062,7 +1062,7 @@ Public Class frmAdministration Private Sub BarButtonItem14_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem14.ItemClick Try Dim oSQL = $"DELETE FROM TBGI_REGEX_DOCTYPE WHERE DOCTYPE_ID = {DOKART_GUIDTextBox.Text}" - ClassDatabase.Execute_non_Query(oSQL) + DATABASE_ECM.ExecuteNonQuery(oSQL) TBGI_REGEX_DOCTYPETableAdapter.Fill(MyDataset.TBGI_REGEX_DOCTYPE, DOKART_GUIDTextBox.Text) Catch ex As Exception LOGGER.Error(ex) @@ -1099,9 +1099,9 @@ Public Class frmAdministration If GUIDTextBox1.Text <> "" Then Try Dim del = "DELETE FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & GUIDTextBox1.Text - If ClassDatabase.Execute_non_Query(del) = True Then + If DATABASE_ECM.ExecuteNonQuery(del) = True Then del = "DELETE FROM TBDD_INDEX_MAN WHERE GUID = " & GUIDTextBox1.Text - If ClassDatabase.Execute_non_Query(del) = True Then + If DATABASE_ECM.ExecuteNonQuery(del) = True Then Load_INDEXMAN(Me.DOKART_GUIDTextBox.Text) End If End If @@ -1145,7 +1145,7 @@ Public Class frmAdministration If GUIDTextBox1.Text <> "" Then Try Dim del = "DELETE FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE GUID = " & GUIDTextBox4.Text - If ClassDatabase.Execute_non_Query(del) = True Then + If DATABASE_ECM.ExecuteNonQuery(del) = True Then Load_PostProcessing(Me.DOKART_GUIDTextBox.Text) End If Catch ex As Exception @@ -1189,7 +1189,7 @@ Public Class frmAdministration If result = MsgBoxResult.Yes Then Try Dim oSQL = $"DELETE FROM TBDD_INDEX_AUTOM WHERE GUID = {GUIDAUTO_INDEXTextbox.Text}" - ClassDatabase.Execute_non_Query(oSQL) + DATABASE_ECM.ExecuteNonQuery(oSQL) Load_INDEXE_AUTO(Me.DOKART_GUIDTextBox.Text) Catch ex As Exception LOGGER.Error(ex) diff --git a/Global_Indexer/frmConfig_Basic.vb b/Global_Indexer/frmConfig_Basic.vb index 76e0033..a75c44a 100644 --- a/Global_Indexer/frmConfig_Basic.vb +++ b/Global_Indexer/frmConfig_Basic.vb @@ -68,7 +68,7 @@ Public Class frmConfig_Basic sql = sql.Replace("@user", Environment.UserName) LOGGER.Info(">> Username: " & Environment.UserName) - USER_ID = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) + USER_ID = DATABASE_ECM.GetScalarValue(sql) If IsDBNull(USER_ID) Then MsgBox("Attention: Your Username '" & Environment.UserName & "' is not configured for Global Indexer. this might result in unhandled exceptions!", MsgBoxStyle.Exclamation) LOGGER.Info("User '" & Environment.UserName & "' not configured for Global Indexer! (DBNull - frmConfigBasic)") @@ -150,12 +150,12 @@ Public Class frmConfig_Basic Exit Sub End If reload = True - Dim folderwatch = ClassDatabase.Execute_Scalar("SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'DEFAULT' AND USER_ID = " & USER_ID, MyConnectionString) + Dim folderwatch = DATABASE_ECM.GetScalarValue("SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'DEFAULT' AND USER_ID = " & USER_ID) If Not folderwatch Is Nothing Then CURRENT_FOLDERWATCH = folderwatch End If Me.txtFolderWatch.Text = CURRENT_FOLDERWATCH - Dim SCAN_folderwatch = ClassDatabase.Execute_Scalar("SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'SCAN' AND USER_ID = " & USER_ID, MyConnectionString) + Dim SCAN_folderwatch = DATABASE_ECM.GetScalarValue("SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'SCAN' AND USER_ID = " & USER_ID) If Not SCAN_folderwatch Is Nothing Then CURRENT_SCAN_FOLDERWATCH = SCAN_folderwatch End If @@ -230,7 +230,7 @@ Public Class frmConfig_Basic Sub CheckFolder(mypath As String, FOLDER_TYPE As String) Try If mypath = "" Then - ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FOLDERWATCH_USER WHERE USER_ID = " & USER_ID & " AND FOLDER_TYPE = '" & FOLDER_TYPE & "'", True) + DATABASE_ECM.ExecuteNonQuery("DELETE FROM TBGI_FOLDERWATCH_USER WHERE USER_ID = " & USER_ID & " AND FOLDER_TYPE = '" & FOLDER_TYPE & "'") If FOLDER_TYPE = "SCAN" Then CURRENT_SCAN_FOLDERWATCH = "" CONFIG.Config.FolderWatchScanStarted = False @@ -262,15 +262,15 @@ Public Class frmConfig_Basic Exit Sub End Try - Dim folderwatch = ClassDatabase.Execute_Scalar("SELECT GUID FROM TBGI_FOLDERWATCH_USER WHERE USER_ID = " & USER_ID & " AND FOLDER_TYPE = '" & FOLDER_TYPE & "'", MyConnectionString) + Dim folderwatch = DATABASE_ECM.GetScalarValue("SELECT GUID FROM TBGI_FOLDERWATCH_USER WHERE USER_ID = " & USER_ID & " AND FOLDER_TYPE = '" & FOLDER_TYPE & "'") Dim sql As String If folderwatch Is Nothing Then sql = "INSERT INTO TBGI_FOLDERWATCH_USER (USER_ID, FOLDER_PATH, FOLDER_TYPE, ADDED_WHO) VALUES (" & USER_ID & ",'" & mypath & "','" & FOLDER_TYPE & "','" & Environment.UserName & "')" Else sql = "UPDATE TBGI_FOLDERWATCH_USER SET FOLDER_PATH = '" & mypath & "', CHANGED_WHO = '" & Environment.UserName & "' where GUID = " & folderwatch End If - If ClassDatabase.Execute_non_Query(sql) Then - folderwatch = ClassDatabase.Execute_Scalar("SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE USER_ID = " & USER_ID & " AND FOLDER_TYPE = '" & FOLDER_TYPE & "'", MyConnectionString) + If DATABASE_ECM.ExecuteNonQuery(sql) Then + folderwatch = DATABASE_ECM.GetScalarValue("SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE USER_ID = " & USER_ID & " AND FOLDER_TYPE = '" & FOLDER_TYPE & "'") If FOLDER_TYPE = "SCAN" Then CURRENT_SCAN_FOLDERWATCH = folderwatch @@ -362,7 +362,7 @@ Public Class frmConfig_Basic LOGCONFIG.Debug = Not chkLogErrorsOnly.Checked End If End Sub - _ + Private Sub frmConfig_Basic_Shown(sender As Object, e As EventArgs) Handles Me.Shown Load_Basics() formloaded = True @@ -401,7 +401,7 @@ Public Class frmConfig_Basic Catch ex As Exception MsgBox("Unexpected Error in Load_Basics:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try - + End Sub Private Sub btnopenlog_Click(sender As Object, e As EventArgs) Handles btnopenlog.Click Process.Start(ClassLogger.DateiSpeicherort) @@ -453,7 +453,7 @@ Public Class frmConfig_Basic End Sub Private Sub btnLogMail_Click(sender As Object, e As EventArgs) Handles btnLogMail.Click - ClassEmail.Send_Log_Mail(" Log-/SupportMail von DD GLOBIX.

", _ + ClassEmail.Send_Log_Mail(" Log-/SupportMail von DD GLOBIX.

", "Support-Mail GLOBIX", "support@didalog.de", "mail.triplew.de", "support@didalog.de", "ddemail40", "support@didalog.de", False, True) End Sub @@ -483,7 +483,7 @@ Public Class frmConfig_Basic Dim update As String = "UPDATE TBDD_USER SET [LANGUAGE] = '" & lang & "' WHERE GUID = " & USER_ID USER_LANGUAGE = lang - If ClassDatabase.Execute_non_Query(update, True) = True Then + If DATABASE_ECM.ExecuteNonQuery(update) = True Then If USER_LANGUAGE = "de-DE" Then MsgBox("Die Sprache wurde erfolgreich geändert!", MsgBoxStyle.Information) Else diff --git a/Global_Indexer/frmEmailIndexing.vb b/Global_Indexer/frmEmailIndexing.vb index a8fcc89..fb4b4a2 100644 --- a/Global_Indexer/frmEmailIndexing.vb +++ b/Global_Indexer/frmEmailIndexing.vb @@ -100,7 +100,7 @@ Public Class frmEmailIndexing Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick Try Dim oSQL = $"DELETE FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '{OBJECTTYPETextBox.Text}'" - ClassDatabase.Execute_non_Query(oSQL) + DATABASE_ECM.ExecuteNonQuery(oSQL) TBGI_OBJECTTYPE_EMAIL_INDEXTableAdapter.Fill(MyDataset.TBGI_OBJECTTYPE_EMAIL_INDEX, OBJECTTYPETextBox.Text) Catch ex As Exception LOGGER.Error(ex) diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index 4f0b891..02aaa3a 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -155,10 +155,12 @@ Public Class frmIndex sql = sqlscalar Dim ergebnis As Integer If DR.Item("SQL_PROVIDER") = "Oracle" Then - ergebnis = ClassDatabase.OracleExecute_Scalar(sql, connectionString) + + ' ergebnis = ClassDatabase.OracleExecute_Scalar(sql, connectionString) + LOGGER.Warn("Oracle is not supported") Else 'MSQL - ergebnis = ClassDatabase.Execute_Scalar(sql, connectionString) + ergebnis = DATABASE_ECM.GetScalarValueWithConnection(sql, connectionString) End If Select Case ergebnis @@ -219,7 +221,6 @@ Public Class frmIndex _Logger.Info(" >>Zurückgegebener manueller Indexwert: " & DR.Item("Indexwert")) Return DR.Item("Indexwert") Else - 'Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & indexname & "')", MyConnectionString, True) If opt = False Then _Logger.Info("Achtung, der Indexwert des manuellen Indexes '" & indexname & "' ist String.empty!") ShowNotice("Indexiert = True - Der Index: " & DR.Item("INDEXNAME") & " wurde nicht ordnungsgemäss indexiert! - Automatischer Index konnte nicht gesetzt werden!") @@ -290,7 +291,7 @@ Public Class frmIndex If vProvider.ToLower = "oracle" Then oErgebnis = ClassDatabase.OracleExecute_Scalar(SQLCommand, oConnectionString) Else 'im Moment nur SQL-Server - oErgebnis = ClassDatabase.Execute_Scalar(SQLCommand, oConnectionString) + oErgebnis = DATABASE_ECM.GetScalarValueWithConnection(SQLCommand, oConnectionString) End If If LogErrorsOnly = False Then @@ -323,7 +324,7 @@ Public Class frmIndex If oControl.Name.StartsWith("txt") Then Dim box As DevExpress.XtraEditors.TextEdit = oControl If box.Text = "" Then - Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(box.Name, "txt", "") & "'", MyConnectionString, True) + Dim optional_index As Boolean = DATABASE_ECM.GetScalarValue("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(box.Name, "txt", "") & "'") If optional_index = False Then If USER_LANGUAGE = LANG_DE Then @@ -366,7 +367,7 @@ Public Class frmIndex Dim oValues As List(Of String) = oLookup.Properties.SelectedValues If oValues.Count = 0 Then - Dim oIsOptionalIndex As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(oLookup.Name, "cmbMulti", "") & "'", MyConnectionString, True) + Dim oIsOptionalIndex As Boolean = DATABASE_ECM.GetScalarValue("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(oLookup.Name, "cmbMulti", "") & "'") If oIsOptionalIndex = False Then If USER_LANGUAGE = LANG_DE Then @@ -390,7 +391,7 @@ Public Class frmIndex Dim cmbSingle As TextBox = oControl If cmbSingle.Text = "" Then - Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(cmbSingle.Name, "cmbSingle", "") & "'", MyConnectionString, True) + Dim optional_index As Boolean = DATABASE_ECM.GetScalarValue("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(cmbSingle.Name, "cmbSingle", "") & "'") If optional_index = False Then If USER_LANGUAGE = LANG_DE Then @@ -411,7 +412,7 @@ Public Class frmIndex ElseIf oControl.Name.StartsWith("cmb") Then Dim cmb As ComboBox = oControl If cmb.Text = "" Then - Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(cmb.Name, "cmb", "") & "'", MyConnectionString, True) + Dim optional_index As Boolean = DATABASE_ECM.GetScalarValue("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & oDocumentTypeId & " AND NAME = '" & Replace(cmb.Name, "cmb", "") & "'") If optional_index = False Then If USER_LANGUAGE = LANG_DE Then MsgBox(TEXT_MISSING_INPUT_DE, MsgBoxStyle.Exclamation, Text) @@ -434,7 +435,7 @@ Public Class frmIndex Dim oIndexName As String = Replace(dtp.Name, "dtp", "") If dtp.Text = String.Empty Then - Dim optional_index As Boolean = ClassDatabase.Execute_Scalar($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {oDocumentTypeId} AND NAME = '{oIndexName}'", MyConnectionString, True) + Dim optional_index As Boolean = DATABASE_ECM.GetScalarValue($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {oDocumentTypeId} AND NAME = '{oIndexName}'") If optional_index = False Then If USER_LANGUAGE = LANG_DE Then @@ -489,7 +490,7 @@ Public Class frmIndex 'Die Nachbearbeitungsschritte laden 'FILE AND INDEX 'Zuerst nur die Fälle für die Variante ONLY FILE/FOLDER - Dim DTNB As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & idxid & " AND VARIANT = 'ONLY FILE/FOLDER' ORDER BY SEQUENCE") + Dim DTNB As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & idxid & " AND VARIANT = 'ONLY FILE/FOLDER' ORDER BY SEQUENCE") If DTNB Is Nothing = False Then If DTNB.Rows.Count > 0 Then value_post = ClassPostprocessing.Get_Nachbearbeitung_Wert(wert_in, DTNB) @@ -499,7 +500,7 @@ Public Class frmIndex End If 'Jetzt die Fälle für die Variante FILE AND INDEX DTNB = Nothing - DTNB = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & idxid & " AND VARIANT = 'FILE AND INDEX' ORDER BY SEQUENCE") + DTNB = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & idxid & " AND VARIANT = 'FILE AND INDEX' ORDER BY SEQUENCE") If DTNB Is Nothing = False Then If DTNB.Rows.Count > 0 Then value_post = ClassPostprocessing.Get_Nachbearbeitung_Wert(wert_in, DTNB) @@ -520,7 +521,7 @@ Public Class frmIndex _Logger.Debug("#### Name_Generieren ####") Dim sql As String = "select VERSION_DELIMITER, FILE_DELIMITER FROM TBDD_MODULES WHERE GUID = 1" Dim oFilesystem As New DigitalData.Modules.Filesystem.File(LOGCONFIG) - Dim DT1 As DataTable = ClassDatabase.Return_Datatable(sql) + Dim DT1 As DataTable = DATABASE_ECM.GetDatatable(sql) For Each row As DataRow In DT1.Rows FILE_DELIMITER = row.Item("FILE_DELIMITER") VERSION_DELIMITER = row.Item("VERSION_DELIMITER") @@ -530,7 +531,7 @@ Public Class frmIndex Dim folder_Created As Boolean = False Dim oRAWZielordner As String Dim extension As String = System.IO.Path.GetExtension(CURRENT_WORKFILE) - Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_DOKUMENTART WHERE GUID = " & CURRENT_DOKART_ID) + Dim DT As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_DOKUMENTART WHERE GUID = " & CURRENT_DOKART_ID) sql_history_INSERT_INTO = "INSERT INTO TBGI_HISTORY (FILENAME_ORIGINAL,FILENAME_NEW" sql_history_Index_Values = "" Dim AnzahlIndexe As Integer = 1 @@ -562,7 +563,7 @@ Public Class frmIndex Case "M" _Logger.Debug("NameGenerieren: Manueller Index wird geprüft...") Dim Indexname = oElement.Value.Substring(3, oElement.Value.Length - 4) - Dim optional_index As Boolean = ClassDatabase.Execute_Scalar($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {CURRENT_DOKART_ID} AND UPPER(NAME) = UPPER('{Indexname}')", MyConnectionString, True) + Dim optional_index As Boolean = DATABASE_ECM.GetScalarValue($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {CURRENT_DOKART_ID} AND UPPER(NAME) = UPPER('{Indexname}')") Dim oManValue As String = GetManIndex_Value(Indexname, "FILE", optional_index) If oManValue <> String.Empty Then Dim firstVectorValue = oManValue.Split(ClassConstants.VECTORSEPARATOR).First() @@ -872,7 +873,7 @@ Public Class frmIndex Dim oIndexNames As Dictionary(Of String, Object) Dim oSQL As String = $"SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '{CURR_DOKART_OBJECTTYPE}'" - Dim oTable As DataTable = ClassDatabase.Return_Datatable(oSQL) + Dim oTable As DataTable = DATABASE_ECM.GetDatatable(oSQL) If IsNothing(oTable) Then _Logger.Info("Could not get Email Indicies for DocType = [{0}]. Exiting.", CURR_DOKART_OBJECTTYPE) @@ -1011,7 +1012,7 @@ Public Class frmIndex ' finalize_pattern = rowregex.Item("REGEX") ' End If ' Next - ' Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '" & CURR_DOKART_OBJECTTYPE & "'") + ' Dim DT As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '" & CURR_DOKART_OBJECTTYPE & "'") ' If IsNothing(DT) Then ' _Logger.Info("SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '" & CURR_DOKART_OBJECTTYPE & "' RESULTED in NOTHING") ' Return False @@ -1297,7 +1298,7 @@ Public Class frmIndex 'Private Function SetAttachmentIndices() ' Dim indexierung_erfolgreich As Boolean = True ' Try - ' Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '" & CURR_DOKART_OBJECTTYPE & "'") + ' Dim DT As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '" & CURR_DOKART_OBJECTTYPE & "'") ' If DT.Rows.Count = 1 Then ' If Not CURRENT_MESSAGEID Is Nothing Then @@ -1394,19 +1395,19 @@ Public Class frmIndex Dim oUser As String = $"{Environment.UserDomainName}\{Environment.UserName}" Insert_String = sql_history_INSERT_INTO & $",ADDED_WHO, ADDED_WHERE, FILE_HASH) VALUES ('{oCurrentWorkfile}','{oCurrentNewFilename}'{sql_history_Index_Values},'{oUser}','{Environment.MachineName}','{CURRENT_WORKFILE_HASH}')" - If ClassDatabase.Execute_non_Query(Insert_String) = True Then + If DATABASE_ECM.ExecuteNonQuery(Insert_String) = True Then If CURRENT_MESSAGEID <> "" Then Dim max As String = "SELECT MAX(GUID) FROM TBGI_HISTORY" - Dim GUID = ClassDatabase.Execute_Scalar(max, MyConnectionString, True) + Dim GUID = DATABASE_ECM.GetScalarValue(max) Try If GUID > 0 Then Dim sql As String If CURRENT_ISATTACHMENT = True Then sql = "Update TBGI_HISTORY SET ATTACHMENT = 1, MSG_ID = '" & CURRENT_MESSAGEID & "' WHERE GUID = " & GUID - ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) + DATABASE_ECM.GetScalarValue(sql) Else sql = "Update TBGI_HISTORY SET ATTACHMENT = 0, MSG_ID = '" & CURRENT_MESSAGEID & "' WHERE GUID = " & GUID - ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) + DATABASE_ECM.GetScalarValue(sql) End If End If Catch ex As Exception @@ -1446,7 +1447,7 @@ Public Class frmIndex Try ABORT_INDEXING = True Dim sql As String = $"SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND UPPER(USER@WORK) = UPPER('{Environment.UserName}')" - Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, True) + Dim DT As DataTable = DATABASE_ECM.GetDatatable(sql) Dim anz = DT.Rows.Count For Each Filerow As DataRow In DT.Rows @@ -1465,7 +1466,7 @@ Public Class frmIndex End If Next 'Zuerst die Daten des Ablaufs löschen - If ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')", True) = True Then + If DATABASE_ECM.ExecuteNonQuery("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')") = True Then If containsfw_file = True Then If USER_LANGUAGE = LANG_DE Then MsgBox("Der Indexierungsprozess beinhaltete (auch) Dateien per Folderwatch!" & vbNewLine & "Diese Dateien wurden nicht gelöscht und verbleiben im Folderwatch-Verzeichnis!" & vbNewLine & "Bitte verschieben Sie die Dateien ggfls.", MsgBoxStyle.Information, "Achtung - Hinweis:") @@ -1523,13 +1524,13 @@ Public Class frmIndex Try CURRENT_ISATTACHMENT = False - DropType = ClassDatabase.Execute_Scalar("SELECT HANDLE_TYPE FROM TBGI_FILES_USER WHERE GUID = " & CURRENT_WORKFILE_GUID, MyConnectionString, True) + DropType = DATABASE_ECM.GetScalarValue("SELECT HANDLE_TYPE FROM TBGI_FILES_USER WHERE GUID = " & CURRENT_WORKFILE_GUID) CURR_DELETE_ORIGIN = CONFIG.Config.DeleteOriginalFile checkItemDeleteSource.Enabled = True checkItemDeleteSource.Checked = CONFIG.Config.DeleteOriginalFile - VIEWER_LICENSE = ClassDatabase.Execute_Scalar("SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'", MyConnectionString) + VIEWER_LICENSE = DATABASE_ECM.GetScalarValue("SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'") DocumentViewer1.Init(LOGCONFIG, VIEWER_LICENSE) @@ -1609,8 +1610,8 @@ Public Class frmIndex Load_String() - 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) + DTTBGI_REGEX_DOCTYPE = DATABASE_ECM.GetDatatable("SELECT DISTINCT T1.DOCTYPE as DocType, T.* FROM TBGI_REGEX_DOCTYPE T, VWGI_DOCTYPE T1 WHERE T.DOCTYPE_ID = T1.DOCTYPE_ID") + MULTIFILES = DATABASE_ECM.GetScalarValue("SELECT COUNT(*) FROM TBGI_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_WORKFILE_GUID & " AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')") MULTIINDEXING_ACTIVE = False If MULTIFILES > 0 Then If USER_LANGUAGE = LANG_DE Then @@ -1708,7 +1709,7 @@ Public Class frmIndex Try Dim sql = String.Format("SELECT DISTINCT DOCTYPE_ID, DOCTYPE, SEQUENCE FROM VWGI_DOCTYPE where UPPER(USERNAME) = UPPER('{0}') ORDER BY SEQUENCE", Environment.UserName) _Logger.Info("SQL DoctypeList: " & sql) - Dim oDoctypes = ClassDatabase.Return_Datatable(sql) + Dim oDoctypes = DATABASE_ECM.GetDatatable(sql) 'cmbDokumentart.DataSource = oDoctypes 'cmbDokumentart.ValueMember = oDoctypes.Columns("DOCTYPE_ID").ColumnName 'cmbDokumentart.DisplayMember = oDoctypes.Columns("DOCTYPE").ColumnName @@ -1745,7 +1746,7 @@ Public Class frmIndex pnlIndex.Controls.Clear() Dim sql As String = "Select WINDREAM_DIRECT, ZIEL_PFAD, DUPLICATE_HANDLING from TBDD_DOKUMENTART WHERE GUID = " & oSelectedItem.Guid - Dim oDoctypes As DataTable = ClassDatabase.Return_Datatable(sql) + Dim oDoctypes As DataTable = DATABASE_ECM.GetDatatable(sql) Dim oDocType As DataRow = oDoctypes.Rows.Item(0) Dim oDestination As String = oDocType.Item("ZIEL_PFAD") @@ -1775,7 +1776,7 @@ Public Class frmIndex Dim sql Try sql = "select T1.BEZEICHNUNG AS DOKUMENTART,T.* from TBDD_INDEX_MAN T, TBDD_DOKUMENTART T1 where T.ACTIVE = 1 AND T.DOK_ID = T1.GUID AND T.DOK_ID = " & dokartid & " ORDER BY T.SEQUENCE" - DT_INDEXEMAN = ClassDatabase.Return_Datatable(sql) + DT_INDEXEMAN = DATABASE_ECM.GetDatatable(sql) pnlIndex.Visible = True LoadIndexe_Man() Catch ex As System.Exception @@ -1926,7 +1927,7 @@ Public Class frmIndex End Sub Private Function GetLookupData(pLookup As LookupControl3, pSQLCommand As String, pConnectionId As Integer) - Dim oConnectionString = ClassFormFunctions.GetConnectionString(pConnectionId) + Dim oConnectionString = DATABASE_ECM.Get_ConnectionStringforID(pConnectionId) If oConnectionString IsNot Nothing And pSQLCommand.Length > 0 Then LOGGER.Debug("Connection String (redacted): [{0}]", oConnectionString.Substring(0, 30)) @@ -1938,7 +1939,8 @@ Public Class frmIndex pSQLCommand = ClassPatterns.ReplaceInternalValues(pSQLCommand) pSQLCommand = ClassPatterns.ReplaceUserValues(pSQLCommand, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_DOKART_ID) - Dim oDatatable = ClassDatabase.Return_Datatable_Combined(pSQLCommand, oConnectionString, False) + 'Dim oDatatable = ClassDatabase.Return_Datatable_Combined(pSQLCommand, oConnectionString, False) + Dim oDatatable = DATABASE_ECM.GetDatatableWithConnection(pSQLCommand, oConnectionString) Return oDatatable End If Else @@ -1956,7 +1958,7 @@ Public Class frmIndex Dim oMeta = DirectCast(Control.Tag, ControlCreator.ControlMeta) Dim oIndexName As String = oMeta.IndexName Dim oSQL = $"SELECT * FROM TBDD_INDEX_MAN WHERE SQL_RESULT LIKE '%{oIndexName}%' AND DOK_ID = {CURRENT_DOKART_ID}" - Dim oDatatable As DataTable = ClassDatabase.Return_Datatable(oSQL) + Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable(oSQL) If Not IsNothing(oDatatable) Then LOGGER.Debug("Found [{0}] depending controls for [{1}]", oDatatable.Rows.Count, Control.Name) @@ -1991,7 +1993,8 @@ Public Class frmIndex End If Dim oConnectionString = ClassFormFunctions.GetConnectionString(SqlConnectionId) - Dim oDatatable As DataTable = ClassDatabase.Return_Datatable_CS(SqlCommand, oConnectionString) + 'Dim oDatatable As DataTable = ClassDatabase.Return_Datatable_CS(SqlCommand, oConnectionString) + Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable(SqlCommand) Dim oFoundControl As Control = Nothing For Each oControl As Control In pnlIndex.Controls @@ -2152,7 +2155,7 @@ Public Class frmIndex oSqlResult = oSqlResult.Replace(oMatch.Value, oPlaceholderResult) End If - oOptionalIndex = ClassDatabase.Execute_Scalar($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {CURRENT_DOKART_ID} AND UPPER(NAME) = UPPER('{oIndexValue}')", MyConnectionString, True) + oOptionalIndex = DATABASE_ECM.GetScalarValue($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {CURRENT_DOKART_ID} AND UPPER(NAME) = UPPER('{oIndexValue}')") oManualIndexResult = GetManIndex_Value(oIndexValue, "IDX_AUTO", oOptionalIndex) ' Wenn Ergebnis den VektorPlatzhalter enthält, soll nichts ersetzt werden. @@ -2187,7 +2190,7 @@ Public Class frmIndex Dim oOptionalIndex = False Dim oManualIndexResult As String = Nothing - oOptionalIndex = ClassDatabase.Execute_Scalar($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {CURRENT_DOKART_ID} AND UPPER(NAME) = UPPER('{oIndexValue}')", MyConnectionString, True) + oOptionalIndex = DATABASE_ECM.GetScalarValue($"SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = {CURRENT_DOKART_ID} AND UPPER(NAME) = UPPER('{oIndexValue}')") oManualIndexResult = GetManIndex_Value(oIndexValue, "IDX_AUTO", oOptionalIndex) Dim oVectorIndexValues = oManualIndexResult.Split(ClassConstants.VECTORSEPARATOR).ToList() @@ -2278,7 +2281,7 @@ Public Class frmIndex CURRENT_LASTDOKART = oDokart.Name _Logger.Info("Datei '" & CURRENT_NEWFILENAME & "' erfolgreich erzeugt.") Dim oDEL As String = "DELETE FROM TBGI_FILES_USER WHERE GUID = " & CURRENT_WORKFILE_GUID - ClassDatabase.Execute_non_Query(oDEL, True) + DATABASE_ECM.ExecuteNonQuery(oDEL) If CURR_DELETE_ORIGIN = True Then _Logger.Info("Datei [" & CURRENT_WORKFILE & "] wird gelöscht.") @@ -2343,7 +2346,7 @@ Public Class frmIndex ' 'Die erste Datei indexieren ' If WORK_FILE() = True Then ' 'Und nun die folgenden - ' Dim DTFiles2Work As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_WORKFILE_GUID & " AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')") + ' Dim DTFiles2Work As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_WORKFILE_GUID & " AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')") ' If Not DTFiles2Work Is Nothing Then ' Dim err = False ' For Each filerow As DataRow In DTFiles2Work.Rows @@ -2390,7 +2393,7 @@ Public Class frmIndex Dim oError As Boolean Try Dim oSQL As String = "SELECT FOLDER_FOR_INDEX FROM TBDD_DOKUMENTART WHERE GUID = " & CURRENT_DOKART_ID - Dim oFolderForIndex = ClassDatabase.Execute_Scalar(oSQL, MyConnectionString, True) + Dim oFolderForIndex = DATABASE_ECM.GetScalarValue(oSQL) If Not IsDBNull(oFolderForIndex) Then CreateFolderForIndex(oFolderForIndex) Else @@ -2420,20 +2423,20 @@ Public Class frmIndex Dim oUser As String = $"{Environment.UserDomainName}\{Environment.UserName}" Insert_String = sql_history_INSERT_INTO & $",ADDED_WHO, ADDED_WHERE, FILE_HASH) VALUES ('{tempCur_WF}','{tempCur_New_FN}'{sql_history_Index_Values},'{oUser}','{Environment.MachineName}','{CURRENT_WORKFILE_HASH}')" - ClassDatabase.Execute_Scalar(Insert_String, MyConnectionString, True) + DATABASE_ECM.GetScalarValue(Insert_String) If DropType.Contains("MSG") Or DropType = "|ATTMNTEXTRACTED|" Or DropType = "|OUTLOOK_ATTACHMENT|" Then If CURRENT_MESSAGEID <> "" Then Dim max As String = "SELECT MAX(GUID) FROM TBGI_HISTORY" - Dim GUID = ClassDatabase.Execute_Scalar(max, MyConnectionString, True) + Dim GUID = DATABASE_ECM.GetScalarValue(max) Try If GUID > 0 Then Dim sqlUpdate As String If DropType = "|ATTMNTEXTRACTED|" Or DropType = "|OUTLOOK_ATTACHMENT|" Then sqlUpdate = "Update TBGI_HISTORY SET ATTACHMENT = 1, MSG_ID = '" & CURRENT_MESSAGEID & "' WHERE GUID = " & GUID - ClassDatabase.Execute_non_Query(sqlUpdate, True) + DATABASE_ECM.ExecuteNonQuery(sqlUpdate) Else sqlUpdate = "Update TBGI_HISTORY SET ATTACHMENT = 0, MSG_ID = '" & CURRENT_MESSAGEID & "' WHERE GUID = " & GUID - ClassDatabase.Execute_non_Query(sqlUpdate, True) + DATABASE_ECM.ExecuteNonQuery(sqlUpdate) End If End If Catch ex As Exception @@ -2499,7 +2502,7 @@ Public Class frmIndex 'Manueller Indexwert Case "M" Dim oManIndexName = oMatch.Value.Substring(3, oMatch.Value.Length - 4) - Dim oIsOptional As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & oManIndexName & "')", MyConnectionString, True) + Dim oIsOptional As Boolean = DATABASE_ECM.GetScalarValue("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & oManIndexName & "')") _Logger.Info("Versuch den Indexwert aus '" & oManIndexName & "' auszulesen.") Dim oManIndexValue As String = GetManIndex_Value(oManIndexName, "FILE", oIsOptional) _Logger.Info("Ergebnis/Wert für neuen Ordner: '" & oManIndexName & "'") @@ -2646,7 +2649,7 @@ Public Class frmIndex ABORT_INDEXING = True Dim sql As String = "SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')" - Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, True) + Dim DT As DataTable = DATABASE_ECM.GetDatatable(sql) Dim anz = DT.Rows.Count @@ -2666,7 +2669,7 @@ Public Class frmIndex End If Next 'Zuerst die Daten des Ablaufs löschen - If ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')", True) = True Then + If DATABASE_ECM.ExecuteNonQuery("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')") = True Then If containsfw_file = True Then If USER_LANGUAGE = LANG_DE Then MsgBox("Der Indexierungsprozess beinhaltete (auch) Dateien per Folderwatch!" & vbNewLine & "Diese Dateien wurden nicht gelöscht und verbleiben im Folderwatch-Verzeichnis!" & vbNewLine & "Bitte verschieben Sie die Dateien ggfls.", MsgBoxStyle.Information, "Achtung - Hinweis:") @@ -2732,7 +2735,7 @@ Public Class frmIndex 'Die erste Datei indexieren If WORK_FILE() = True Then 'Und nun die folgenden - Dim DTFiles2Work As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_WORKFILE_GUID & " AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')") + Dim DTFiles2Work As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_WORKFILE_GUID & " AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')") If Not DTFiles2Work Is Nothing Then Dim err = False For Each filerow As DataRow In DTFiles2Work.Rows @@ -2838,7 +2841,7 @@ Public Class frmIndex End Sub Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick - ClassDatabase.Execute_non_Query($"DELETE FROM TBGI_FILES_USER WHERE GUID = {CURRENT_WORKFILE_GUID}", True) + DATABASE_ECM.ExecuteNonQuery($"DELETE FROM TBGI_FILES_USER WHERE GUID = {CURRENT_WORKFILE_GUID}") CancelAttempts = 2 Close() diff --git a/Global_Indexer/frmIndexFileList.vb b/Global_Indexer/frmIndexFileList.vb index d703bd2..74bc130 100644 --- a/Global_Indexer/frmIndexFileList.vb +++ b/Global_Indexer/frmIndexFileList.vb @@ -82,7 +82,7 @@ Public Class frmIndexFileList End If LOGGER.Debug("Removing file from user files: [{0}]", oFilePath) - ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FILES_USER WHERE GUID = " & oGuid, True) + DATABASE_ECM.ExecuteNonQuery("DELETE FROM TBGI_FILES_USER WHERE GUID = " & oGuid) End If Next @@ -119,7 +119,7 @@ Public Class frmIndexFileList Private Sub frmIndexFileList_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing If DialogResult = DialogResult.Cancel Then Try - 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 & "')") Catch ex As Exception MsgBox("Error while deleting User Files: " & ex.Message, MsgBoxStyle.Critical, Text) LOGGER.Error(ex) diff --git a/Global_Indexer/frmLicense.vb b/Global_Indexer/frmLicense.vb index f1b6f12..5a52333 100644 --- a/Global_Indexer/frmLicense.vb +++ b/Global_Indexer/frmLicense.vb @@ -28,7 +28,7 @@ Public Class frmLicense Dim result As String = Me._lizenzManager.EncodeLicenseKey(txtNewlicences.Text & "#" & dtpGueltig_GI.Text & "#" & txtProfile.Text & "#" & txtHotKey.Text, "#DigitalData35452!#") txtlicensekey.Text = result Dim sql As String = "UPDATE TBGI_CONFIGURATION SET LICENSEKEY = '" & result & "' where guid = 1" - If ClassDatabase.Execute_non_Query(sql, True) = True Then + If DATABASE_ECM.ExecuteNonQuery(sql) = True Then Refresh_Licence(True) End If @@ -44,7 +44,7 @@ Public Class frmLicense Me._lizenzManager = New ClassLicenseManager("#DigitalData35452!#", "") Dim sql As String = "SELECT LICENSEKEY FROM TBGI_CONFIGURATION WHERE GUID = 1" - Dim lic As String = ClassDatabase.Execute_Scalar(sql, MyConnectionString) + Dim lic As String = DATABASE_ECM.GetScalarValue(sql) Dim licString = Me._lizenzManager.DecodeLicenseKey(lic) Dim split() = licString.ToString.Split("#") diff --git a/Global_Indexer/frmNamenkonvention.vb b/Global_Indexer/frmNamenkonvention.vb index 4c5e866..07c511e 100644 --- a/Global_Indexer/frmNamenkonvention.vb +++ b/Global_Indexer/frmNamenkonvention.vb @@ -28,7 +28,7 @@ Private Sub frmNamenkonvention_Load(sender As Object, e As EventArgs) Handles Me.Load Try Dim sql As String = "select VERSION_DELIMITER, FILE_DELIMITER FROM TBDD_MODULES WHERE GUID = 1" - Dim DT As DataTable = ClassDatabase.Return_Datatable(sql) + Dim DT As DataTable = DATABASE_ECM.GetDatatable(sql) For Each row As DataRow In DT.Rows FILE_DELIMITER = row.Item("FILE_DELIMITER") VERSION_DELIMITER = row.Item("VERSION_DELIMITER") diff --git a/Global_Indexer/frmSQLConfigAutoIndex.vb b/Global_Indexer/frmSQLConfigAutoIndex.vb index 013881a..1fdefd7 100644 --- a/Global_Indexer/frmSQLConfigAutoIndex.vb +++ b/Global_Indexer/frmSQLConfigAutoIndex.vb @@ -26,7 +26,7 @@ Public Class SQLConfigAutoIndex End If Next - Dim typeCS As String = ClassDatabase.Execute_Scalar("SELECT SQL_PROVIDER FROM TBDD_CONNECTION WHERE GUID = " & cmbConnection.SelectedValue, MyConnectionString, True) + Dim typeCS As String = DATABASE_ECM.GetScalarValue("SELECT SQL_PROVIDER FROM TBDD_CONNECTION WHERE GUID = " & cmbConnection.SelectedValue) Dim dt As DataTable If typeCS.Length > 0 Then Dim CS As String @@ -34,7 +34,8 @@ Public Class SQLConfigAutoIndex If typeCS.ToUpper = "Oracle".ToUpper Then dt = ClassDatabase.Oracle_Return_Datatable(query, CS, True) Else - dt = ClassDatabase.Return_Datatable_CS(query, CS, True) + 'dt = ClassDatabase.Return_Datatable_CS(query, CS, True) + dt = DATABASE_ECM.GetDatatableWithConnection(query, CS) End If End If @@ -127,7 +128,7 @@ Public Class SQLConfigAutoIndex Me.TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString Me.TBDD_INDEX_MANTableAdapter.Connection.ConnectionString = MyConnectionString Me.TBDD_CONNECTIONTableAdapter.Fill(Me.MyDataset.TBDD_CONNECTION) - Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_INDEX_AUTOM WHERE GUID = " & CURRENT_INDEXAUTO) + Dim DT As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_INDEX_AUTOM WHERE GUID = " & CURRENT_INDEXAUTO) If DT.Rows.Count = 1 Then Me.cmbConnection.SelectedValue = DT.Rows(0).Item("CONNECTION_ID") SQL_ERGEBNISTextBox.Text = DT.Rows(0).Item("SQL_RESULT") @@ -141,7 +142,7 @@ Public Class SQLConfigAutoIndex Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in LoadFormData:") End Try - + End Sub Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click @@ -151,17 +152,17 @@ Public Class SQLConfigAutoIndex Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnsave.Click Try - Dim origresultstring = ClassDatabase.Execute_Scalar("SELECT SQL_RESULT FROM TBDD_INDEX_AUTOM WHERE GUID = " & CURRENT_INDEXAUTO, MyConnectionString, True) - 'Dim origConnection = ClassDatabase.Execute_Scalar("SELECT CONNECTION_ID FROM TBDD_INDEX_AUTOM WHERE GUID = " & CURRENT_INDEXAUTO, True) + Dim origresultstring = DATABASE_ECM.GetScalarValue("SELECT SQL_RESULT FROM TBDD_INDEX_AUTOM WHERE GUID = " & CURRENT_INDEXAUTO) + 'Dim origConnection = DATABASE_ECM.GetScalarValue("SELECT CONNECTION_ID FROM TBDD_INDEX_AUTOM WHERE GUID = " & CURRENT_INDEXAUTO, True) 'If origConnection Is DBNull Then 'End If Dim insresultstring = SQL_ERGEBNISTextBox.Text.Replace("'", "''") If insresultstring <> origresultstring Then Dim cmd As String - cmd = "UPDATE TBDD_INDEX_AUTOM SET CONNECTION_ID = " & cmbConnection.SelectedValue & ", SQL_RESULT = '" & insresultstring & "', CHANGED_WHO = '" & _ + cmd = "UPDATE TBDD_INDEX_AUTOM SET CONNECTION_ID = " & cmbConnection.SelectedValue & ", SQL_RESULT = '" & insresultstring & "', CHANGED_WHO = '" & Environment.UserName & "' WHERE GUID = " & CURRENT_INDEXAUTO - If ClassDatabase.Execute_non_Query(cmd, True) = True Then + If DATABASE_ECM.ExecuteNonQuery(cmd) = True Then If USER_LANGUAGE = "de-DE" Then lblSave.Text = "SQL-Daten gespeichert - " & Now Else @@ -280,7 +281,7 @@ Public Class SQLConfigAutoIndex Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in cmbSelectConditions_Changed:") End Try - + End Sub Private Sub radioTable_CheckedChanged(sender As Object, e As EventArgs) Handles radioTable.CheckedChanged @@ -320,10 +321,10 @@ Public Class SQLConfigAutoIndex type = "'VIEW'" End If - Dim typeCS As String = ClassDatabase.Execute_Scalar("SELECT SQL_PROVIDER FROM TBDD_CONNECTION WHERE GUID = " & cmbConnection.SelectedValue, MyConnectionString, True) + Dim typeCS As String = DATABASE_ECM.GetScalarValue("SELECT SQL_PROVIDER FROM TBDD_CONNECTION WHERE GUID = " & cmbConnection.SelectedValue) Dim dt As DataTable If typeCS.Length > 0 Then - Dim SQL As String = "SELECT TABLE_NAME from information_schema.tables where TABLE_TYPE = " & type & " ORDER BY TABLE_NAME" + Dim oSQL As String = "SELECT TABLE_NAME from information_schema.tables where TABLE_TYPE = " & type & " ORDER BY TABLE_NAME" Dim CS As String CS = ClassFormFunctions.GetConnectionString(cmbConnection.SelectedValue) If typeCS.ToUpper = "Oracle".ToUpper Then @@ -331,15 +332,16 @@ Public Class SQLConfigAutoIndex If type = "'VIEW'" Then 'DB-Abfrage für alle Views definieren - SQL = "select VIEW_NAME from USER_VIEWS" + oSQL = "select VIEW_NAME from USER_VIEWS" Else 'DB-Abfrage für alle Tables definieren - SQL = "select TABLE_NAME from USER_TABLES" + oSQL = "select TABLE_NAME from USER_TABLES" End If - dt = ClassDatabase.Oracle_Return_Datatable(SQL, CS, True) + dt = ClassDatabase.Oracle_Return_Datatable(oSQL, CS, True) Else - SQL = "SELECT TABLE_NAME from information_schema.tables where TABLE_TYPE = " & type & " ORDER BY TABLE_NAME" - dt = ClassDatabase.Return_Datatable_CS(SQL, CS, True) + oSQL = "SELECT TABLE_NAME from information_schema.tables where TABLE_TYPE = " & type & " ORDER BY TABLE_NAME" + 'dt = ClassDatabase.Return_Datatable_CS(SQL, CS, True) + dt = DATABASE_ECM.GetDatatableWithConnection(oSQL, CS) End If If dt IsNot Nothing Then cmbFromTables.Items.Clear() @@ -361,7 +363,7 @@ Public Class SQLConfigAutoIndex Try Dim CS As String CS = ClassFormFunctions.GetConnectionString(cmbConnection.SelectedValue) - Dim typeCS As String = ClassDatabase.Execute_Scalar("SELECT SQL_PROVIDER FROM TBDD_CONNECTION WHERE GUID = " & cmbConnection.SelectedValue, MyConnectionString, True) + Dim typeCS As String = DATABASE_ECM.GetScalarValue("SELECT SQL_PROVIDER FROM TBDD_CONNECTION WHERE GUID = " & cmbConnection.SelectedValue) Dim SQL As String Dim DT As DataTable If typeCS.ToUpper = "Oracle".ToUpper Then @@ -369,7 +371,8 @@ Public Class SQLConfigAutoIndex DT = ClassDatabase.Oracle_Return_Datatable(SQL, CS, True) Else SQL = "SELECT name FROM sys.columns WHERE object_id = OBJECT_ID('" & tableName & "') ORDER BY name" - DT = ClassDatabase.Return_Datatable_CS(SQL, CS, True) + 'DT = ClassDatabase.Return_Datatable_CS(SQL, CS, True) + DT = DATABASE_ECM.GetDatatableWithConnection(SQL, CS) End If If DT IsNot Nothing Then @@ -381,7 +384,7 @@ Public Class SQLConfigAutoIndex Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in GetColumns:") End Try - + End Sub Private Sub cmbWhereColumns_DropDown(sender As Object, e As EventArgs) Handles cmbWhereColumns.DropDown diff --git a/Global_Indexer/frmSQLSuggestion.vb b/Global_Indexer/frmSQLSuggestion.vb index e5d577f..dc4fd26 100644 --- a/Global_Indexer/frmSQLSuggestion.vb +++ b/Global_Indexer/frmSQLSuggestion.vb @@ -13,7 +13,7 @@ Public Class frmSQLSuggestion connectionString = ClassFormFunctions.GetConnectionString(conid) If connectionString <> "" Then If connectionString.Contains("Initial Catalog=") Then - 'Dim DT As DataTable = ClassDatabase.Return_Datatable(sql_Vorschlag) + 'Dim DT As DataTable = DATABASE_ECM.GetDatatable(sql_Vorschlag) 'If DT Is Nothing = False Then ' Dim y As Integer = 0 ' For Each row As DataRow In DT.Rows @@ -100,7 +100,7 @@ Public Class frmSQLSuggestion 'TODO: Diese Codezeile lädt Daten in die Tabelle "MyDataset.TBDD_CONNECTION". Sie können sie bei Bedarf verschieben oder entfernen. Me.TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString Me.TBDD_CONNECTIONTableAdapter.Fill(Me.MyDataset.TBDD_CONNECTION) - Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_INDEX_MAN WHERE GUID = " & CURRENT_INDEXMAN) + Dim DT As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_INDEX_MAN WHERE GUID = " & CURRENT_INDEXMAN) If DT.Rows.Count = 1 Then Me.cmbConnection.SelectedValue = DT.Rows(0).Item("CONNECTION_ID") SQL_ERGEBNISTextBox.Text = DT.Rows(0).Item("SQL_RESULT") @@ -129,9 +129,9 @@ Public Class frmSQLSuggestion Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click Try ClassDatabase.Init() - Dim origresultstring = ClassDatabase.Execute_Scalar("SELECT SQL_RESULT FROM TBDD_INDEX_MAN WHERE GUID = " & CURRENT_INDEXMAN, True) - Dim origcheckstring = ClassDatabase.Execute_Scalar("SELECT SQL_CHECK FROM TBDD_INDEX_MAN WHERE GUID = " & CURRENT_INDEXMAN, True) - Dim origConnection = ClassDatabase.Execute_Scalar("SELECT CONNECTION_ID FROM TBDD_INDEX_MAN WHERE GUID = " & CURRENT_INDEXMAN, True) + Dim origresultstring = DATABASE_ECM.GetScalarValue("SELECT SQL_RESULT FROM TBDD_INDEX_MAN WHERE GUID = " & CURRENT_INDEXMAN) + Dim origcheckstring = DATABASE_ECM.GetScalarValue("SELECT SQL_CHECK FROM TBDD_INDEX_MAN WHERE GUID = " & CURRENT_INDEXMAN) + Dim origConnection = DATABASE_ECM.GetScalarValue("SELECT CONNECTION_ID FROM TBDD_INDEX_MAN WHERE GUID = " & CURRENT_INDEXMAN) Dim insresultstring = SQL_ERGEBNISTextBox.Text.Replace("'", "''") Dim inscheckstring = SQL_UEBERPRUEFUNGTextBox.Text.Replace("'", "''") If insresultstring <> origresultstring Or _ @@ -139,7 +139,7 @@ Public Class frmSQLSuggestion Dim cmd As String cmd = "UPDATE TBDD_INDEX_MAN SET CONNECTION_ID = " & cmbConnection.SelectedValue & ",SQL_RESULT = '" & insresultstring & "',SQL_CHECK = '" & inscheckstring & "',CHANGED_WHO = '" & _ Environment.UserName & "' WHERE GUID = " & CURRENT_INDEXMAN - If ClassDatabase.Execute_non_Query(cmd, True) = True Then + If DATABASE_ECM.ExecuteNonQuery(cmd) = True Then If USER_LANGUAGE = "de-DE" Then lblSave.Text = "SQL-Daten erfolgreich gespeichert - " & Now Else @@ -166,7 +166,7 @@ Public Class frmSQLSuggestion Private Sub btnTestNachbearbeitung_Click(sender As Object, e As EventArgs) Handles btnTestNachbearbeitung.Click 'Die Nachbearbeitungsschritte laden - Dim DTNB As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & CURRENT_INDEXMAN & " ORDER BY SEQUENCE") + Dim DTNB As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & CURRENT_INDEXMAN & " ORDER BY SEQUENCE") If DTNB Is Nothing = False Then If DTNB.Rows.Count > 0 Then Dim value As String = ClassPostprocessing.Get_Nachbearbeitung_Wert(txtTest_idxMan.Text, DTNB) diff --git a/Global_Indexer/frmSQL_Admin.vb b/Global_Indexer/frmSQL_Admin.vb index 1e55088..1ec418e 100644 --- a/Global_Indexer/frmSQL_Admin.vb +++ b/Global_Indexer/frmSQL_Admin.vb @@ -8,7 +8,7 @@ Public Class frmSQL_Admin If txtSQL.Text <> "" Then If txtSQL.Text.ToLower.StartsWith("select") Then - Dim dt As DataTable = ClassDatabase.Return_Datatable(txtSQL.Text, True) + Dim dt As DataTable = DATABASE_ECM.GetDatatable(txtSQL.Text) If Not dt Is Nothing Then XtraTabControl1.SelectedTabPageIndex = 1 BindingSource1.DataSource = dt diff --git a/Global_Indexer/frmSQL_DESIGNER.vb b/Global_Indexer/frmSQL_DESIGNER.vb index 0fd1764..59ec885 100644 --- a/Global_Indexer/frmSQL_DESIGNER.vb +++ b/Global_Indexer/frmSQL_DESIGNER.vb @@ -66,7 +66,7 @@ Public Class frmSQL_DESIGNER 'TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString 'TBDD_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBDD_CONNECTION) - ' CURRENT_DT_SQL_CONFIG_TABLE = ClassDatabase.Return_Datatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_COMMAND,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_FINAL_INDEXING T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_INDEX_ID), True) + ' CURRENT_DT_SQL_CONFIG_TABLE = DATABASE_ECM.GetDatatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_COMMAND,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_FINAL_INDEXING T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_INDEX_ID), True) 'If (CURRENT_DESIGN_TYPE = "INPUT_INDEX") Or CURRENT_DESIGN_TYPE = "FINAL_INDEX" Then ' If CURRENT_DT_SQL_CONFIG_TABLE.Rows.Count = 1 Then ' cmbConnection.SelectedValue = CURRENT_DT_SQL_CONFIG_TABLE.Rows(0).Item("CONNECTION_ID") @@ -74,7 +74,7 @@ Public Class frmSQL_DESIGNER ' End If ' Dim oSQL = String.Format("SELECT NAME FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0} AND CTRL_TYPE <> 'LBL' ORDER BY NAME", CURRENT_ProfilGUID) - ' Dim oDatatable As DataTable = ClassDatabase.Return_Datatable(oSQL, True) + ' Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable(oSQL, True) ' cmbControls.DataSource = oDatatable ' cmbControls.DisplayMember = oDatatable.Columns(0).ColumnName ' cmbControls.Visible = True @@ -181,7 +181,7 @@ Public Class frmSQL_DESIGNER Dim connectionString As String - connectionString = ClassDatabase.Get_ConnectionString(connectionId) + connectionString = DATABASE_ECM.Get_ConnectionStringforID(connectionId) If connectionString <> "" Then @@ -295,7 +295,7 @@ Public Class frmSQL_DESIGNER Private Sub LoadConnections() Try - Dim oDatatable As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_CONNECTION") + Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_CONNECTION") cmbConnection.ValueMember = "GUID" cmbConnection.DisplayMember = "BEZEICHNUNG" @@ -315,7 +315,7 @@ Public Class frmSQL_DESIGNER Private Sub LoadControls() Try - Dim oDatatable = ClassDatabase.Return_Datatable($"SELECT * FROM TBDD_INDEX_MAN WHERE DOK_ID = {DocTypeId} AND ACTIVE = 1") + Dim oDatatable = DATABASE_ECM.GetDatatable($"SELECT * FROM TBDD_INDEX_MAN WHERE DOK_ID = {DocTypeId} AND ACTIVE = 1") cmbControls.ValueMember = "WD_INDEX" cmbControls.DisplayMember = "NAME" diff --git a/Global_Indexer/frmStart.vb b/Global_Indexer/frmStart.vb index 19218c9..4a45c8a 100644 --- a/Global_Indexer/frmStart.vb +++ b/Global_Indexer/frmStart.vb @@ -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!") diff --git a/SetupVS19/Product.wxs b/SetupVS19/Product.wxs index aff5953..2ce66b7 100644 --- a/SetupVS19/Product.wxs +++ b/SetupVS19/Product.wxs @@ -119,6 +119,7 @@ +