Update 20211213
This commit is contained in:
Binary file not shown.
Binary file not shown.
@@ -10,6 +10,7 @@ Imports System
|
|||||||
Imports System.SystemException
|
Imports System.SystemException
|
||||||
Imports System.Web.Mail
|
Imports System.Web.Mail
|
||||||
Imports System.Timers
|
Imports System.Timers
|
||||||
|
Imports System.Collections.Generic
|
||||||
|
|
||||||
'''<summary></summary>
|
'''<summary></summary>
|
||||||
Public Class Service1
|
Public Class Service1
|
||||||
@@ -161,9 +162,10 @@ Public Class Service1
|
|||||||
Else
|
Else
|
||||||
GSF_Timer.Interval = Params.Prop_gsf_TimerInterval
|
GSF_Timer.Interval = Params.Prop_gsf_TimerInterval
|
||||||
#If CONFIG = "Release" Then
|
#If CONFIG = "Release" Then
|
||||||
GSF_Timer.Enabled = True
|
|
||||||
|
GSF_Timer.Enabled = GSF_Timer.Interval > 60000
|
||||||
#Else
|
#Else
|
||||||
GSF_Timer.Enabled = True
|
GSF_Timer.Enabled = GSF_Timer.Interval > 60000
|
||||||
#End If
|
#End If
|
||||||
|
|
||||||
DirectoryTimer.Interval = Params.DirectoryTimer_Intervall
|
DirectoryTimer.Interval = Params.DirectoryTimer_Intervall
|
||||||
@@ -303,6 +305,32 @@ Public Class Service1
|
|||||||
'''Indexdaten und Dokumente abgearbeitet sind.</para>
|
'''Indexdaten und Dokumente abgearbeitet sind.</para>
|
||||||
'''<para>Am Schluss der Verarbeitung wird der Systemfilewacher wieder
|
'''<para>Am Schluss der Verarbeitung wird der Systemfilewacher wieder
|
||||||
'''gestartet.</para></remarks>
|
'''gestartet.</para></remarks>
|
||||||
|
'''
|
||||||
|
'''
|
||||||
|
Private nameDirection As SortOrder = SortOrder.Ascending
|
||||||
|
Private dateDirection As SortOrder = SortOrder.Ascending
|
||||||
|
Private Function CompareFileInfos(file1 As FileInfo, file2 As FileInfo) As Integer
|
||||||
|
Dim result = 0
|
||||||
|
|
||||||
|
'Select Case nameDirection
|
||||||
|
' Case SortOrder.Ascending
|
||||||
|
' result = file1.Name.CompareTo(file2.Name)
|
||||||
|
' Case SortOrder.Descending
|
||||||
|
' result = file2.Name.CompareTo(file1.Name)
|
||||||
|
'End Select
|
||||||
|
|
||||||
|
If result = 0 Then
|
||||||
|
Select Case dateDirection
|
||||||
|
Case SortOrder.Ascending
|
||||||
|
result = file1.LastWriteTime.CompareTo(file2.LastWriteTime)
|
||||||
|
Case SortOrder.Descending
|
||||||
|
result = file2.LastWriteTime.CompareTo(file1.LastWriteTime)
|
||||||
|
End Select
|
||||||
|
End If
|
||||||
|
|
||||||
|
Return result
|
||||||
|
End Function
|
||||||
|
|
||||||
Private Sub Verarbeiten()
|
Private Sub Verarbeiten()
|
||||||
Dim gsffilename As String = ""
|
Dim gsffilename As String = ""
|
||||||
Try
|
Try
|
||||||
@@ -315,13 +343,16 @@ Public Class Service1
|
|||||||
Dim looper As Boolean = True
|
Dim looper As Boolean = True
|
||||||
While looper = True
|
While looper = True
|
||||||
'Alle .IND-Dateien im Verzeichnis auslesen
|
'Alle .IND-Dateien im Verzeichnis auslesen
|
||||||
|
|
||||||
Dim clsindex As New clsIndexData()
|
Dim clsindex As New clsIndexData()
|
||||||
Dim di As New IO.DirectoryInfo(Watch_Directory)
|
Dim di As New IO.DirectoryInfo(Watch_Directory)
|
||||||
IntSleep(2)
|
IntSleep(2)
|
||||||
Dim diar1 As IO.FileInfo() = di.GetFiles("*.ind")
|
Dim diar1 As IO.FileInfo() = di.GetFiles("*.ind")
|
||||||
Dim dra As IO.FileInfo
|
Dim dra As IO.FileInfo
|
||||||
|
Array.Sort(diar1, AddressOf CompareFileInfos)
|
||||||
If diar1.Length = 0 Then
|
If diar1.Length = 0 Then
|
||||||
diar1 = di.GetFiles("*.xml")
|
diar1 = di.GetFiles("*.xml")
|
||||||
|
Array.Sort(diar1, AddressOf CompareFileInfos)
|
||||||
If diar1.Length = 0 Then
|
If diar1.Length = 0 Then
|
||||||
looper = False
|
looper = False
|
||||||
clsindex = Nothing
|
clsindex = Nothing
|
||||||
@@ -402,9 +433,9 @@ Public Class Service1
|
|||||||
End If
|
End If
|
||||||
PrintOut("Ende File: " + fullname)
|
PrintOut("Ende File: " + fullname)
|
||||||
|
|
||||||
IntSleep(2)
|
IntSleep(5)
|
||||||
If Fehler <> 0 Then
|
If Fehler <> 0 Then
|
||||||
Send_Error_Mail()
|
send_error_mail()
|
||||||
End If
|
End If
|
||||||
Next
|
Next
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
@@ -890,7 +921,7 @@ Public Class Service1
|
|||||||
Verarbeiten()
|
Verarbeiten()
|
||||||
EventStopped = False
|
EventStopped = False
|
||||||
GSF = False
|
GSF = False
|
||||||
GSF_Timer.Enabled = True
|
GSF_Timer.Enabled = GSF_Timer.Interval > 60000
|
||||||
Catch
|
Catch
|
||||||
Finally
|
Finally
|
||||||
Params.Inputverzeichnis = saveInputVerzeichnis
|
Params.Inputverzeichnis = saveInputVerzeichnis
|
||||||
@@ -909,7 +940,7 @@ Public Class Service1
|
|||||||
OBJ_GSF.Start_Checking()
|
OBJ_GSF.Start_Checking()
|
||||||
OBJ_GSF.Sub_End()
|
OBJ_GSF.Sub_End()
|
||||||
FileWatch.EnableRaisingEvents = True
|
FileWatch.EnableRaisingEvents = True
|
||||||
GSF_Timer.Enabled = True
|
GSF_Timer.Enabled = GSF_Timer.Interval > 60000
|
||||||
|
|
||||||
'20201114 - Verarbeitung der während GSF-Verarbeitung angelieferten Daten
|
'20201114 - Verarbeitung der während GSF-Verarbeitung angelieferten Daten
|
||||||
DirectoryTimer_Elapsed(sender, e)
|
DirectoryTimer_Elapsed(sender, e)
|
||||||
@@ -934,7 +965,7 @@ Public Class Service1
|
|||||||
Verarbeiten()
|
Verarbeiten()
|
||||||
FileClose(99)
|
FileClose(99)
|
||||||
FileWatch.EnableRaisingEvents = True
|
FileWatch.EnableRaisingEvents = True
|
||||||
GSF_Timer.Enabled = True
|
GSF_Timer.Enabled = GSF_Timer.Interval > 60000
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Sub Copyfiles(inputdir As String, outputdir As String)
|
Sub Copyfiles(inputdir As String, outputdir As String)
|
||||||
|
|||||||
BIN
EDKB08/EDKB08/bin/20211213_EDKB08.zip
Normal file
BIN
EDKB08/EDKB08/bin/20211213_EDKB08.zip
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1191,7 +1191,7 @@ eingeschaltet</remarks>
|
|||||||
<param name="source"></param>
|
<param name="source"></param>
|
||||||
<param name="e"></param>
|
<param name="e"></param>
|
||||||
</member>
|
</member>
|
||||||
<member name="M:EDKB08.Service1.Verarbeiten">
|
<member name="F:EDKB08.Service1.nameDirection">
|
||||||
<summary>Verarbeiten von angelieferten Daten</summary>
|
<summary>Verarbeiten von angelieferten Daten</summary>
|
||||||
<remarks>In dieser Methode werden angelieferte Indexdateien verarbeitet.
|
<remarks>In dieser Methode werden angelieferte Indexdateien verarbeitet.
|
||||||
<para></para>
|
<para></para>
|
||||||
@@ -1201,6 +1201,8 @@ ausgeschaltet.</para>
|
|||||||
Indexdaten und Dokumente abgearbeitet sind.</para>
|
Indexdaten und Dokumente abgearbeitet sind.</para>
|
||||||
<para>Am Schluss der Verarbeitung wird der Systemfilewacher wieder
|
<para>Am Schluss der Verarbeitung wird der Systemfilewacher wieder
|
||||||
gestartet.</para></remarks>
|
gestartet.</para></remarks>
|
||||||
|
|
||||||
|
|
||||||
</member>
|
</member>
|
||||||
<member name="M:EDKB08.Service1.Logdatei_Erstellen">
|
<member name="M:EDKB08.Service1.Logdatei_Erstellen">
|
||||||
<summary>Journaldatei erstellen und je nach Applikationseinstellungen
|
<summary>Journaldatei erstellen und je nach Applikationseinstellungen
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ DeleteOriginalfiles =1
|
|||||||
Mailadresse_OK =stefan.hutter@tkb.ch
|
Mailadresse_OK =stefan.hutter@tkb.ch
|
||||||
Mailadresse_NOK =stefan.hutter@tkb.ch
|
Mailadresse_NOK =stefan.hutter@tkb.ch
|
||||||
GSF_ConfigFiles =E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\bin\gsf\
|
GSF_ConfigFiles =E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\bin\gsf\
|
||||||
GSF_Timer in Minuten =30
|
GSF_Timer in Minuten =1
|
||||||
GSF_Conf_Dateiendung =xml
|
GSF_Conf_Dateiendung =xml
|
||||||
Directorytimer =10
|
Directorytimer =10
|
||||||
Directorys =E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\bin\DirectoriesToScan.txt
|
Directorys =E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\bin\DirectoriesToScan.txt
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -27,4 +27,3 @@ E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Debug\EDKB08.xml
|
|||||||
E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Debug\EDKB08.pdb
|
E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Debug\EDKB08.pdb
|
||||||
E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Debug\EDKB08.vbproj.CopyComplete
|
E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Debug\EDKB08.vbproj.CopyComplete
|
||||||
E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Debug\EDKB08.vbproj.CoreCompileInputs.cache
|
E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Debug\EDKB08.vbproj.CoreCompileInputs.cache
|
||||||
E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Debug\EDKB08.vbproj.AssemblyReference.cache
|
|
||||||
|
|||||||
@@ -1191,7 +1191,7 @@ eingeschaltet</remarks>
|
|||||||
<param name="source"></param>
|
<param name="source"></param>
|
||||||
<param name="e"></param>
|
<param name="e"></param>
|
||||||
</member>
|
</member>
|
||||||
<member name="M:EDKB08.Service1.Verarbeiten">
|
<member name="F:EDKB08.Service1.nameDirection">
|
||||||
<summary>Verarbeiten von angelieferten Daten</summary>
|
<summary>Verarbeiten von angelieferten Daten</summary>
|
||||||
<remarks>In dieser Methode werden angelieferte Indexdateien verarbeitet.
|
<remarks>In dieser Methode werden angelieferte Indexdateien verarbeitet.
|
||||||
<para></para>
|
<para></para>
|
||||||
@@ -1201,6 +1201,8 @@ ausgeschaltet.</para>
|
|||||||
Indexdaten und Dokumente abgearbeitet sind.</para>
|
Indexdaten und Dokumente abgearbeitet sind.</para>
|
||||||
<para>Am Schluss der Verarbeitung wird der Systemfilewacher wieder
|
<para>Am Schluss der Verarbeitung wird der Systemfilewacher wieder
|
||||||
gestartet.</para></remarks>
|
gestartet.</para></remarks>
|
||||||
|
|
||||||
|
|
||||||
</member>
|
</member>
|
||||||
<member name="M:EDKB08.Service1.Logdatei_Erstellen">
|
<member name="M:EDKB08.Service1.Logdatei_Erstellen">
|
||||||
<summary>Journaldatei erstellen und je nach Applikationseinstellungen
|
<summary>Journaldatei erstellen und je nach Applikationseinstellungen
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
BIN
EDKB08/EDKB08/obj/Release/EDKB08.vbproj.AssemblyReference.cache
Normal file
BIN
EDKB08/EDKB08/obj/Release/EDKB08.vbproj.AssemblyReference.cache
Normal file
Binary file not shown.
@@ -23,3 +23,4 @@ E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Release\EDKB08.Service1.resou
|
|||||||
E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Release\EDKB08.vbproj.GenerateResource.Cache
|
E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Release\EDKB08.vbproj.GenerateResource.Cache
|
||||||
E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Release\EDKB08.vbproj.CopyComplete
|
E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Release\EDKB08.vbproj.CopyComplete
|
||||||
E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Release\EDKB08.vbproj.CoreCompileInputs.cache
|
E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Release\EDKB08.vbproj.CoreCompileInputs.cache
|
||||||
|
E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Release\EDKB08.vbproj.AssemblyReference.cache
|
||||||
|
|||||||
@@ -1191,7 +1191,7 @@ eingeschaltet</remarks>
|
|||||||
<param name="source"></param>
|
<param name="source"></param>
|
||||||
<param name="e"></param>
|
<param name="e"></param>
|
||||||
</member>
|
</member>
|
||||||
<member name="M:EDKB08.Service1.Verarbeiten">
|
<member name="F:EDKB08.Service1.nameDirection">
|
||||||
<summary>Verarbeiten von angelieferten Daten</summary>
|
<summary>Verarbeiten von angelieferten Daten</summary>
|
||||||
<remarks>In dieser Methode werden angelieferte Indexdateien verarbeitet.
|
<remarks>In dieser Methode werden angelieferte Indexdateien verarbeitet.
|
||||||
<para></para>
|
<para></para>
|
||||||
@@ -1201,6 +1201,8 @@ ausgeschaltet.</para>
|
|||||||
Indexdaten und Dokumente abgearbeitet sind.</para>
|
Indexdaten und Dokumente abgearbeitet sind.</para>
|
||||||
<para>Am Schluss der Verarbeitung wird der Systemfilewacher wieder
|
<para>Am Schluss der Verarbeitung wird der Systemfilewacher wieder
|
||||||
gestartet.</para></remarks>
|
gestartet.</para></remarks>
|
||||||
|
|
||||||
|
|
||||||
</member>
|
</member>
|
||||||
<member name="M:EDKB08.Service1.Logdatei_Erstellen">
|
<member name="M:EDKB08.Service1.Logdatei_Erstellen">
|
||||||
<summary>Journaldatei erstellen und je nach Applikationseinstellungen
|
<summary>Journaldatei erstellen und je nach Applikationseinstellungen
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user