diff --git a/app/DDWDResultHandler/clsDateiverarbeitung.vb b/app/DDWDResultHandler/clsDateiverarbeitung.vb index 2078318..4492235 100644 --- a/app/DDWDResultHandler/clsDateiverarbeitung.vb +++ b/app/DDWDResultHandler/clsDateiverarbeitung.vb @@ -285,14 +285,14 @@ Public Class clsDateiverarbeitung ' Status 201 Created bedeutet: Alles okay! If code = HttpStatusCode.Created Then - clsLogger.Add($">> Datei geschrieben! docId: {DOKID}, dokart: {DOKART}, userId: {userId}", False, "BNSjsonDownload") + clsLogger.Add($">> File uploaded: docId: {DOKID}, dokart: {DOKART}, userId: {userId}", False, "BNSjsonDownload") Else Throw New Exception($"Server Error (HTTP {code}: {text})") End If End Using Return True Catch ex As Exception - clsLogger.AddError("Unvorhergesehener Fehler: " & ex.Message & " - " & ex.Source, "BNSjsonDownload") + clsLogger.AddError("Unexpected error: " & ex.Message & " - " & ex.Source, "BNSjsonDownload") Return True End Try End Function @@ -343,6 +343,7 @@ Public Class clsDateiverarbeitung End Function Private Shared Function REGEX_REPLACE(WMFile As WMObject, _STRING As String) Try + clsLogger.AddDetailLog("REGEX_String before replacing: '" & _STRING & "'") ' Regulären Ausdruck zum Auslesen der windream-Indexe definieren Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}" ' einen Regulären Ausdruck laden @@ -361,39 +362,41 @@ Public Class clsDateiverarbeitung _STRING = _STRING.Replace(reg_element.Value, EXPORTED_FILENAME) End If Else - clsLogger.Add(">> Attention: WMIndex is an vectorfield - seperation of values via ;", False, "clsDateiverarbeitung.REGEX_REPLACE") + Dim wdIndexwert ' den Wert des Indexes für das aktuelle Dokument auslesen wdIndexwert = WMFile.GetVariableValue(reg_element_Ohne_SZ) If wdIndexwert Is Nothing = False Then If Not wdIndexwert.GetType.ToString.Contains("System.Object") Then - wdIndexwert = wdIndexwert.ToString.TrimEnd wdIndexwert = wdIndexwert.ToString.TrimStart - clsLogger.AddDetailLog("Ausgelesener Indexwert = '" & wdIndexwert & "'") + clsLogger.AddDetailLog("indexvalue read is: '" & wdIndexwert & "'") _STRING = _STRING.Replace(reg_element.Value, wdIndexwert.ToString) - clsLogger.AddDetailLog("Namenkonvention (" & i & ") " & _STRING) + clsLogger.AddDetailLog("REGEX_String (" & i & ") " & _STRING) i += 1 Else - Dim result As String = "" + clsLogger.Add(">> Attention: WMIndex is an vectorfield - seperation of values via ;", False, "clsDateiverarbeitung.REGEX_REPLACE") + clsLogger.AddDetailLog("wdIndexValue is System.Object....") + clsLogger.AddDetailLog("trying to seperate via ,....") + Dim vector_result As String = "" For Each WMvalue As Object In wdIndexwert + Dim x As Integer = 0 If WMvalue.ToString <> String.Empty Then WMvalue = WMvalue.ToString.TrimEnd WMvalue = WMvalue.ToString.TrimStart - If result = "" Then - result = WMvalue + If vector_result = "" Then + vector_result = WMvalue Else - result = result & ";" & WMvalue + vector_result = vector_result & ";" & WMvalue End If + x += 1 End If Next - _STRING = _STRING.Replace(reg_element.Value, wdIndexwert.ToString) - - - Return Nothing + _STRING = _STRING.Replace(reg_element.Value, vector_result.ToString) + clsLogger.AddDetailLog("REGEX_String after vector-for-each (" & i & ") " & _STRING) End If Else - clsLogger.Add(">> Attention: Indexvalue is NOTHING, standardvalue 0 will be used", False, "clsDateiverarbeitung.REGEX_REPLACE") + clsLogger.Add(">> Attention: Indexvalue is NOTHING, standardvalue '0' will be used", False, "clsDateiverarbeitung.REGEX_REPLACE") _STRING = _STRING.Replace(reg_element.Value, "0") End If End If diff --git a/app/DDWDResultHandler/clsProfil.vb b/app/DDWDResultHandler/clsProfil.vb index 21cc071..01ade2a 100644 --- a/app/DDWDResultHandler/clsProfil.vb +++ b/app/DDWDResultHandler/clsProfil.vb @@ -235,7 +235,7 @@ Public Class clsProfil clsDateiverarbeitung.Rename_File_Vektor(WMdok, DR_PR_FILE_JOB.Item("STRING1").ToString) Case "Execute Oracle Command".ToLower Try - clsLogger.AddDetailLog("Execute Oracle Comman.......") + clsLogger.AddDetailLog("Execute Oracle Command.......") Dim oracleconnectionstring = DR_PR_FILE_JOB.Item("STRING1").ToString Dim oracleCommandRAW = DR_PR_FILE_JOB.Item("STRING2").ToString FileJobSuccessful = clsDateiverarbeitung.RUN_ORACLE_COMMAND(WMdok, oracleconnectionstring, oracleCommandRAW) diff --git a/app/ResultHandler_Konfig/clsDateiverarbeitung.vb b/app/ResultHandler_Konfig/clsDateiverarbeitung.vb index a3ff47e..e9c677b 100644 --- a/app/ResultHandler_Konfig/clsDateiverarbeitung.vb +++ b/app/ResultHandler_Konfig/clsDateiverarbeitung.vb @@ -337,6 +337,7 @@ Public Class clsDateiverarbeitung Private Shared Function REGEX_REPLACE(WMFile As WMObject, _STRING As String) Try + clsLogger.AddDetailLog("REGEX_String before replacing: '" & _STRING & "'") ' Regulären Ausdruck zum Auslesen der windream-Indexe definieren Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}" ' einen Regulären Ausdruck laden @@ -355,39 +356,41 @@ Public Class clsDateiverarbeitung _STRING = _STRING.Replace(reg_element.Value, EXPORTED_FILENAME) End If Else - clsLogger.Add(">> Attention: WMIndex is an vectorfield - seperation of values via ;", False, "clsDateiverarbeitung.REGEX_REPLACE") + Dim wdIndexwert ' den Wert des Indexes für das aktuelle Dokument auslesen wdIndexwert = WMFile.GetVariableValue(reg_element_Ohne_SZ) If wdIndexwert Is Nothing = False Then If Not wdIndexwert.GetType.ToString.Contains("System.Object") Then - wdIndexwert = wdIndexwert.ToString.TrimEnd wdIndexwert = wdIndexwert.ToString.TrimStart - clsLogger.AddDetailLog("Ausgelesener Indexwert = '" & wdIndexwert & "'") + clsLogger.AddDetailLog("indexvalue read is: '" & wdIndexwert & "'") _STRING = _STRING.Replace(reg_element.Value, wdIndexwert.ToString) - clsLogger.AddDetailLog("Namenkonvention (" & i & ") " & _STRING) + clsLogger.AddDetailLog("REGEX_String (" & i & ") " & _STRING) i += 1 Else - Dim result As String = "" + clsLogger.Add(">> Attention: WMIndex is an vectorfield - seperation of values via ;", False, "clsDateiverarbeitung.REGEX_REPLACE") + clsLogger.AddDetailLog("wdIndexValue is System.Object....") + clsLogger.AddDetailLog("trying to seperate via ,....") + Dim vector_result As String = "" For Each WMvalue As Object In wdIndexwert + Dim x As Integer = 0 If WMvalue.ToString <> String.Empty Then WMvalue = WMvalue.ToString.TrimEnd WMvalue = WMvalue.ToString.TrimStart - If result = "" Then - result = WMvalue + If vector_result = "" Then + vector_result = WMvalue Else - result = result & ";" & WMvalue + vector_result = vector_result & ";" & WMvalue End If + x += 1 End If Next - _STRING = _STRING.Replace(reg_element.Value, wdIndexwert.ToString) - - - Return Nothing + _STRING = _STRING.Replace(reg_element.Value, vector_result.ToString) + clsLogger.AddDetailLog("REGEX_String after vector-for-each (" & i & ") " & _STRING) End If Else - clsLogger.Add(">> Attention: Indexvalue is NOTHING, standardvalue 0 will be used", False, "clsDateiverarbeitung.REGEX_REPLACE") + clsLogger.Add(">> Attention: Indexvalue is NOTHING, standardvalue '0' will be used", False, "clsDateiverarbeitung.REGEX_REPLACE") _STRING = _STRING.Replace(reg_element.Value, "0") End If End If diff --git a/app/ResultHandler_Konfig/clsProfil.vb b/app/ResultHandler_Konfig/clsProfil.vb index 9949465..8de6f07 100644 --- a/app/ResultHandler_Konfig/clsProfil.vb +++ b/app/ResultHandler_Konfig/clsProfil.vb @@ -233,7 +233,7 @@ Public Class clsProfil clsDateiverarbeitung.Rename_File_Vektor(WMdok, DR_PR_FILE_JOB.Item("STRING1").ToString) Case "Execute Oracle Command".ToLower Try - clsLogger.AddDetailLog("Execute Oracle Comman.......") + clsLogger.AddDetailLog("Execute Oracle Command.......") Dim oracleconnectionstring = DR_PR_FILE_JOB.Item("STRING1").ToString Dim oracleCommandRAW = DR_PR_FILE_JOB.Item("STRING2").ToString FileJobSuccessful = clsDateiverarbeitung.RUN_ORACLE_COMMAND(WMdok, oracleconnectionstring, oracleCommandRAW)