This commit is contained in:
Digital Data - Marlon Schreiber 2018-05-03 10:30:51 +02:00
parent 8e66004110
commit d910642aac
4 changed files with 36 additions and 30 deletions

View File

@ -285,14 +285,14 @@ Public Class clsDateiverarbeitung
' Status 201 Created bedeutet: Alles okay! ' Status 201 Created bedeutet: Alles okay!
If code = HttpStatusCode.Created Then 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 Else
Throw New Exception($"Server Error (HTTP {code}: {text})") Throw New Exception($"Server Error (HTTP {code}: {text})")
End If End If
End Using End Using
Return True Return True
Catch ex As Exception Catch ex As Exception
clsLogger.AddError("Unvorhergesehener Fehler: " & ex.Message & " - " & ex.Source, "BNSjsonDownload") clsLogger.AddError("Unexpected error: " & ex.Message & " - " & ex.Source, "BNSjsonDownload")
Return True Return True
End Try End Try
End Function End Function
@ -343,6 +343,7 @@ Public Class clsDateiverarbeitung
End Function End Function
Private Shared Function REGEX_REPLACE(WMFile As WMObject, _STRING As String) Private Shared Function REGEX_REPLACE(WMFile As WMObject, _STRING As String)
Try Try
clsLogger.AddDetailLog("REGEX_String before replacing: '" & _STRING & "'")
' Regulären Ausdruck zum Auslesen der windream-Indexe definieren ' Regulären Ausdruck zum Auslesen der windream-Indexe definieren
Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}" Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
' einen Regulären Ausdruck laden ' einen Regulären Ausdruck laden
@ -361,39 +362,41 @@ Public Class clsDateiverarbeitung
_STRING = _STRING.Replace(reg_element.Value, EXPORTED_FILENAME) _STRING = _STRING.Replace(reg_element.Value, EXPORTED_FILENAME)
End If End If
Else Else
clsLogger.Add(">> Attention: WMIndex is an vectorfield - seperation of values via ;", False, "clsDateiverarbeitung.REGEX_REPLACE")
Dim wdIndexwert Dim wdIndexwert
' den Wert des Indexes für das aktuelle Dokument auslesen ' den Wert des Indexes für das aktuelle Dokument auslesen
wdIndexwert = WMFile.GetVariableValue(reg_element_Ohne_SZ) wdIndexwert = WMFile.GetVariableValue(reg_element_Ohne_SZ)
If wdIndexwert Is Nothing = False Then If wdIndexwert Is Nothing = False Then
If Not wdIndexwert.GetType.ToString.Contains("System.Object") Then If Not wdIndexwert.GetType.ToString.Contains("System.Object") Then
wdIndexwert = wdIndexwert.ToString.TrimEnd wdIndexwert = wdIndexwert.ToString.TrimEnd
wdIndexwert = wdIndexwert.ToString.TrimStart wdIndexwert = wdIndexwert.ToString.TrimStart
clsLogger.AddDetailLog("Ausgelesener Indexwert = '" & wdIndexwert & "'") clsLogger.AddDetailLog("indexvalue read is: '" & wdIndexwert & "'")
_STRING = _STRING.Replace(reg_element.Value, wdIndexwert.ToString) _STRING = _STRING.Replace(reg_element.Value, wdIndexwert.ToString)
clsLogger.AddDetailLog("Namenkonvention (" & i & ") " & _STRING) clsLogger.AddDetailLog("REGEX_String (" & i & ") " & _STRING)
i += 1 i += 1
Else 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 For Each WMvalue As Object In wdIndexwert
Dim x As Integer = 0
If WMvalue.ToString <> String.Empty Then If WMvalue.ToString <> String.Empty Then
WMvalue = WMvalue.ToString.TrimEnd WMvalue = WMvalue.ToString.TrimEnd
WMvalue = WMvalue.ToString.TrimStart WMvalue = WMvalue.ToString.TrimStart
If result = "" Then If vector_result = "" Then
result = WMvalue vector_result = WMvalue
Else Else
result = result & ";" & WMvalue vector_result = vector_result & ";" & WMvalue
End If End If
x += 1
End If End If
Next Next
_STRING = _STRING.Replace(reg_element.Value, wdIndexwert.ToString) _STRING = _STRING.Replace(reg_element.Value, vector_result.ToString)
clsLogger.AddDetailLog("REGEX_String after vector-for-each (" & i & ") " & _STRING)
Return Nothing
End If End If
Else 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") _STRING = _STRING.Replace(reg_element.Value, "0")
End If End If
End If End If

View File

@ -235,7 +235,7 @@ Public Class clsProfil
clsDateiverarbeitung.Rename_File_Vektor(WMdok, DR_PR_FILE_JOB.Item("STRING1").ToString) clsDateiverarbeitung.Rename_File_Vektor(WMdok, DR_PR_FILE_JOB.Item("STRING1").ToString)
Case "Execute Oracle Command".ToLower Case "Execute Oracle Command".ToLower
Try Try
clsLogger.AddDetailLog("Execute Oracle Comman.......") clsLogger.AddDetailLog("Execute Oracle Command.......")
Dim oracleconnectionstring = DR_PR_FILE_JOB.Item("STRING1").ToString Dim oracleconnectionstring = DR_PR_FILE_JOB.Item("STRING1").ToString
Dim oracleCommandRAW = DR_PR_FILE_JOB.Item("STRING2").ToString Dim oracleCommandRAW = DR_PR_FILE_JOB.Item("STRING2").ToString
FileJobSuccessful = clsDateiverarbeitung.RUN_ORACLE_COMMAND(WMdok, oracleconnectionstring, oracleCommandRAW) FileJobSuccessful = clsDateiverarbeitung.RUN_ORACLE_COMMAND(WMdok, oracleconnectionstring, oracleCommandRAW)

View File

@ -337,6 +337,7 @@ Public Class clsDateiverarbeitung
Private Shared Function REGEX_REPLACE(WMFile As WMObject, _STRING As String) Private Shared Function REGEX_REPLACE(WMFile As WMObject, _STRING As String)
Try Try
clsLogger.AddDetailLog("REGEX_String before replacing: '" & _STRING & "'")
' Regulären Ausdruck zum Auslesen der windream-Indexe definieren ' Regulären Ausdruck zum Auslesen der windream-Indexe definieren
Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}" Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
' einen Regulären Ausdruck laden ' einen Regulären Ausdruck laden
@ -355,39 +356,41 @@ Public Class clsDateiverarbeitung
_STRING = _STRING.Replace(reg_element.Value, EXPORTED_FILENAME) _STRING = _STRING.Replace(reg_element.Value, EXPORTED_FILENAME)
End If End If
Else Else
clsLogger.Add(">> Attention: WMIndex is an vectorfield - seperation of values via ;", False, "clsDateiverarbeitung.REGEX_REPLACE")
Dim wdIndexwert Dim wdIndexwert
' den Wert des Indexes für das aktuelle Dokument auslesen ' den Wert des Indexes für das aktuelle Dokument auslesen
wdIndexwert = WMFile.GetVariableValue(reg_element_Ohne_SZ) wdIndexwert = WMFile.GetVariableValue(reg_element_Ohne_SZ)
If wdIndexwert Is Nothing = False Then If wdIndexwert Is Nothing = False Then
If Not wdIndexwert.GetType.ToString.Contains("System.Object") Then If Not wdIndexwert.GetType.ToString.Contains("System.Object") Then
wdIndexwert = wdIndexwert.ToString.TrimEnd wdIndexwert = wdIndexwert.ToString.TrimEnd
wdIndexwert = wdIndexwert.ToString.TrimStart wdIndexwert = wdIndexwert.ToString.TrimStart
clsLogger.AddDetailLog("Ausgelesener Indexwert = '" & wdIndexwert & "'") clsLogger.AddDetailLog("indexvalue read is: '" & wdIndexwert & "'")
_STRING = _STRING.Replace(reg_element.Value, wdIndexwert.ToString) _STRING = _STRING.Replace(reg_element.Value, wdIndexwert.ToString)
clsLogger.AddDetailLog("Namenkonvention (" & i & ") " & _STRING) clsLogger.AddDetailLog("REGEX_String (" & i & ") " & _STRING)
i += 1 i += 1
Else 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 For Each WMvalue As Object In wdIndexwert
Dim x As Integer = 0
If WMvalue.ToString <> String.Empty Then If WMvalue.ToString <> String.Empty Then
WMvalue = WMvalue.ToString.TrimEnd WMvalue = WMvalue.ToString.TrimEnd
WMvalue = WMvalue.ToString.TrimStart WMvalue = WMvalue.ToString.TrimStart
If result = "" Then If vector_result = "" Then
result = WMvalue vector_result = WMvalue
Else Else
result = result & ";" & WMvalue vector_result = vector_result & ";" & WMvalue
End If End If
x += 1
End If End If
Next Next
_STRING = _STRING.Replace(reg_element.Value, wdIndexwert.ToString) _STRING = _STRING.Replace(reg_element.Value, vector_result.ToString)
clsLogger.AddDetailLog("REGEX_String after vector-for-each (" & i & ") " & _STRING)
Return Nothing
End If End If
Else 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") _STRING = _STRING.Replace(reg_element.Value, "0")
End If End If
End If End If

View File

@ -233,7 +233,7 @@ Public Class clsProfil
clsDateiverarbeitung.Rename_File_Vektor(WMdok, DR_PR_FILE_JOB.Item("STRING1").ToString) clsDateiverarbeitung.Rename_File_Vektor(WMdok, DR_PR_FILE_JOB.Item("STRING1").ToString)
Case "Execute Oracle Command".ToLower Case "Execute Oracle Command".ToLower
Try Try
clsLogger.AddDetailLog("Execute Oracle Comman.......") clsLogger.AddDetailLog("Execute Oracle Command.......")
Dim oracleconnectionstring = DR_PR_FILE_JOB.Item("STRING1").ToString Dim oracleconnectionstring = DR_PR_FILE_JOB.Item("STRING1").ToString
Dim oracleCommandRAW = DR_PR_FILE_JOB.Item("STRING2").ToString Dim oracleCommandRAW = DR_PR_FILE_JOB.Item("STRING2").ToString
FileJobSuccessful = clsDateiverarbeitung.RUN_ORACLE_COMMAND(WMdok, oracleconnectionstring, oracleCommandRAW) FileJobSuccessful = clsDateiverarbeitung.RUN_ORACLE_COMMAND(WMdok, oracleconnectionstring, oracleCommandRAW)