Update Iris_Forms_LSV und UVM

EDKB08/EDKB08/bin/EDKB08.xml

@@ -440,6 +440,7 @@ Komma-getrennte Textdatei auslesen</summary>
 <member name="M:EDKB08.clsIndexData.xmlinput">
 <summary>XML-Datei als Datatable einlesen</summary>
 <author>Stefan Hutter</author>
+
 </member>
 <member name="M:EDKB08.clsIndexData.Datentabelle_Erstellen">
 <summary>Datentabelle "Indexdata" erstellen, damit die Komma-Getrennten

EDKB08/EDKB08/edkb08/Globals.vb

@@ -35,6 +35,10 @@ Module Globals
             Return True
             Exit Function
         End If
+        If Input = "IRIS_FORMS_UVM" Then
+            Return True
+            Exit Function
+        End If
         Return False
     End Function
 

EDKB08/EDKB08/edkb08/clsCheckandImport.vb

@@ -1072,7 +1072,12 @@ Public Class clsCheckandImport
         'scmCmdToExecute.Parameters.Add(New SqlParameter("@Dokumenttyp", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, Me.IndexData.Rows(i).Item(11)))
         'scmCmdToExecute.Parameters.Add(New SqlParameter("@InputAppl", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, Me.IndexData.Rows(i).Item(17)))
 
-        scmCmdToExecute.Parameters.Add(New SqlParameter("@Dokumenttyp", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, Me.IndexData.Rows(i).Item("Dokumenttypnr")))
+        Try
+            scmCmdToExecute.Parameters.Add(New SqlParameter("@Dokumenttyp", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, Me.IndexData.Rows(i).Item("Dokumenttypnr")))
+        Catch
+            scmCmdToExecute.Parameters.Add(New SqlParameter("@Dokumenttyp", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, Me.IndexData.Rows(i).Item(11)))
+        End Try
+
         scmCmdToExecute.Parameters.Add(New SqlParameter("@InputAppl", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, Me.IndexData.Rows(i).Item("Herkunftsapplikation")))
 
         Try

EDKB08/EDKB08/edkb08/clsIndexData.vb

@@ -162,6 +162,7 @@ Public Class clsIndexData
     End Sub
 
     Private Sub map_iris_LSV(ByRef idxds As DataSet)
+
         Dim tmpds As New DataSet
         tmpds.ReadXml(System.AppDomain.CurrentDomain.BaseDirectory + "\edkb08struktur.xml")
         tmpds.Tables(0).Columns.Add("DOKUMENTWERT21")
@@ -205,40 +206,68 @@ Public Class clsIndexData
         idxds.Tables.Add(tmpds.Tables(0).Copy)
         tmpds.Dispose()
     End Sub
+
+    Private Function parsexml(ByVal istr As String) As String
+        istr = istr.Replace("&", "&")
+        Return istr
+    End Function
+
     '''<summary>XML-Datei als Datatable einlesen</summary>
     '''<author>Stefan Hutter</author>
+    '''
     Private Sub xmlinput()
         Try
+
+
             Dim idxds As New DataSet()
-            idxds.ReadXml(Me.IndexFileName)
+            Try
+                idxds.ReadXml(Me.IndexFileName)
+            Catch
+                FileOpen(21, Me.IndexFileName, OpenMode.Input)
+                FileOpen(22, Me.IndexFileName + ".tmp", OpenMode.Output)
+                Dim il As String
+                Dim ol As String
+                While Not EOF(21)
+                    Input(21, il)
+
+                    ol = parsexml(il)
+                    PrintLine(22, ol)
+                End While
+                FileClose(21)
+                FileClose(22)
+                File.Delete(Me.IndexFileName)
+                Rename(Me.IndexFileName + ".tmp", Me.IndexFileName)
+                idxds.ReadXml(Me.IndexFileName)
+            End Try
+
 
             Try
-                If Globals.Canon_Herkunft(idxds.Tables(0).Rows(0).Item("Herkunftsapplikation")) Then
+                    If Globals.Canon_Herkunft(idxds.Tables(0).Rows(0).Item("Herkunftsapplikation")) Then
                     '20210816 - LSV
                     If idxds.Tables(0).Rows(0).Item("Herkunftsapplikation") = "IRIS_FORMS_LSV" Then
-                        map_iris_lsv(idxds)
+                        map_iris_LSV(idxds)
                     Else
 
                         map_iris_struktur(idxds)
+                        End If
+
                     End If
 
-                End If
+                Catch ex As Exception
 
+                End Try 'canon-Mapping'
+                'Anpassungen EBES_LSV
+                Dim i As Integer
+                For i = 0 To idxds.Tables.Count - 1
+                    '-- Canon von >20 auf > 5 geändert
+                    If idxds.Tables(i).Columns.Count > 20 Then
+                        Me.Indexdata = idxds.Tables(i)
+                        Exit For
+                    End If
+                Next
+                '            Me.Indexdata = idxds.Tables(0)
             Catch ex As Exception
-
+                Journal.Insert_Journal("", "", "", Me.IndexFileName, 16, "Fehler beim einlesen der XML-Datei:   " + ex.Message, "", "")
-            End Try 'canon-Mapping'
-            'Anpassungen EBES_LSV
-            Dim i As Integer
-            For i = 0 To idxds.Tables.Count - 1
-                '-- Canon von >20 auf > 5 geändert
-                If idxds.Tables(i).Columns.Count > 20 Then
-                    Me.Indexdata = idxds.Tables(i)
-                    Exit For
-                End If
-            Next
-            '            Me.Indexdata = idxds.Tables(0)
-        Catch ex As Exception
-            Journal.Insert_Journal("", "", "", Me.IndexFileName, 16, "Fehler beim einlesen der XML-Datei: " + ex.Message, "", "")
         End Try
     End Sub
 

EDKB08/EDKB08/obj/Debug/EDKB08.xml

@@ -440,6 +440,7 @@ Komma-getrennte Textdatei auslesen</summary>
 <member name="M:EDKB08.clsIndexData.xmlinput">
 <summary>XML-Datei als Datatable einlesen</summary>
 <author>Stefan Hutter</author>
+
 </member>
 <member name="M:EDKB08.clsIndexData.Datentabelle_Erstellen">
 <summary>Datentabelle "Indexdata" erstellen, damit die Komma-Getrennten

EDKB08/EDKB08/obj/Release/EDKB08.xml

@@ -440,6 +440,7 @@ Komma-getrennte Textdatei auslesen</summary>
 <member name="M:EDKB08.clsIndexData.xmlinput">
 <summary>XML-Datei als Datatable einlesen</summary>
 <author>Stefan Hutter</author>
+
 </member>
 <member name="M:EDKB08.clsIndexData.Datentabelle_Erstellen">
 <summary>Datentabelle "Indexdata" erstellen, damit die Komma-Getrennten

EDKB17/EDKB17/EDKB17/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.vb

@@ -0,0 +1,7 @@
+' <autogenerated/>
+            Option Strict Off
+            Option Explicit On
+
+            Imports System
+            Imports System.Reflection
+            <Assembly: Global.System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName:=".NET Framework 4")>

EDKB19/EDKB18/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.vb

@@ -0,0 +1,7 @@
+' <autogenerated/>
+            Option Strict Off
+            Option Explicit On
+
+            Imports System
+            Imports System.Reflection
+            <Assembly: Global.System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName:=".NET Framework 4")>