MS_ChangesKW38

app/DD-Record-Organizer/ClassUpdate.vb

@@ -30,8 +30,9 @@ Public Class ClassUpdate
             Dim KONFIG_DT As DataTable = clsDatabase.Return_Datatable(sql, False)
             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")
             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")
+            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, False)
             If Not IsNothing(DT_UPDATE) Then
                 If DT_UPDATE.Rows.Count = 1 Then
@@ -259,6 +260,8 @@ Public Class ClassUpdate
             Dim error_while_replacing = False
             For Each Upd_item As DataRow In DT_UPDATE_ITEMS.Rows
                 Dim BackUpOfFileToReplace As String = MY_INSTALL_PATH & "\" & Upd_item.Item("INFO1") & Upd_item.Item("ITEM_INFO") & ".bac"
+                BackUpOfFileToReplace = BackUpOfFileToReplace.Replace("//", "/")
+
                 Dim sourcefile = Path.Combine(FOLDER_TEMP, Upd_item.Item("ITEM_INFO"))
                 Dim targetfile
                 If IsDBNull(Upd_item.Item("INFO1")) Then
@@ -270,17 +273,20 @@ Public Class ClassUpdate
                         targetfile = Path.Combine(MY_INSTALL_PATH, Upd_item.Item("ITEM_INFO"))
                     End If
                 End If
-
+                targetfile = targetfile.ToString.Replace("//", "/")
                 Try
                     ' Replace the file.
                     If File.Exists(targetfile) Then
                         If File_Rename(targetfile, BackUpOfFileToReplace) = True Then
-                            If MoveFile(sourcefile, targetfile) = True Then
-                                File_Delete(BackUpOfFileToReplace)
-                            Else
-                                'Verschieben hat nicht geklappt also die Backupdatei wieder umbenennen!
-                                File_Rename(BackUpOfFileToReplace, targetfile)
+                            If File.Exists(BackUpOfFileToReplace) Then
+                                If MoveFile(sourcefile, targetfile) = True Then
+                                    File_Delete(BackUpOfFileToReplace)
+                                Else
+                                    'Verschieben hat nicht geklappt also die Backupdatei wieder umbenennen!
+                                    File_Rename(BackUpOfFileToReplace, targetfile)
+                                End If
                             End If
+
                         End If
                     Else
                         MoveFile(sourcefile, targetfile)
@@ -302,7 +308,6 @@ Public Class ClassUpdate
     End Sub
     Private Shared Function File_Rename(targetfile As String, Renamefilestring As String)
         Try
-
             Renamefilestring = Renamefilestring.Replace("\\", "\")
             If File.Exists(Renamefilestring) Then
 
@@ -310,11 +315,10 @@ Public Class ClassUpdate
                     Return False
                 End If
             End If
-
             Rename(targetfile, Renamefilestring)
             Return True
         Catch ex As Exception
-            ClassLogger.Add(String.Format("Unexpected Error in File_Rename: " & "targetfile '{0}'" & "Renamefilestring '{1}'" & "ERROR: {2}", targetfile, Renamefilestring, ex.Message))
+            ClassLogger.Add(String.Format("ClassUpdate - Unexpected Error in File_Rename: " & "OldPath '{0}'" & "NewPath '{1}'" & "ERROR: {2}", targetfile, Renamefilestring, ex.Message))
             UPDATE_ERROR = True
             Return False
         End Try