diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb index 2abe5ec..9f8a8d5 100644 --- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb +++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index ad0514e..8862364 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -1807,7 +1807,9 @@ Public Class frmMain Exit Function End If If oSQLOverview.ToString.Contains("GROUP_TEXT") = False Then + LOGGER.Info($"SQL SO FAR: {oSQLOverview} ") FormHelper.ShowInfoMessage("Incomplete Overview-Source (No Group-Columns). Please reload manually!", omsgTitleWarning) + NO_WORKFLOWITEMS = True GridControl_Docs.Visible = False bindsourcegrid.DataSource = Nothing diff --git a/app/DD_PM_WINDREAM/frmValidator.resx b/app/DD_PM_WINDREAM/frmValidator.resx index 9cecf0f..66db1a3 100644 --- a/app/DD_PM_WINDREAM/frmValidator.resx +++ b/app/DD_PM_WINDREAM/frmValidator.resx @@ -319,7 +319,7 @@ DocumentViewerValidator - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.7.0.1, Culture=neutral, PublicKeyToken=null + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.8.0.0, Culture=neutral, PublicKeyToken=null SplitContainer1.Panel2 diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index e8c6d3b..eea65f4 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -509,8 +509,8 @@ Public Class frmValidator End Try End Sub Sub Reset_CurrentReferences() - CURRENT_DOC_ID = 0 - CURRENT_DOC_GUID = 0 + LOGGER.Info("Attention: Reset_CurrentReferences....") + If Not IsNothing(DT_AdditionalSearches_Resultset_Docs) Then DT_AdditionalSearches_Resultset_Docs.Clear() End If @@ -2340,28 +2340,40 @@ Public Class frmValidator Try LOGGER.Debug("Get_Next_GUID...") Dim oNewGUID As Integer - - LOGGER.Debug("Old Document_Path: " & OLD_Document_Path) Dim oBIT As Integer = 0 If PROFIL_sortbynewest = True Then oBIT = 1 End If Dim oSQL = $"EXEC PRPM_GET_NEXT_DOC_INFO {CURRENT_ProfilGUID},{CURRENT_DOC_ID},{USER_ID}" - 'Dim oSQL = $"SELECT * from [dbo].[FNPM_GET_NEXT_DOC_INFO] ({CURRENT_ProfilGUID},{oBIT},{CURRENT_DOC_GUID},'{USER_USERNAME}')" Dim oDT As DataTable = DatabaseFallback.GetDatatableECM(oSQL) + CURRENT_DOC_ID = 0 + CURRENT_DOC_GUID = 0 If oDT.Rows.Count > 0 Then - oNewGUID = oDT.Rows(0).Item(0) - CURRENT_DOC_ID = oDT.Rows(0).Item(1) + Try + oNewGUID = oDT.Rows(0).Item(0) + Catch ex As Exception + LOGGER.Warn($">> Attention: in GetNextGUID - Could not get the next GUID - SQL [{oSQL}]") + LOGGER.Warn($"ERRORMESSAGE [{ex.Message}]") + End Try + + Try + CURRENT_DOC_ID = oDT.Rows(0).Item(1) + LOGGER.Debug($"Get_Next_GUID: CURRENT_DOC_ID [{CURRENT_DOC_ID}]...") + Catch ex As Exception + LOGGER.Warn($">> Attention: in GetNextGUID - Could not get the next DocID - SQL [{oSQL}]") + LOGGER.Warn($"ERRORMESSAGE [{ex.Message}]") + End Try + Try Amount_Docs2Validate = oDT.Rows(0).Item(2) + LOGGER.Debug($"Get_Next_GUID: Amount_Docs2Validate [{Amount_Docs2Validate}]...") Catch ex As Exception Amount_Docs2Validate = 0 LOGGER.Warn("Amount_Docs2Validate Error: " & ex.Message) End Try - Else - LOGGER.Info(" >> Attention: in GetNextGUID - Could not get a GUID(1)") + LOGGER.Info($">> Attention: GetNextGUID - Could not get the next GUID - SQL [{oSQL}]") oNewGUID = 0 Return oNewGUID End If @@ -2548,7 +2560,12 @@ Public Class frmValidator If USER_LANGUAGE <> "de-DE" Then omsg = $"Remaining documents: {omsg}" End If - bsiInformation.Caption = omsg + If Amount_Docs2Validate > 0 Then + bsiInformation.Caption = omsg + Else + bsiInformation.Caption = "Could not get the amount of remaining docs!" + End If + bsiDocID.Caption = "Document-ID: " & CURRENT_DOC_ID & " - GUID: " & CURRENT_DOC_GUID LOGGER.Debug("AllDocInfo created...") @@ -5312,13 +5329,11 @@ Public Class frmValidator End Sub Sub Datei_ueberspringen() Try - LOGGER.Debug("Dokument überspringen") + LOGGER.Debug("Skipping document....(Datei_ueberspringen)") 'Das Dokument freigeben Free_File() - Dim oSQL = $"EXECUTE PRPM_FILES_NOT_INDEXED '{USER_USERNAME}',{CURRENT_ProfilGUID},'{WMDocPathWindows}',{CURRENT_DOC_GUID}" DatabaseFallback.ExecuteNonQueryECM(oSQL) - LOGGER.Debug($"Skipped DocGUID {CURRENT_DOC_GUID}") Load_Next_Document(False) Catch ex As Exception