ms discard
This commit is contained in:
parent
c338dc0bc7
commit
190a148a0e
@ -446,38 +446,78 @@ Public Class frmValidator
|
|||||||
End Sub
|
End Sub
|
||||||
Public Sub Load_Additional_Searches()
|
Public Sub Load_Additional_Searches()
|
||||||
If CURRENT_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Or CURRENT_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then
|
If CURRENT_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Or CURRENT_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then
|
||||||
frmValidatorSearch.Show()
|
Dim oDocResultCommand As String
|
||||||
_frmValidatorSearch = frmValidatorSearch
|
Dim oDatatableDocResult As DataTable
|
||||||
ToolStripButtonSearchesReload.Visible = True
|
Dim oDataResultCommand As String
|
||||||
Dim oPnl1Collapsed As Boolean = True
|
Dim oDatatableDataResult As DataTable
|
||||||
Dim oPnl2Collapsed As Boolean = True
|
|
||||||
If CURRENT_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then
|
If CURRENT_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then
|
||||||
oPnl1Collapsed = False
|
'Check whether DocData is there
|
||||||
Else
|
|
||||||
oPnl1Collapsed = True
|
|
||||||
End If
|
|
||||||
If CURRENT_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then
|
|
||||||
oPnl2Collapsed = False
|
|
||||||
Else
|
|
||||||
oPnl2Collapsed = True
|
|
||||||
End If
|
|
||||||
_frmValidatorSearch.TabPreload(oPnl1Collapsed, oPnl2Collapsed, CURRENT_DT_PROFILE_SEARCHES_SQL.Rows.Count, CURRENT_DT_PROFILE_SEARCHES_DOC.Rows.Count,
|
|
||||||
CURRENT_DT_PROFILE_SEARCHES_SQL, CURRENT_DT_PROFILE_SEARCHES_DOC)
|
|
||||||
If CURRENT_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then
|
|
||||||
_frmValidatorSearch._DTSQLSearches = CURRENT_DT_PROFILE_SEARCHES_SQL
|
|
||||||
Dim oConID = CURRENT_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID")
|
Dim oConID = CURRENT_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID")
|
||||||
Dim oCommand = CURRENT_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND")
|
oDataResultCommand = CURRENT_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND")
|
||||||
oCommand = clsPatterns.ReplaceAllValues(oCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID)
|
oDataResultCommand = clsPatterns.ReplaceAllValues(oDataResultCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID)
|
||||||
|
oDatatableDataResult = ClassDatabase.Return_Datatable(oDataResultCommand)
|
||||||
_frmValidatorSearch.Refresh_Load_GridSQL(oConID, oCommand, 0, CURRENT_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("TAB_TITLE"))
|
|
||||||
End If
|
End If
|
||||||
If CURRENT_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then
|
If CURRENT_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then
|
||||||
_frmValidatorSearch._DTDocSearches = CURRENT_DT_PROFILE_SEARCHES_DOC
|
'Check whether DocData is there
|
||||||
Dim oConID = CURRENT_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID")
|
Dim oConID = CURRENT_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID")
|
||||||
Dim oCommand = CURRENT_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND")
|
oDocResultCommand = CURRENT_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND")
|
||||||
oCommand = clsPatterns.ReplaceAllValues(oCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID)
|
oDocResultCommand = clsPatterns.ReplaceAllValues(oDocResultCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID)
|
||||||
|
oDatatableDocResult = ClassDatabase.Return_Datatable(oDocResultCommand)
|
||||||
|
End If
|
||||||
|
|
||||||
_frmValidatorSearch.RefreshTabDoc(oConID, oCommand, 0, CURRENT_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("TAB_TITLE"))
|
Dim oDataResultsExist As Boolean = False
|
||||||
|
Dim oDocResultsExist As Boolean = False
|
||||||
|
|
||||||
|
If CURRENT_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then
|
||||||
|
If Not IsNothing(oDatatableDataResult) Then
|
||||||
|
If oDatatableDataResult.Rows.Count > 0 Then
|
||||||
|
oDataResultsExist = True
|
||||||
|
End If
|
||||||
|
End If
|
||||||
|
|
||||||
|
End If
|
||||||
|
If CURRENT_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then
|
||||||
|
If Not IsNothing(oDatatableDocResult) Then
|
||||||
|
If oDatatableDocResult.Rows.Count > 0 Then
|
||||||
|
oDocResultsExist = True
|
||||||
|
End If
|
||||||
|
End If
|
||||||
|
End If
|
||||||
|
|
||||||
|
If oDataResultsExist = True Or oDocResultsExist = True Then
|
||||||
|
frmValidatorSearch.Show()
|
||||||
|
_frmValidatorSearch = frmValidatorSearch
|
||||||
|
ToolStripButtonSearchesReload.Visible = True
|
||||||
|
Dim oPnl1Collapsed As Boolean = True
|
||||||
|
Dim oPnl2Collapsed As Boolean = True
|
||||||
|
If oDataResultsExist = True Then
|
||||||
|
oPnl1Collapsed = False
|
||||||
|
Else
|
||||||
|
oPnl1Collapsed = True
|
||||||
|
End If
|
||||||
|
If oDocResultsExist = True Then
|
||||||
|
oPnl2Collapsed = False
|
||||||
|
Else
|
||||||
|
oPnl2Collapsed = True
|
||||||
|
End If
|
||||||
|
_frmValidatorSearch.TabPreload(oPnl1Collapsed, oPnl2Collapsed, CURRENT_DT_PROFILE_SEARCHES_SQL.Rows.Count, CURRENT_DT_PROFILE_SEARCHES_DOC.Rows.Count,
|
||||||
|
CURRENT_DT_PROFILE_SEARCHES_SQL, CURRENT_DT_PROFILE_SEARCHES_DOC)
|
||||||
|
If oDataResultsExist Then
|
||||||
|
_frmValidatorSearch._DTSQLSearches = CURRENT_DT_PROFILE_SEARCHES_SQL
|
||||||
|
Dim oConID = CURRENT_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID")
|
||||||
|
Dim oCommand = CURRENT_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND")
|
||||||
|
oCommand = clsPatterns.ReplaceAllValues(oCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID)
|
||||||
|
|
||||||
|
_frmValidatorSearch.Refresh_Load_GridSQL(oConID, oCommand, 0, CURRENT_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("TAB_TITLE"))
|
||||||
|
End If
|
||||||
|
If oDocResultsExist Then
|
||||||
|
_frmValidatorSearch._DTDocSearches = CURRENT_DT_PROFILE_SEARCHES_DOC
|
||||||
|
Dim oConID = CURRENT_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID")
|
||||||
|
Dim oCommand = CURRENT_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND")
|
||||||
|
oCommand = clsPatterns.ReplaceAllValues(oCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID)
|
||||||
|
|
||||||
|
_frmValidatorSearch.RefreshTabDoc(oConID, oCommand, 0, CURRENT_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("TAB_TITLE"))
|
||||||
|
End If
|
||||||
End If
|
End If
|
||||||
Else
|
Else
|
||||||
LOGGER.Info("Not loading AdditionalSearches...!")
|
LOGGER.Info("Not loading AdditionalSearches...!")
|
||||||
@ -2667,17 +2707,17 @@ Public Class frmValidator
|
|||||||
Dim oErrorOcurred As Boolean = False
|
Dim oErrorOcurred As Boolean = False
|
||||||
|
|
||||||
TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Fill(FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING, CURRENT_ProfilName)
|
TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Fill(FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING, CURRENT_ProfilName)
|
||||||
Dim dtfinal As DataTable = FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING
|
Dim oDTFinalIndexes As DataTable = FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING
|
||||||
If dtfinal.Rows.Count > 0 Then
|
If oDTFinalIndexes.Rows.Count > 0 Then
|
||||||
'Jetzt finale Indexe setzen
|
'Jetzt finale Indexe setzen
|
||||||
LOGGER.Debug("Finale(r) Index(e) für Dok: " & CURRENT_WMFILE.aName & " soll gesetzt werden")
|
LOGGER.Debug("Finale(r) Index(e) für Dok: " & CURRENT_WMFILE.aName & " soll gesetzt werden")
|
||||||
For Each dr As DataRow In dtfinal.Rows
|
For Each oFinalIndexRow As DataRow In oDTFinalIndexes.Rows
|
||||||
Dim oValue As String = dr.Item("VALUE").ToString
|
Dim oValue As String = oFinalIndexRow.Item("VALUE").ToString
|
||||||
Dim oIndexType = WINDREAM.GetTypeOfIndex(dr.Item("INDEXNAME"))
|
Dim oIndexType = WINDREAM.GetTypeOfIndex(oFinalIndexRow.Item("INDEXNAME"))
|
||||||
|
|
||||||
If oValue.ToUpper = "SQL-Command".ToUpper Then '###### Indexierung mit variablen SQL ###
|
If oValue.ToUpper = "SQL-Command".ToUpper Then '###### Indexierung mit variablen SQL ###
|
||||||
LOGGER.Debug("Indexierung mit dynamischem SQL!")
|
LOGGER.Debug("Indexierung mit dynamischem SQL!")
|
||||||
Dim oSQLCommand = dr.Item("SQL_COMMAND")
|
Dim oSQLCommand = oFinalIndexRow.Item("SQL_COMMAND")
|
||||||
|
|
||||||
LOGGER.Debug("SQL_COMMAND before ReplaceAllValues: " & oSQLCommand)
|
LOGGER.Debug("SQL_COMMAND before ReplaceAllValues: " & oSQLCommand)
|
||||||
oSQLCommand = clsPatterns.ReplaceAllValues(oSQLCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID)
|
oSQLCommand = clsPatterns.ReplaceAllValues(oSQLCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID)
|
||||||
@ -2701,13 +2741,13 @@ Public Class frmValidator
|
|||||||
|
|
||||||
Else
|
Else
|
||||||
If oValue.StartsWith("v") Then
|
If oValue.StartsWith("v") Then
|
||||||
Select Case dr.Item("VALUE").ToString
|
Select Case oFinalIndexRow.Item("VALUE").ToString
|
||||||
Case "vDate"
|
Case "vDate"
|
||||||
oValue = Now.ToShortDateString
|
oValue = Now.ToShortDateString
|
||||||
Case "vUserName"
|
Case "vUserName"
|
||||||
oValue = Environment.UserName
|
oValue = Environment.UserName
|
||||||
Case Else
|
Case Else
|
||||||
oValue = dr.Item("VALUE")
|
oValue = oFinalIndexRow.Item("VALUE")
|
||||||
End Select
|
End Select
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
@ -2723,8 +2763,8 @@ Public Class frmValidator
|
|||||||
'If dr.Item("INDEXNAME").ToString.StartsWith("[%VKT") Then
|
'If dr.Item("INDEXNAME").ToString.StartsWith("[%VKT") Then
|
||||||
' Dim PM_String = Return_PM_VEKTOR(value, dr.Item("INDEXNAME"))
|
' Dim PM_String = Return_PM_VEKTOR(value, dr.Item("INDEXNAME"))
|
||||||
'Hier muss nun separat als Vektorfeld indexiert werden
|
'Hier muss nun separat als Vektorfeld indexiert werden
|
||||||
If Indexiere_VektorfeldPM(oValue, dr.Item("INDEXNAME"), dr.Item("PREVENT_DUPLICATES"), dr.Item("ALLOW_NEW_VALUES")) = False Then
|
If Indexiere_VektorfeldPM(oValue, oFinalIndexRow.Item("INDEXNAME"), oFinalIndexRow.Item("PREVENT_DUPLICATES"), oFinalIndexRow.Item("ALLOW_NEW_VALUES")) = False Then
|
||||||
LOGGER.Debug("FINALER INDEX '" & dr.Item("INDEXNAME").ToString & "' WURDE ERFOLGREICH GESETZT")
|
LOGGER.Debug("FINALER Vektorindex '" & oFinalIndexRow.Item("INDEXNAME").ToString & "' WURDE ERFOLGREICH GESETZT")
|
||||||
Else
|
Else
|
||||||
errormessage = "Fehler beim finalen Indexieren:" & vbNewLine & idxerr_message
|
errormessage = "Fehler beim finalen Indexieren:" & vbNewLine & idxerr_message
|
||||||
My.Settings.Save()
|
My.Settings.Save()
|
||||||
@ -2733,12 +2773,12 @@ Public Class frmValidator
|
|||||||
End If
|
End If
|
||||||
Else
|
Else
|
||||||
LOGGER.Debug("Jetzt das indexieren")
|
LOGGER.Debug("Jetzt das indexieren")
|
||||||
If Indexiere_File(CURRENT_WMFILE, dr.Item("INDEXNAME"), oResult) = True Then
|
If Indexiere_File(CURRENT_WMFILE, oFinalIndexRow.Item("INDEXNAME"), oResult) = True Then
|
||||||
LOGGER.Debug("FINALER INDEX '" & dr.Item("INDEXNAME") & "' WURDE ERFOLGREICH GESETZT")
|
LOGGER.Debug("FINALER INDEX '" & oFinalIndexRow.Item("INDEXNAME") & "' WURDE ERFOLGREICH GESETZT")
|
||||||
|
|
||||||
'Nun das Logging
|
'Nun das Logging
|
||||||
If PROFIL_LOGINDEX <> "" Then
|
If PROFIL_LOGINDEX <> "" Then
|
||||||
Dim logstr = Return_LOGString(oValue, "DDFINALINDEX", dr.Item("INDEXNAME"))
|
Dim logstr = Return_LOGString(oValue, "DDFINALINDEX", oFinalIndexRow.Item("INDEXNAME"))
|
||||||
Indexiere_VektorfeldPM(logstr, PROFIL_LOGINDEX)
|
Indexiere_VektorfeldPM(logstr, PROFIL_LOGINDEX)
|
||||||
End If
|
End If
|
||||||
Else
|
Else
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user