This commit is contained in:
Digital Data - Marlon Schreiber
2019-01-22 11:09:01 +01:00
parent f5eae6a1d8
commit 9b2da41c72
9 changed files with 103 additions and 51 deletions

View File

@@ -143,11 +143,11 @@ Public Class ClassImport_Windream
If Not IsDBNull(oDYNAMIC_FOLDER) Then
If oDYNAMIC_FOLDER <> String.Empty Then
If CREATE_FOLDER_INDEX(oDYNAMIC_FOLDER, DocTypeID) = True And CURRENT_VARIABLE_FOLDER <> "" Then
If CURRENT_VARIABLE_FOLDER_OVERRIDE = True Then
oWMTARGET_FOLDER = CURRENT_VARIABLE_FOLDER
Else
oWMTARGET_FOLDER = oWMTARGET_FOLDER & "\" & CURRENT_VARIABLE_FOLDER
End If
'If CURRENT_VARIABLE_FOLDER_OVERRIDE = True Then
' oWMTARGET_FOLDER = CURRENT_VARIABLE_FOLDER
'Else
oWMTARGET_FOLDER = oWMTARGET_FOLDER & "\" & CURRENT_VARIABLE_FOLDER
'End If
Else
MsgBox("Unexpected Error in Creating Variable Folder - Check logfile!", MsgBoxStyle.Critical)
@@ -489,6 +489,7 @@ Public Class ClassImport_Windream
For Each element As System.Text.RegularExpressions.Match In elemente
If LogErrorsOnly = False Then ClassLogger.Add(" >> Elementname in FolderString: '" & element.ToString & "'", False)
Dim EL_SUBSTRING = element.Value.Substring(2, 1).ToUpper
If LogErrorsOnly = False Then ClassLogger.Add(" >> EL_SUBSTRING is: '" & EL_SUBSTRING & "'", False)
Select Case EL_SUBSTRING
'Manueller Indexwert
Case "A"
@@ -518,6 +519,7 @@ Public Class ClassImport_Windream
If IsDBNull(AUTOindexresult) Then
ClassLogger.Add(">> unexpected: AUTOindexresult is DBNULL - " & sql_command, False)
Else
If LogErrorsOnly = False Then ClassLogger.Add(" >> AUTOindexresult is: '" & AUTOindexresult & "'", False)
FolderConvention = FolderConvention.Replace(element.ToString, AUTOindexresult)
End If
End If
@@ -584,6 +586,7 @@ Public Class ClassImport_Windream
Dim split() As String = elmt
If split.Length = 2 Then
Dim VARTYPE = split(0)
If LogErrorsOnly = False Then ClassLogger.Add(" >> VARTYPE is: '" & VARTYPE & "'", False)
Select Case VARTYPE
Case "ARDoctype"
FolderConvention = FolderConvention.Replace(element.ToString, CURRENT_DOKARTSTRING)
@@ -687,6 +690,7 @@ Public Class ClassImport_Windream
ClassLogger.Add(" -Undefined pattern found in folderconvention" & vbNewLine & "Elementname: " & element.Value.ToUpper)
MsgBox("Achtung - in der Namenkonvention wurde ein Element gefunden welches nicht zugeordnet werden kann!" & vbNewLine & "Elementname: " & element.Value.ToUpper, MsgBoxStyle.Exclamation, "Unexpected error in Name generieren:")
End Select
If LogErrorsOnly = False Then ClassLogger.Add($" >> FolderConvention so far is: '{FolderConvention}'", False)
Next
CURRENT_VARIABLE_FOLDER = FolderConvention
Return True