This commit is contained in:
SchreiberM
2016-08-17 11:32:45 +02:00
parent b811570870
commit 32192cf542
70 changed files with 7103 additions and 9527 deletions

View File

@@ -541,30 +541,41 @@ Public Class ClassImport_Windream
ClassLogger.Add(">> split.Length <> 2 - APattern: " & element.Value, False)
End If
Case "V"
Dim folder_temp As String
Dim _Month As String = My.Computer.Clock.LocalTime.Month
If _Month.Length = 1 Then
_Month = "0" & _Month
Dim elmt = element.Value.Substring(3, element.Value.Length - 4).Split("#")
Dim split() As String = elmt
If split.Length = 2 Then
Dim VARTYPE = split(0)
Select Case VARTYPE
Case "ARDoctype"
FolderConvention = FolderConvention.Replace(element.ToString, CURRENT_DOKARTSTRING)
End Select
Else
Dim folder_temp As String
Dim _Month As String = My.Computer.Clock.LocalTime.Month
If _Month.Length = 1 Then
_Month = "0" & _Month
End If
Dim _day As String = My.Computer.Clock.LocalTime.Day
If _day.Length = 1 Then
_day = "0" & _day
End If
Dim type = element.Value.Substring(3, element.Value.Length - 4)
If type.StartsWith("_") Then
type = type.Replace("_", "")
End If
Select Case type
Case "YYYY/MM/DD"
folder_temp = My.Computer.Clock.LocalTime.Year & "\" & _Month & "\" & _day
Case "YYYY/MM"
folder_temp = My.Computer.Clock.LocalTime.Year & "\" & _Month
Case "YYYY"
folder_temp = My.Computer.Clock.LocalTime.Year
Case "YYYY-MM"
folder_temp = My.Computer.Clock.LocalTime.Year & "-" & _Month
End Select
FolderConvention = FolderConvention.Replace(element.ToString, folder_temp)
End If
Dim _day As String = My.Computer.Clock.LocalTime.Day
If _day.Length = 1 Then
_day = "0" & _day
End If
Dim type = element.Value.Substring(3, element.Value.Length - 4)
If type.StartsWith("_") Then
type = type.Replace("_", "")
End If
Select Case type
Case "YYYY/MM/DD"
folder_temp = My.Computer.Clock.LocalTime.Year & "\" & _Month & "\" & _day
Case "YYYY/MM"
folder_temp = My.Computer.Clock.LocalTime.Year & "\" & _Month
Case "YYYY"
folder_temp = My.Computer.Clock.LocalTime.Year
Case "YYYY-MM"
folder_temp = My.Computer.Clock.LocalTime.Year & "-" & _Month
End Select
FolderConvention = FolderConvention.Replace(element.ToString, folder_temp)
Case "C"
'Füllen mit Controlwert
Dim elmt = element.Value.Substring(3, element.Value.Length - 4).Split("#")
@@ -631,15 +642,7 @@ Public Class ClassImport_Windream
End If
End If
Case "V"
Dim elmt = element.Value.Substring(3, element.Value.Length - 4).Split("#")
Dim split() As String = elmt
If split.Length = 2 Then
Dim VARTYPE = split(0)
Select Case VARTYPE
Case "Doctype"
FolderConvention = FolderConvention.Replace(element.ToString, CURRENT_DOKARTSTRING)
End Select
End If
Case Else
ClassLogger.Add(" -Undefined pattern found in folderconvention" & vbNewLine & "Elementname: " & element.Value.ToUpper)