diff --git a/EDKB02/.vs/EDKB02/v16/.suo b/EDKB02/.vs/EDKB02/v16/.suo index a75cbf7..06688da 100644 Binary files a/EDKB02/.vs/EDKB02/v16/.suo and b/EDKB02/.vs/EDKB02/v16/.suo differ diff --git a/EDKB08/EDKB08/.vs/EDKB08/v16/.suo b/EDKB08/EDKB08/.vs/EDKB08/v16/.suo index c3e1cad..0dc41ec 100644 Binary files a/EDKB08/EDKB08/.vs/EDKB08/v16/.suo and b/EDKB08/EDKB08/.vs/EDKB08/v16/.suo differ diff --git a/EDKB08/EDKB08/Service1.vb b/EDKB08/EDKB08/Service1.vb index 4b6514e..de8d61e 100644 --- a/EDKB08/EDKB08/Service1.vb +++ b/EDKB08/EDKB08/Service1.vb @@ -10,6 +10,7 @@ Imports System Imports System.SystemException Imports System.Web.Mail Imports System.Timers +Imports System.Collections.Generic ''' Public Class Service1 @@ -161,9 +162,10 @@ Public Class Service1 Else GSF_Timer.Interval = Params.Prop_gsf_TimerInterval #If CONFIG = "Release" Then - GSF_Timer.Enabled = True + + GSF_Timer.Enabled = GSF_Timer.Interval > 60000 #Else - GSF_Timer.Enabled = True + GSF_Timer.Enabled = GSF_Timer.Interval > 60000 #End If DirectoryTimer.Interval = Params.DirectoryTimer_Intervall @@ -303,6 +305,32 @@ Public Class Service1 '''Indexdaten und Dokumente abgearbeitet sind. '''Am Schluss der Verarbeitung wird der Systemfilewacher wieder '''gestartet. + ''' + ''' + 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() Dim gsffilename As String = "" Try @@ -315,13 +343,16 @@ Public Class Service1 Dim looper As Boolean = True While looper = True 'Alle .IND-Dateien im Verzeichnis auslesen + Dim clsindex As New clsIndexData() Dim di As New IO.DirectoryInfo(Watch_Directory) IntSleep(2) - Dim diar1 As IO.FileInfo() = di.GetFiles("*.ind") + Dim diar1 As IO.FileInfo() = di.GetFiles("*.ind") Dim dra As IO.FileInfo + Array.Sort(diar1, AddressOf CompareFileInfos) If diar1.Length = 0 Then diar1 = di.GetFiles("*.xml") + Array.Sort(diar1, AddressOf CompareFileInfos) If diar1.Length = 0 Then looper = False clsindex = Nothing @@ -402,9 +433,9 @@ Public Class Service1 End If PrintOut("Ende File: " + fullname) - IntSleep(2) + IntSleep(5) If Fehler <> 0 Then - Send_Error_Mail() + send_error_mail() End If Next Catch ex As Exception @@ -890,7 +921,7 @@ Public Class Service1 Verarbeiten() EventStopped = False GSF = False - GSF_Timer.Enabled = True + GSF_Timer.Enabled = GSF_Timer.Interval > 60000 Catch Finally Params.Inputverzeichnis = saveInputVerzeichnis @@ -909,7 +940,7 @@ Public Class Service1 OBJ_GSF.Start_Checking() OBJ_GSF.Sub_End() FileWatch.EnableRaisingEvents = True - GSF_Timer.Enabled = True + GSF_Timer.Enabled = GSF_Timer.Interval > 60000 '20201114 - Verarbeitung der während GSF-Verarbeitung angelieferten Daten DirectoryTimer_Elapsed(sender, e) @@ -934,7 +965,7 @@ Public Class Service1 Verarbeiten() FileClose(99) FileWatch.EnableRaisingEvents = True - GSF_Timer.Enabled = True + GSF_Timer.Enabled = GSF_Timer.Interval > 60000 End Sub Sub Copyfiles(inputdir As String, outputdir As String) diff --git a/EDKB08/EDKB08/bin/20211213_EDKB08.zip b/EDKB08/EDKB08/bin/20211213_EDKB08.zip new file mode 100644 index 0000000..ad0760a Binary files /dev/null and b/EDKB08/EDKB08/bin/20211213_EDKB08.zip differ diff --git a/EDKB08/EDKB08/bin/EDKB08.exe b/EDKB08/EDKB08/bin/EDKB08.exe index e78eea0..5a5e3d5 100644 Binary files a/EDKB08/EDKB08/bin/EDKB08.exe and b/EDKB08/EDKB08/bin/EDKB08.exe differ diff --git a/EDKB08/EDKB08/bin/EDKB08.pdb b/EDKB08/EDKB08/bin/EDKB08.pdb index acf765a..d598b56 100644 Binary files a/EDKB08/EDKB08/bin/EDKB08.pdb and b/EDKB08/EDKB08/bin/EDKB08.pdb differ diff --git a/EDKB08/EDKB08/bin/EDKB08.xml b/EDKB08/EDKB08/bin/EDKB08.xml index bdfb229..3f14980 100644 --- a/EDKB08/EDKB08/bin/EDKB08.xml +++ b/EDKB08/EDKB08/bin/EDKB08.xml @@ -1191,7 +1191,7 @@ eingeschaltet - + Verarbeiten von angelieferten Daten In dieser Methode werden angelieferte Indexdateien verarbeitet. @@ -1201,6 +1201,8 @@ ausgeschaltet. Indexdaten und Dokumente abgearbeitet sind. Am Schluss der Verarbeitung wird der Systemfilewacher wieder gestartet. + + Journaldatei erstellen und je nach Applikationseinstellungen diff --git a/EDKB08/EDKB08/bin/parameters.cfg b/EDKB08/EDKB08/bin/parameters.cfg index 50c31a7..49df835 100644 --- a/EDKB08/EDKB08/bin/parameters.cfg +++ b/EDKB08/EDKB08/bin/parameters.cfg @@ -8,7 +8,7 @@ DeleteOriginalfiles =1 Mailadresse_OK =stefan.hutter@tkb.ch Mailadresse_NOK =stefan.hutter@tkb.ch 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 Directorytimer =10 Directorys =E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\bin\DirectoriesToScan.txt diff --git a/EDKB08/EDKB08/obj/Debug/EDKB08.exe b/EDKB08/EDKB08/obj/Debug/EDKB08.exe index 98f9ce5..df2ca7b 100644 Binary files a/EDKB08/EDKB08/obj/Debug/EDKB08.exe and b/EDKB08/EDKB08/obj/Debug/EDKB08.exe differ diff --git a/EDKB08/EDKB08/obj/Debug/EDKB08.pdb b/EDKB08/EDKB08/obj/Debug/EDKB08.pdb index acf765a..d598b56 100644 Binary files a/EDKB08/EDKB08/obj/Debug/EDKB08.pdb and b/EDKB08/EDKB08/obj/Debug/EDKB08.pdb differ diff --git a/EDKB08/EDKB08/obj/Debug/EDKB08.vbproj.AssemblyReference.cache b/EDKB08/EDKB08/obj/Debug/EDKB08.vbproj.AssemblyReference.cache deleted file mode 100644 index 480d207..0000000 Binary files a/EDKB08/EDKB08/obj/Debug/EDKB08.vbproj.AssemblyReference.cache and /dev/null differ diff --git a/EDKB08/EDKB08/obj/Debug/EDKB08.vbproj.FileListAbsolute.txt b/EDKB08/EDKB08/obj/Debug/EDKB08.vbproj.FileListAbsolute.txt index 07762b6..4d53cc6 100644 --- a/EDKB08/EDKB08/obj/Debug/EDKB08.vbproj.FileListAbsolute.txt +++ b/EDKB08/EDKB08/obj/Debug/EDKB08.vbproj.FileListAbsolute.txt @@ -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.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.AssemblyReference.cache diff --git a/EDKB08/EDKB08/obj/Debug/EDKB08.xml b/EDKB08/EDKB08/obj/Debug/EDKB08.xml index bdfb229..3f14980 100644 --- a/EDKB08/EDKB08/obj/Debug/EDKB08.xml +++ b/EDKB08/EDKB08/obj/Debug/EDKB08.xml @@ -1191,7 +1191,7 @@ eingeschaltet - + Verarbeiten von angelieferten Daten In dieser Methode werden angelieferte Indexdateien verarbeitet. @@ -1201,6 +1201,8 @@ ausgeschaltet. Indexdaten und Dokumente abgearbeitet sind. Am Schluss der Verarbeitung wird der Systemfilewacher wieder gestartet. + + Journaldatei erstellen und je nach Applikationseinstellungen diff --git a/EDKB08/EDKB08/obj/Release/DesignTimeResolveAssemblyReferences.cache b/EDKB08/EDKB08/obj/Release/DesignTimeResolveAssemblyReferences.cache index 01ce694..1d7d54e 100644 Binary files a/EDKB08/EDKB08/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/EDKB08/EDKB08/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/EDKB08/EDKB08/obj/Release/EDKB08.exe b/EDKB08/EDKB08/obj/Release/EDKB08.exe index e78eea0..5a5e3d5 100644 Binary files a/EDKB08/EDKB08/obj/Release/EDKB08.exe and b/EDKB08/EDKB08/obj/Release/EDKB08.exe differ diff --git a/EDKB08/EDKB08/obj/Release/EDKB08.vbproj.AssemblyReference.cache b/EDKB08/EDKB08/obj/Release/EDKB08.vbproj.AssemblyReference.cache new file mode 100644 index 0000000..f5e894a Binary files /dev/null and b/EDKB08/EDKB08/obj/Release/EDKB08.vbproj.AssemblyReference.cache differ diff --git a/EDKB08/EDKB08/obj/Release/EDKB08.vbproj.FileListAbsolute.txt b/EDKB08/EDKB08/obj/Release/EDKB08.vbproj.FileListAbsolute.txt index 9616a6f..537bcb1 100644 --- a/EDKB08/EDKB08/obj/Release/EDKB08.vbproj.FileListAbsolute.txt +++ b/EDKB08/EDKB08/obj/Release/EDKB08.vbproj.FileListAbsolute.txt @@ -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.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.AssemblyReference.cache diff --git a/EDKB08/EDKB08/obj/Release/EDKB08.xml b/EDKB08/EDKB08/obj/Release/EDKB08.xml index bdfb229..3f14980 100644 --- a/EDKB08/EDKB08/obj/Release/EDKB08.xml +++ b/EDKB08/EDKB08/obj/Release/EDKB08.xml @@ -1191,7 +1191,7 @@ eingeschaltet - + Verarbeiten von angelieferten Daten In dieser Methode werden angelieferte Indexdateien verarbeitet. @@ -1201,6 +1201,8 @@ ausgeschaltet. Indexdaten und Dokumente abgearbeitet sind. Am Schluss der Verarbeitung wird der Systemfilewacher wieder gestartet. + + Journaldatei erstellen und je nach Applikationseinstellungen diff --git a/EDKB17/EDKB17/.vs/EDKB17/v16/.suo b/EDKB17/EDKB17/.vs/EDKB17/v16/.suo index 0c727bf..df082f2 100644 Binary files a/EDKB17/EDKB17/.vs/EDKB17/v16/.suo and b/EDKB17/EDKB17/.vs/EDKB17/v16/.suo differ diff --git a/EDKB17/EDKB17/EDKB17/obj/Release/DesignTimeResolveAssemblyReferences.cache b/EDKB17/EDKB17/EDKB17/obj/Release/DesignTimeResolveAssemblyReferences.cache index c83a7ec..db2fc76 100644 Binary files a/EDKB17/EDKB17/EDKB17/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/EDKB17/EDKB17/EDKB17/obj/Release/DesignTimeResolveAssemblyReferences.cache differ