Remove ClassDatabase, Replace with Database.MSSQL Module
This commit is contained in:
Jonathan Jenne
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user