neu

VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb

@@ -212,7 +212,6 @@ Public Class cDATENSERVER
             Return (destpath <> "")
         End If
         Return ""
-
     End Function
 
     Public Function insertDataToDATENSERVER(srcPath, Optional bezeichnung = "", Optional endung = "", Optional allowMsg = True, Optional coll_archiv = False) As Boolean
@@ -443,7 +442,7 @@ Public Class cDATENSERVER
     '   End Try
     'End Function
 
-    Public Sub DELETE_COMPLETE()
+    Public Function DELETE_COMPLETE() As Boolean
         Try
             If DATA_LIST.DELETE_ALL() Then
                 ' Dim path = SQL.getValueTxtBySql("SELECT TOP 1 isnull([coll_pfad],'')  FROM [tblDatenarchiv] INNER JOIN [tblDatenarchiv_Collection] ON [da_id]=[coll_daId] WHERE  da_id='" & da_id & "'  ", "FMZOLL")
@@ -455,8 +454,11 @@ Public Class cDATENSERVER
                 'SQL.doSQL("DELETE FROM [tblDatenarchiv_Collection]  WHERE [coll_daId]=" & id & " ", "FMZOLL")
             End If
         Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+            Return False
         End Try
-    End Sub
+        Return True
+    End Function
 
 
 
@@ -1156,7 +1158,9 @@ Public Class cDatenarchiv_Collection
             If coll_pfad.Contains("\\192.168.0.91\DATENARCHIV\") Then 'Um sicher zu gehen, dass der pfad im richtigem VZ ist.
                 If My.Computer.FileSystem.FileExists(coll_pfad) Then
                     saveFileToDel(coll_pfad)
-                    IO.File.Delete(coll_pfad)
+                    Try
+                        IO.File.Delete(coll_pfad)
+                    Catch : End Try
                     Return SQL.doSQL("DELETE FROM [tblDatenarchiv_Collection]  WHERE [coll_id]=" & coll_id & " ", "FMZOLL")
                 Else
                     Return True
@@ -1286,7 +1290,7 @@ Public Class cDatenserverIDCollectionList
             LIST.Clear()
             Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
                 'Using cmd As New SqlCommand("SELECT coll_id, coll_daId, da_pfad, da_name FROM tblDatenarchiv_Collection INNER JOIN tblDatenarchiv ON coll_daId=da_id WHERE coll_id=@coll_id  ", conn)
-                Using cmd As New SqlCommand("SELECT coll_id, coll_daId, coll_pfad, coll_bezeichnung,coll_info,coll_archiv FROM tblDatenarchiv_Collection WHERE coll_daId=@coll_daId  ", conn)
+                Using cmd As New SqlCommand("SELECT coll_id, coll_daId, coll_pfad, coll_bezeichnung,coll_info,coll_archiv FROM tblDatenarchiv_Collection WHERE coll_daId=@coll_daId order by coll_bezeichnung ", conn)
                     cmd.Parameters.AddWithValue("@coll_daId", Me.coll_daId)
                     Dim dr = cmd.ExecuteReader()
                     'LIST = New List(Of cDatenarchiv_Collection)
@@ -1423,6 +1427,7 @@ Public Class DATENVERVER_OPTIONS
 
     Shared Function getTMPPath(name As String, extension As String, Optional special As Boolean = False, Optional delete As Boolean = True, Optional unterOrdner As String = "") As String
         Dim TMP_PATH2 = TMP_PATH & If(unterOrdner <> "", "\" & unterOrdner & "\", "")
+        TMP_PATH2 = TMP_PATH2.replace("\\", "\")
         If Not My.Computer.FileSystem.DirectoryExists(TMP_PATH2) Then
             My.Computer.FileSystem.CreateDirectory(TMP_PATH2)
         End If