From 78cb6183a7089a8c98283ae5c5a404dbfa797ec8 Mon Sep 17 00:00:00 2001
From: Andreas Luxbauer <al@verag.ag>
Date: Mon, 11 Sep 2023 14:42:47 +0200
Subject: [PATCH] Datenserver ArchivArchiv

---
 SDL/SDL.vbproj                                |  5 ++-
 .../DATENSERVER/cDATENSERVER.vb               | 37 +++++++++++++------
 .../ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb   |  1 -
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj
index baede251..97ae67f9 100644
--- a/SDL/SDL.vbproj
+++ b/SDL/SDL.vbproj
@@ -75,10 +75,10 @@
     <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestCertificateThumbprint>5A6BD29D23A7643243CD6EFA1FEF21BAF955E653</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>9DA3E6C8D44F11BA82886C378927AB1B3DD018FF</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestKeyFile>AL20210908.pfx</ManifestKeyFile>
+    <ManifestKeyFile>SDL_1_TemporaryKey.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
     <GenerateManifests>true</GenerateManifests>
@@ -4152,6 +4152,7 @@
     </None>
     <None Include="Resources\SR_EVOLOG.xlsx" />
     <None Include="Resources\SR_TransFerry360.xlsx" />
+    <None Include="SDL_1_TemporaryKey.pfx" />
     <None Include="Test.pfx" />
     <None Include="Web References\eu.europa.ec1\eoriValidationResult.datasource">
       <DependentUpon>Reference.map</DependentUpon>
diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
index 593c17ae..b472b58b 100644
--- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
+++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
@@ -121,7 +121,7 @@ Public Class cDATENSERVER
                 Dim top = ""
                 If TopMax > 0 Then top = " TOP (" & TopMax & ") "
                 'MsgBox("SELECT * FROM tblDatenarchiv WHERE da_KundenNr =  '" & Me.da_KundenNr & "' And da_kategorie = '" & Me.da_kategorie & "' And da_ordner ='" & Me.da_ordner & "' AND da_uOrdner1= '" & Me.da_uOrdner1 & "' AND da_uOrdner2= '" & Me.da_uOrdner2 & "' AND da_uOrdner3= '" & Me.da_uOrdner3 & "' AND da_name='" & Me.da_name & "' ")
-                Using cmd As New SqlCommand("SELECT " & TopMax & " * FROM tblDatenarchiv WHERE da_KundenNr = @da_KundenNr  AND da_kategorie = @da_kategorie AND da_ordner=@da_ordner AND da_uOrdner1= @da_uOrdner1 AND da_uOrdner2= @da_uOrdner2 AND da_uOrdner3= @da_uOrdner3 AND da_name=@da_name ", conn)
+                Using cmd As New SqlCommand("SELECT " & top & " * FROM tblDatenarchiv WHERE da_KundenNr = @da_KundenNr  AND da_kategorie = @da_kategorie AND da_ordner=@da_ordner AND da_uOrdner1= @da_uOrdner1 AND da_uOrdner2= @da_uOrdner2 AND da_uOrdner3= @da_uOrdner3 AND da_name=@da_name ", conn)
                     cmd.Parameters.AddWithValue("@da_KundenNr", Me.da_KundenNr)
                     ' cmd.Parameters.AddWithValue("@da_vorlage", Me.da_vorlage)
                     cmd.Parameters.AddWithValue("@da_kategorie", Me.da_kategorie)
@@ -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
diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb
index f7cd01d9..016aba99 100644
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb
@@ -658,7 +658,6 @@ Public Class cATEZ_NCTS_IN
 
         ncts.json = jsonData.Emit()
 
-        MsgBox(ncts.json)
 
         Return success