Remove ClassDatabase, Replace with Database.MSSQL Module

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

View File

@@ -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)