AppStd/FileFlow
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jj: Subject Encoding & Deleting Groups

Browse Source
This commit is contained in:
Jonathan Jenne
2017-08-09 14:52:45 +02:00
parent 48b8d5cc51
commit 5863a41702
5 changed files with 11144 additions and 9180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Global_Indexer/frmIndex.vb
View File

@@ -1332,7 +1332,7 @@ Public Class frmIndex
End If
_step = "4"
' Regular Expressions vorbereiten
If fromPattern <> "" And toPattern <> "" Then
_step = "4.1"
Dim FromRegexList As New List(Of Regex)
@@ -1343,7 +1343,7 @@ Public Class frmIndex
FromRegexList.Add(fromRegex)
ToRegexList.Add(toRegex)
Dim emailFrom
Dim emailTo
' Email Absender und Empfänger
@@ -1418,7 +1418,7 @@ Public Class frmIndex
_step = "6.1.x"
ClassLogger.Add(" >> emailFrom is Nothing?!")
End If
If Not IsNothing(emailTo) Then
_step = "6.1.1 " & emailTo.ToString
emailTo = emailTo.Replace("<", "")
@@ -2071,7 +2071,7 @@ Public Class frmIndex
' Return False
End If
End If
Next
If LogErrorsOnly = False Then ClassLogger.Add(" >> Replaced and complete SQL-result: " & SqlString, False)
If LogErrorsOnly = False Then ClassLogger.Add(" >> Ausführen SQL....", False)
@@ -2206,7 +2206,7 @@ Public Class frmIndex
Me.grpBetreff.Dock = DockStyle.Top
Me.grpbxMailBody.Dock = DockStyle.Fill
Dim msg_email As New Msg.Message(CURRENT_WORKFILE)
msg_email.Encoding = Encoding.Unicode
'msg_email.Encoding = Encoding.Unicode
Dim headers As String = ClassEmailHeaderExtractor.getMessageHeaders(msg_email)
If LogErrorsOnly = False Then ClassLogger.Add(" EMAIL-HEADER: " & headers, False)
@@ -2226,11 +2226,17 @@ Public Class frmIndex
If My.Computer.FileSystem.FileExists(tempFilename) Then
My.Computer.FileSystem.DeleteFile(tempFilename)
End If
If msg_email_unicode.Subject = "" Then
Dim codepage As Integer = Console.OutputEncoding.CodePage
Dim msg_email_subject As New Msg.Message()
msg_email_subject.Encoding = Encoding.GetEncoding(codepage)
msg_email_subject.Open(CURRENT_WORKFILE)
If msg_email_subject.Subject = "" Then
Me.txtBetreff.Text = "!!No subject in email!!"
Else
If LogErrorsOnly = False Then ClassLogger.Add(" ...subject before converting: '" & msg_email_unicode.Subject & "'", False)
Dim betreff = ClassHelper.encode_utf8(msg_email_unicode.Subject)
If LogErrorsOnly = False Then ClassLogger.Add(" ...subject before converting: '" & msg_email_subject.Subject & "'", False)
Dim betreff = ClassHelper.encode_utf8(msg_email_subject.Subject)
If Not IsNothing(betreff) Then
If ClassHelper.CheckSpecialSigns(betreff) > 0 Then
@@ -2240,10 +2246,10 @@ Public Class frmIndex
Me.txtBetreff.Text = betreff
Else
ClassLogger.Add(" ...subject could not be converted to utf8!", False)
Me.txtBetreff.Text = msg_email_unicode.Subject
Me.txtBetreff.Text = msg_email_subject.Subject
End If
End If
'Try
Dim wFile As System.IO.FileStream
Dim byteData() As Byte