1
0
mirror of https://github.com/romanlryji/EventLogLoader.git synced 2024-11-24 08:32:52 +02:00

Merge pull request #6 from dmpas/master

Исправление ошибки многострочных данных
This commit is contained in:
Alexey Bochkov 2017-01-10 20:45:29 -08:00 committed by GitHub
commit 388a868a57
3 changed files with 8 additions and 3 deletions

View File

@ -75,6 +75,10 @@
<HintPath>..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.4.1\lib\net45\NLog.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />

1
EventLogLoaderManager/packages.config Normal file → Executable file
View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MySql.Data" version="6.9.9" targetFramework="net45" />
<package id="NLog" version="4.4.1" targetFramework="net46" />
</packages>

View File

@ -1300,6 +1300,7 @@ Public Class EventLogProcessor
Dim NewLine = True
Dim StrEvent = ""
Dim CountBracket = 0
Dim TextBlockOpen = False
Dim Position = CurrentPosition
'Dim WasReadSomeString = False
@ -1335,7 +1336,7 @@ Public Class EventLogProcessor
StrEvent = StrEvent + vbNewLine + TextLine
End If
If ItsEndOfEvent(TextLine, CountBracket) Then
If ItsEndOfEvent(TextLine, CountBracket, TextBlockOpen) Then
NewLine = True
If Not StrEvent Is Nothing Then
Try
@ -1361,12 +1362,11 @@ Public Class EventLogProcessor
End Sub
Function ItsEndOfEvent(Str As String, ByRef Count As Integer)
Function ItsEndOfEvent(Str As String, ByRef Count As Integer, ByRef TextBlockOpen As Boolean)
ItsEndOfEvent = False
Dim TempStr = Str
Dim TextBlockOpen = False
For i = 0 To TempStr.Length - 1
Dim Simb = TempStr.Substring(i, 1)