diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 77deaed3..d6463211 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -75,7 +75,7 @@ My Project\app.manifest - 8B3264F2EDBE66B5FA479F03C76671401D4413B7 + 9DA3E6C8D44F11BA82886C378927AB1B3DD018FF SDL_1_TemporaryKey.pfx diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb index 2fe6fb56..b472b58b 100644 --- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb +++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb @@ -187,23 +187,38 @@ Public Class cDATENSERVER ' My.Computer.FileSystem.RenameDirectory(oldDIR, newname) For Each li In DATA_LIST.LIST - MsgBox(oldDIR) - MsgBox(newDIR) Dim newPfad = li.coll_pfad.Replace(oldDIR, newDIR) - MsgBox(li.coll_pfad) - MsgBox(newPfad) + 'MsgBox(li.coll_pfad) + ' MsgBox(newPfad) If Not IO.Directory.Exists(newDIR) Then IO.Directory.CreateDirectory(newDIR) - My.Computer.FileSystem.CopyFile(li.coll_pfad, newPfad, True) - My.Computer.FileSystem.DeleteFile(li.coll_pfad) - li.coll_pfad = newPfad - If Not li.UPDATE() Then - Return False - End If + Try + If Not li.coll_pfad.ToLower.StartsWith("\\stor01.verag.ost.dmn\datenarchivarchiv") Then + If Not li.coll_pfad.Contains("?") Then + If IO.File.Exists(li.coll_pfad) Then + My.Computer.FileSystem.CopyFile(li.coll_pfad, newPfad, True) + My.Computer.FileSystem.DeleteFile(li.coll_pfad) + li.coll_pfad = newPfad + If Not li.UPDATE() Then + Return False + End If + Else + 'Datei Existiert nicht! + li.coll_pfad = li.coll_pfad.Replace("\\datenarchiv.verag.ost.dmn\", "\\DELETED\") + If Not li.UPDATE() Then + Return False + End If + End If + End If + End If + Catch ex2 As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex2.Message, li.coll_pfad & vbNewLine & newPfad & vbNewLine & vbNewLine & ex2.Message & vbNewLine & ex2.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try Next Return UPDATE() Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try Return False End Function