edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

Browse Source
This commit is contained in:
d.breimaier
2023-09-12 12:19:51 +02:00
parent a73761c233 68ba82a3ae
commit b8889719bd
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SDL/SDL.vbproj
View File

@@ -75,7 +75,7 @@
<ApplicationManifest>My Project\app.manifest</ApplicationManifest> <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ManifestCertificateThumbprint>8B3264F2EDBE66B5FA479F03C76671401D4413B7</ManifestCertificateThumbprint> <ManifestCertificateThumbprint>9DA3E6C8D44F11BA82886C378927AB1B3DD018FF</ManifestCertificateThumbprint>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ManifestKeyFile>SDL_1_TemporaryKey.pfx</ManifestKeyFile> <ManifestKeyFile>SDL_1_TemporaryKey.pfx</ManifestKeyFile>

35
VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
View File

@@ -187,23 +187,38 @@ Public Class cDATENSERVER
' My.Computer.FileSystem.RenameDirectory(oldDIR, newname) ' My.Computer.FileSystem.RenameDirectory(oldDIR, newname)
For Each li In DATA_LIST.LIST For Each li In DATA_LIST.LIST
MsgBox(oldDIR)
MsgBox(newDIR)
Dim newPfad = li.coll_pfad.Replace(oldDIR, newDIR) Dim newPfad = li.coll_pfad.Replace(oldDIR, newDIR)
MsgBox(li.coll_pfad) 'MsgBox(li.coll_pfad)
MsgBox(newPfad) ' MsgBox(newPfad)
If Not IO.Directory.Exists(newDIR) Then IO.Directory.CreateDirectory(newDIR) If Not IO.Directory.Exists(newDIR) Then IO.Directory.CreateDirectory(newDIR)
My.Computer.FileSystem.CopyFile(li.coll_pfad, newPfad, True) Try
My.Computer.FileSystem.DeleteFile(li.coll_pfad) If Not li.coll_pfad.ToLower.StartsWith("\\stor01.verag.ost.dmn\datenarchivarchiv") Then
li.coll_pfad = newPfad If Not li.coll_pfad.Contains("?") Then
If Not li.UPDATE() Then If IO.File.Exists(li.coll_pfad) Then
Return False My.Computer.FileSystem.CopyFile(li.coll_pfad, newPfad, True)
End If 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 Next
Return UPDATE() Return UPDATE()
Catch ex As Exception 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) 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 End Try
Return False Return False
End Function End Function