MS

Global_Indexer/ClassEmailHeaderExtractor.vb

@@ -54,7 +54,7 @@ Public Class ClassEmailHeaderExtractor
 
         Return Nothing
     End Function
-    Public Shared Function extractFromAddress1(messageHeaders As String, Regex As String)
+    Public Shared Function extractFromHeader(messageHeaders As String, Regex As String)
         Try
             Dim result
             Dim i As Integer = 0
@@ -63,8 +63,8 @@ Public Class ClassEmailHeaderExtractor
             End If
             ' einen Regulären Ausdruck laden
             Dim strRegex As String = Regex
-            Dim myRegex As New Regex(strRegex, RegexOptions.None)
-            Dim strTargetString As String = messageHeaders
+            Dim myRegex As New Regex(strRegex, RegexOptions.IgnorePatternWhitespace)
+            Dim strTargetString As String = messageHeaders.Trim
             ' die Vorkommen im String auslesen
             For Each myMatch As Match In myRegex.Matches(strTargetString)
                 If myMatch.Success Then
@@ -78,28 +78,12 @@ Public Class ClassEmailHeaderExtractor
                     End If
                 End If
             Next
-
-            '' einen Regulären Ausdruck laden
-            'Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(Regex)
-            '' die Vorkommen im SQL-String auslesen
-            'Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(messageHeaders)
-            'Dim result
-            'Dim i As Integer = 0
-            '' alle Vorkommen der Indexe im header durchlaufen
-            'For Each element As System.Text.RegularExpressions.Match In elemente
-            '    If i = 0 Then
-            '        result = element.ToString
-            '    Else
-            '        result = result & ";" & element.ToString
-            '    End If
-            '    i += 1
-            'Next
             Return result
         Catch ex As Exception
-            MsgBox("Unexpected Error in extractFromAddress1: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+            MsgBox("Unexpected Error in extractFromHeader: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             Return Nothing
         End Try
-       
+
     End Function
 
     ''' <summary>