DAtabase integriert
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
Imports System.IO
|
||||
Imports DD_LIB_Standards
|
||||
Public Class ClassUpdate
|
||||
Public Shared MyServer_UpdatePath As String
|
||||
|
||||
@@ -26,7 +25,7 @@ Public Class ClassUpdate
|
||||
Public Shared Function Init()
|
||||
Try
|
||||
Dim sql = String.Format("SELECT * FROM TBDD_MODULES WHERE UPPER(NAME) = UPPER('Record-Organizer')")
|
||||
Dim KONFIG_DT As DataTable = clsDatabase.Return_Datatable(sql, False)
|
||||
Dim KONFIG_DT As DataTable = MYDB_ECM.GetDatatable(sql)
|
||||
If KONFIG_DT.Rows.Count = 1 Then
|
||||
MyServer_UpdatePath = KONFIG_DT.Rows(0).Item("VERSION_UPATE_PATH")
|
||||
MIN_REQUIRED_VERSION = KONFIG_DT.Rows(0).Item("MIN_REQUIRED_VERSION")
|
||||
@@ -37,7 +36,7 @@ Public Class ClassUpdate
|
||||
End Try
|
||||
End If
|
||||
sql = String.Format("Select * FROM TBDD_VERSION_UPDATE WHERE GUID = (Select MAX(GUID) FROM TBDD_VERSION_UPDATE WHERE UPPER(MODULE_NAME) = UPPER('{0}'))", "Record-Organizer")
|
||||
DT_UPDATE = clsDatabase.Return_Datatable(sql)
|
||||
DT_UPDATE = MYDB_ECM.GetDatatable(sql)
|
||||
If Not IsNothing(DT_UPDATE) Then
|
||||
If DT_UPDATE.Rows.Count = 1 Then
|
||||
UPDATE_ID = DT_UPDATE.Rows(0).Item("GUID")
|
||||
@@ -46,7 +45,7 @@ Public Class ClassUpdate
|
||||
VERSIONS_FOR_FORCE_UPDATE = DT_UPDATE.Rows(0).Item("VERSION_FORCE_UPD")
|
||||
ALL_USERS = DT_UPDATE.Rows(0).Item("ALL_USERS")
|
||||
sql = String.Format("SELECT * FROM TBDD_VERSION_ITEMS WHERE UPDATE_ID = {0} AND [INFO1] IS NOT NULL ORDER BY GUID", UPDATE_ID)
|
||||
DT_UPDATE_ITEMS = clsDatabase.Return_Datatable(sql)
|
||||
DT_UPDATE_ITEMS = MYDB_ECM.GetDatatable(sql)
|
||||
LOGGER.Info(String.Format("{0} items need to be updated!", DT_UPDATE_ITEMS.Rows.Count.ToString))
|
||||
Else
|
||||
LOGGER.Info("No Updates Configured!")
|
||||
@@ -110,7 +109,7 @@ Public Class ClassUpdate
|
||||
Dim sql = ""
|
||||
USER_USERNAME = Environment.UserName
|
||||
sql = String.Format("SELECT * FROM TBDD_USER WHERE (LOWER(USERNAME) = LOWER('{0}'))", USER_USERNAME)
|
||||
Dim USER_DT As DataTable = clsDatabase.Return_Datatable(sql, True)
|
||||
Dim USER_DT As DataTable = MYDB_ECM.GetDatatable(sql)
|
||||
If USER_DT.Rows.Count = 0 Then
|
||||
LOGGER.Warn(" - User '" & USER_USERNAME & "' not listed in Useradministration!")
|
||||
'MsgBox("Achtung: Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
|
||||
@@ -122,14 +121,14 @@ Public Class ClassUpdate
|
||||
USER_GUID = USER_DT.Rows(0).Item("GUID")
|
||||
USER_LANGUAGE = USER_DT.Rows(0).Item("LANGUAGE")
|
||||
sql = String.Format("SELECT UPDATE_PATH,TEMPPATH,INFO1,INFO2,INFO3 FROM TBDD_VERSION_USER_UPDATE_PATH WHERE USER_ID = {0} AND UPPER(MODULE_NAME) = UPPER('{1}')", USER_GUID, "Record-Organizer")
|
||||
DT_USER_DATA = clsDatabase.Return_Datatable(sql)
|
||||
DT_USER_DATA = MYDB_ECM.GetDatatable(sql)
|
||||
MyServer_UpdatePath = DT_USER_DATA.Rows(0).Item("UPDATE_PATH")
|
||||
|
||||
sql = String.Format("SELECT CASE VERSION_CLIENT WHEN '' THEN '{3}' ELSE VERSION_CLIENT END AS VERSION_CLIENT FROM VWDD_LOGIN_USER_HISTORY WHERE GUID = (select MAX(GUID) from VWDD_LOGIN_USER_HISTORY where USER_ID = {0} AND VERSION_CLIENT <> '' AND UPPER(MACHINE_NAME) = UPPER('{1}') AND UPPER(MODULE) = UPPER('{2}'))", USER_GUID, Environment.MachineName, "Record-Organizer", VERSION_SERVER)
|
||||
VERSION_USER = clsDatabase.Execute_Scalar(sql)
|
||||
VERSION_USER = MYDB_ECM.GetScalarValue(sql)
|
||||
If IsNothing(VERSION_USER) Then
|
||||
sql = String.Format("SELECT CASE VERSION_CLIENT WHEN '' THEN '{2}' ELSE VERSION_CLIENT END AS VERSION_CLIENT FROM VWDD_LOGIN_USER_HISTORY WHERE GUID = (select MAX(GUID) from VWDD_LOGIN_USER_HISTORY where USER_ID = {0} AND VERSION_CLIENT <> '' AND UPPER(MODULE) = UPPER('{1}'))", USER_GUID, "Record-Organizer", VERSION_SERVER)
|
||||
VERSION_USER = clsDatabase.Execute_Scalar(sql)
|
||||
VERSION_USER = MYDB_ECM.GetScalarValue(sql)
|
||||
If IsNothing(VERSION_USER) Then
|
||||
VERSION_USER = "1.0.0.0"
|
||||
End If
|
||||
@@ -182,35 +181,17 @@ Public Class ClassUpdate
|
||||
If UPDATE_NECESSARY = False Then
|
||||
Exit Sub
|
||||
End If
|
||||
'If FORCE_UPDATE = False Then
|
||||
|
||||
' If VERSIONS_FOR_FORCE_UPDATE.Contains(VERSION_USER) Then
|
||||
' Logger.Warn(String.Format("VersionChecker: ForceUpdate for User as Version '{0}' is used!", VERSION_USER), False)
|
||||
' ClassHelper.InsertEssential_Log(USER_GUID, "USER-ID", String.Format("VersionChecker: ForceUpdate for User as Version '{0}' is used!", VERSION_USER))
|
||||
' FORCE_UPDATE = True
|
||||
' End If
|
||||
'End If
|
||||
'If FORCE_UPDATE = False Then
|
||||
|
||||
' If ALL_USERS = False Then
|
||||
' sql = String.Format("SELECT COUNT(GUID) FROM TBDD_VERSION_USER_UPDATE WHERE USER_ID = {0} AND UPDATE_ID = {1}", USER_GUID, UPDATE_ID)
|
||||
' If clsDatabase.Execute_Scalar(sql) = 0 Then
|
||||
' Logger.Warn(String.Format("VersionChecker: User is not part of update-group - UPDATE-ID: {0}", UPDATE_ID), False)
|
||||
' ClassHelper.InsertEssential_Log(USER_GUID, "USER-ID", String.Format("VersionChecker: User is not part of update-group - UPDATE-ID: {0}", UPDATE_ID))
|
||||
' Exit Sub
|
||||
' End If
|
||||
' End If
|
||||
|
||||
Dim msg = "Auf dem Server liegt ein Update für ein ADDI-AddOn bereit!" & vbNewLine & "Wollen Sie das Update nun durchführen? Die Dauer ist abhängig von Ihrer Netzwerkverbindung!"
|
||||
If USER_LANGUAGE <> "de-DE" Then
|
||||
msg = "There is a new release available for an ADDI-AddOn!" & vbNewLine & "Would You like to install the update now? This might take some time minute(s)!"
|
||||
End If
|
||||
Dim result As MsgBoxResult
|
||||
result = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
|
||||
If result = MsgBoxResult.No Then
|
||||
UPDATE_CANCELLED = True
|
||||
Exit Sub
|
||||
End If
|
||||
result = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
|
||||
If result = MsgBoxResult.No Then
|
||||
UPDATE_CANCELLED = True
|
||||
Exit Sub
|
||||
End If
|
||||
'End If
|
||||
|
||||
If FOLDER_TEMP <> String.Empty Then
|
||||
@@ -243,22 +224,22 @@ Public Class ClassUpdate
|
||||
targetfile = Path.Combine(MY_INSTALL_PATH, Upd_item.Item("ITEM_INFO"))
|
||||
Else
|
||||
If Upd_item.Item("INFO1") <> String.Empty Then
|
||||
targetfile = Path.Combine(MY_INSTALL_PATH, Upd_item.Item("INFO1"), Upd_item.Item("ITEM_INFO"))
|
||||
Else
|
||||
targetfile = Path.Combine(MY_INSTALL_PATH, Upd_item.Item("ITEM_INFO"))
|
||||
End If
|
||||
targetfile = Path.Combine(MY_INSTALL_PATH, Upd_item.Item("INFO1"), Upd_item.Item("ITEM_INFO"))
|
||||
Else
|
||||
targetfile = Path.Combine(MY_INSTALL_PATH, Upd_item.Item("ITEM_INFO"))
|
||||
End If
|
||||
targetfile = targetfile.ToString.Replace("//", "/")
|
||||
End If
|
||||
targetfile = targetfile.ToString.Replace("//", "/")
|
||||
LOGGER.Info(String.Format("...replacing targetfile '{0}': ", targetfile))
|
||||
Try
|
||||
' Replace the file.
|
||||
If File.Exists(targetfile) Then
|
||||
If File_Rename(targetfile, BackUpOfFileToReplace) = True Then
|
||||
' Replace the file.
|
||||
If File.Exists(targetfile) Then
|
||||
If File_Rename(targetfile, BackUpOfFileToReplace) = True Then
|
||||
If File.Exists(BackUpOfFileToReplace) Then
|
||||
If KEEP_TEMPPATH Then
|
||||
If CopyFile(sourcefile, targetfile) = True Then
|
||||
File_Delete(BackUpOfFileToReplace)
|
||||
LOGGER.Warn(String.Format("...targetfile '{0}' was copied! ", targetfile), False)
|
||||
LOGGER.Warn(String.Format("...targetfile '{0}' was copied! ", targetfile))
|
||||
Dim updinfo
|
||||
If USER_INFO1 <> "" Then
|
||||
updinfo = USER_INFO1 & ";" & Upd_item.Item("INFO1") & "V" & Upd_item.Item("INFO2")
|
||||
@@ -266,7 +247,7 @@ Public Class ClassUpdate
|
||||
updinfo = Upd_item.Item("INFO1") & "V" & Upd_item.Item("INFO2")
|
||||
End If
|
||||
Dim _Sql = String.Format("Update TBDD_VERSION_USER_UPDATE_PATH SET INFO1 = '{2}' WHERE USER_ID = {0} AND UPPER(MODULE_NAME) = UPPER('{1}')", USER_GUID, "Record-Organizer", updinfo)
|
||||
clsDatabase.Execute_non_Query(_Sql)
|
||||
MYDB_ECM.ExecuteNonQuery(_Sql)
|
||||
End If
|
||||
Else
|
||||
If MoveFile(sourcefile, targetfile) = True Then
|
||||
@@ -279,7 +260,7 @@ Public Class ClassUpdate
|
||||
updinfo = Upd_item.Item("INFO1") & "V" & Upd_item.Item("INFO2")
|
||||
End If
|
||||
Dim _Sql = String.Format("Update TBDD_VERSION_USER_UPDATE_PATH SET INFO1 = '{2}' WHERE USER_ID = {0} AND UPPER(MODULE_NAME) = UPPER('{1}')", USER_GUID, "Record-Organizer", updinfo)
|
||||
clsDatabase.Execute_non_Query(_Sql)
|
||||
MYDB_ECM.ExecuteNonQuery(_Sql)
|
||||
Else
|
||||
LOGGER.Warn(String.Format("MoveFile was not successfull! BackupFile will be activated!"))
|
||||
'Verschieben hat nicht geklappt also die Backupdatei wieder umbenennen!
|
||||
@@ -290,16 +271,16 @@ Public Class ClassUpdate
|
||||
End If
|
||||
|
||||
End If
|
||||
Else
|
||||
Else
|
||||
|
||||
End If
|
||||
|
||||
|
||||
Catch ex As Exception
|
||||
Catch ex As Exception
|
||||
LOGGER.Warn(String.Format("Error while copying file {0} to {1}: " & ex.Message, sourcefile, targetfile))
|
||||
error_while_replacing = True
|
||||
UPDATE_ERROR = True
|
||||
End Try
|
||||
UPDATE_ERROR = True
|
||||
End Try
|
||||
|
||||
|
||||
|
||||
@@ -312,13 +293,13 @@ Public Class ClassUpdate
|
||||
Next
|
||||
|
||||
Dim upd = String.Format("Update TBDD_VERSION_USER_UPDATE_PATH SET TEMPPATH = '' WHERE USER_ID = {0} AND UPPER(MODULE_NAME) = UPPER('{1}')", USER_GUID, "Record-Organizer")
|
||||
clsDatabase.Execute_non_Query(upd)
|
||||
MYDB_ECM.ExecuteNonQuery(upd)
|
||||
Try
|
||||
If KEEP_TEMPPATH = False Then
|
||||
'Delete the tempfolder and all data
|
||||
System.IO.Directory.Delete(FOLDER_TEMP, True)
|
||||
Else
|
||||
LOGGER.Info(String.Format("TEMP FOLDER SHALL BE KEPT..."), False)
|
||||
LOGGER.Info(String.Format("TEMP FOLDER SHALL BE KEPT..."))
|
||||
End If
|
||||
|
||||
Catch ex As Exception
|
||||
|
||||
Reference in New Issue
Block a user