This commit is contained in:
2021-01-12 17:25:58 +01:00
parent ce6c69b742
commit 0a5439e413
14 changed files with 129 additions and 91 deletions

View File

@@ -10,11 +10,10 @@ Public Class frmGlobix_Index
Public vPathFile As String
Private MULTIFILES As Integer
Private akttxtbox As TextBox
Dim DT_INDEXEMAN As DataTable
Dim DT_DOKART As DataTable
Public FormLoaded As Boolean = False
Dim DropType As String
Private DT_INDEXEMAN As DataTable
Dim sql_history_INSERT_INTO As String
Dim sql_history_Index_Values As String
@@ -608,7 +607,7 @@ Public Class frmGlobix_Index
End If
End Sub
Private Sub BarButtonItem1_ItemClick_1(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
Private Sub GlobixFlow()
ClearError()
ClearNotice()
Me.Cursor = Cursors.WaitCursor
@@ -676,7 +675,7 @@ Public Class frmGlobix_Index
Private Function WORK_FILE()
Try
Dim oSQL = $"SELECT * FROM VWDDINDEX_MAN WHERE DOK_ID = {My.Application.Globix.CURRENT_DOCTYPE_ID}"
Dim oSQL = $"SELECT * ,CONVERT(VARCHAR(512),'') As IndexValueGUI,CONVERT(VARCHAR(512),'') As IndexValue_File,CONVERT(Bit,0) as Indexed FROM VWDDINDEX_MAN WHERE DOK_ID = {My.Application.Globix.CURRENT_DOCTYPE_ID}"
My.Application.Globix.CURR_DT_MAN_INDEXE = My.Database.GetDatatable(oSQL)
_Logger.Debug("Manuelle Indexe geladen")
@@ -742,13 +741,10 @@ Public Class frmGlobix_Index
Function Name_Generieren()
Try
_Logger.Debug("#### Name_Generieren ####")
Dim sql As String = "select VERSION_DELIMITER, FILE_DELIMITER FROM TBDD_MODULES WHERE GUID = 1"
My.Application.Globix.FILE_DELIMITER = "~"
My.Application.Globix.VERSION_DELIMITER = "~"
Dim oFilesystem As New DigitalData.Modules.Filesystem.File(_LogConfig)
Dim DT1 As DataTable = My.Database.GetDatatable(sql)
For Each row As DataRow In DT1.Rows
My.Application.Globix.FILE_DELIMITER = row.Item("FILE_DELIMITER")
My.Application.Globix.VERSION_DELIMITER = row.Item("VERSION_DELIMITER")
Next
Dim err As Boolean = False
Dim folder_Created As Boolean = False
@@ -761,8 +757,8 @@ Public Class frmGlobix_Index
'CURR_DOKART_OBJECTTYPE = DT.Rows(0).Item("OBJEKTTYP")
My.Application.Globix.CURRENT_WORKFILE_EXTENSION = extension
'oRAWZielordner = WINDREAM.GetNormalizedPath(My.Application.Globix.CURR_DT_DOCTYPE.Rows(0).Item("ZIEL_PFAD"))
oRAWZielordner = Path.Combine("\\windream\objects", oRAWZielordner)
oRAWZielordner = My.Application.Globix.CURR_DT_DOCTYPE.Rows(0).Item("ZIEL_PFAD")
'####
' Regulären Ausdruck zum Auslesen der Indexe definieren
@@ -1023,6 +1019,7 @@ Public Class frmGlobix_Index
Return False
End Try
End Function
Private Function
Private Function Write_Indizes()
Try
Dim indexierung_erfolgreich As Boolean = False
@@ -1031,12 +1028,12 @@ Public Class frmGlobix_Index
' If DTMan.Rows.Count > 0 Then
' Dim Count As Integer = 0
' For Each row As DataRow In DTMan.Rows
' Dim idxvalue = row.Item("Indexwert")
' Dim idxvalue = row.Item("IndexValueGUI")
' Dim indexname = row.Item("WD_INDEX").ToString
' _Logger.Debug($"Write_Indizes - Index [{indexname}]...")
' Dim optional_Index = CBool(row.Item("OPTIONAL"))
' Dim indexiert = CBool(row.Item("Indexiert"))
' If indexiert And idxvalue.ToString <> "" And idxvalue <> "EMPTY_OI" Then
' Dim Indexed = CBool(row.Item("Indexed"))
' If Indexed And idxvalue.ToString <> "" And idxvalue <> "EMPTY_OI" Then
' If indexname <> String.Empty Then
' If row.Item("SAVE_VALUE") = True Then
' 'Den Indexwert zwischenspeichern
@@ -1047,7 +1044,7 @@ Public Class frmGlobix_Index
' If rowTemp.Item("Dokumentart") = row.Item("DOKUMENTART") And rowTemp.Item("Indexname") = row.Item("INDEXNAME") Then
' rowexists = True
' '......überschreiben
' rowTemp.Item("Value") = row.Item("Indexwert")
' rowTemp.Item("Value") = row.Item("IndexValueGUI")
' End If
' Next
' '.....ansonsten neu anlegen
@@ -1055,7 +1052,7 @@ Public Class frmGlobix_Index
' Dim newRow As DataRow = DTTemp.NewRow()
' newRow("Dokumentart") = row.Item("DOKUMENTART").ToString
' newRow("Indexname") = row.Item("INDEXNAME").ToString
' newRow("Value") = row.Item("Indexwert")
' newRow("Value") = row.Item("IndexValueGUI")
' DTTemp.Rows.Add(newRow)
' End If
' End If
@@ -1108,10 +1105,10 @@ Public Class frmGlobix_Index
' If DTAut.Rows.Count > 0 Then
' Dim Count As Integer = 0
' For Each row As DataRow In DTAut.Rows
' Dim indexiert = CBool(row.Item("Indexiert"))
' Dim Indexvalue = row.Item("Indexwert").ToString
' Dim Indexed = CBool(row.Item("Indexed"))
' Dim Indexvalue = row.Item("IndexValueGUI").ToString
' Dim indexname = row.Item("INDEXNAME").ToString
' If indexiert = True And Indexvalue <> "" Then
' If Indexed = True And Indexvalue <> "" Then
' If Indexvalue <> "EMPTY_OI" Then
' _Logger.Info("Auto Indexname: " & indexname.ToString)
' _Logger.Info("Indexvalue: " & Indexvalue.ToString)
@@ -1320,8 +1317,8 @@ Public Class frmGlobix_Index
For Each oDataRow As DataRow In My.Application.Globix.CURR_DT_MAN_INDEXE.Rows
If oDataRow.Item("INDEXNAME").ToString.ToLower = indexname.ToLower Then
Dim oIndexWert = oDataRow.Item("Indexwert")
Dim oIsIndexed = oDataRow.Item("Indexiert")
Dim oIndexWert = oDataRow.Item("IndexValueGUI")
Dim oIsIndexed = oDataRow.Item("Indexed")
If oIsIndexed = True Then
If oIndexWert.ToString <> String.Empty Then
@@ -1355,24 +1352,24 @@ Public Class frmGlobix_Index
Function GetManIndex_Value(indexname As String, RequestFor As String, opt As Boolean)
Try
For Each DR As DataRow In DT_INDEXEMAN.Rows
For Each DR As DataRow In My.Application.Globix.CURR_DT_MAN_INDEXE.Rows
If DR.Item("INDEXNAME").ToString.ToLower = indexname.ToLower Then
If DR.Item("Indexiert") = True Then
If DR.Item("Indexed") = True Then
_Logger.Info("## Manueller Index: " & indexname)
Select Case RequestFor
Case "FILE"
If DR.Item("Indexwert_File").ToString <> String.Empty Then
_Logger.Info(" >>Es liegt ein separater nachbearbeiteter Wert für die Dateibenennung vor: " & DR.Item("Indexwert_File").ToString)
_Logger.Info(" >>Zurückgegebener NachbearbeitungsWert: " & DR.Item("Indexwert_File"))
Return DR.Item("Indexwert_File")
If DR.Item("IndexValue_File").ToString <> String.Empty Then
_Logger.Info("Es liegt ein separater nachbearbeiteter Wert für die Dateibenennung vor: " & DR.Item("IndexValue_File").ToString)
_Logger.Info("Zurückgegebener NachbearbeitungsWert: " & DR.Item("IndexValue_File"))
Return DR.Item("IndexValue_File")
Else
If DR.Item("Indexwert").ToString <> String.Empty Then
_Logger.Info("Zurückgegebener manueller Indexwert: " & DR.Item("Indexwert"))
Return DR.Item("Indexwert")
If DR.Item("IndexValueGUI").ToString <> String.Empty Then
_Logger.Info("Zurückgegebener manueller Indexwert: " & DR.Item("IndexValueGUI"))
Return DR.Item("IndexValueGUI")
Else
If opt = False Then
_Logger.Info("Achtung, der Indexwert des manuellen Indexes '" & indexname & "' ist String.empty!")
ShowNotice("Indexiert = True - Der Index: " & DR.Item("INDEXNAME") & " wurde nicht ordnungsgemäss indexiert! - Automatischer Index konnte nicht gesetzt werden!")
ShowNotice("Indexed = True - Der Index: " & DR.Item("INDEXNAME") & " wurde nicht ordnungsgemäss indexiert! - Automatischer Index konnte nicht gesetzt werden!")
Return Nothing
Else
Return ""
@@ -1381,9 +1378,9 @@ Public Class frmGlobix_Index
End If
End If
Case Else
If DR.Item("Indexwert").ToString <> String.Empty Then
_Logger.Info(" >>Zurückgegebener manueller Indexwert: " & DR.Item("Indexwert"))
Return DR.Item("Indexwert")
If DR.Item("IndexValueGUI").ToString <> String.Empty Then
_Logger.Info("Zurückgegebener manueller Indexwert: " & DR.Item("IndexValueGUI"))
Return DR.Item("IndexValueGUI")
Else
If opt = False Then
@@ -1602,7 +1599,8 @@ Public Class frmGlobix_Index
Function FillIndexe_Autom(dokart_id As Integer)
Try
Dim oSQL = $"SELECT * FROM VWDDINDEX_AUTOM WHERE DOK_ID = {My.Application.Globix.CURRENT_DOCTYPE_ID}"
Dim oSQL = $"SELECT * FROM VWDDINDEX_AUTOM WHERE DOCTYPE_ID = {My.Application.Globix.CURRENT_DOCTYPE_ID}"
My.Application.Globix.CURR_DT_AUTO_INDEXE = My.Database.GetDatatable(oSQL)
Dim oRegex As New Regex("\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}")
@@ -1632,8 +1630,8 @@ Public Class frmGlobix_Index
oValue = oPlaceholderResult
End If
oAutoIndexRow.Item("Indexiert") = True
oAutoIndexRow.Item("Indexwert") = oValue
oAutoIndexRow.Item("Indexed") = True
oAutoIndexRow.Item("IndexValueGUI") = oValue
Continue For
End If
@@ -1709,14 +1707,14 @@ Public Class frmGlobix_Index
If oIsFirstMatch Then
Exit For
End If
oAutoIndexRow.Item("Indexiert") = True
oAutoIndexRow.Item("Indexwert") = String.Join(ClassConstants.VECTORSEPARATOR, oEndResult.ToArray)
oAutoIndexRow.Item("Indexed") = True
oAutoIndexRow.Item("IndexValueGUI") = String.Join(ClassConstants.VECTORSEPARATOR, oEndResult.ToArray)
Next
Else
Dim oResult = GetAutomaticIndexSQLValue(oSqlResult, oSqlConnectionId, oSqlProvider)
_Logger.Info("Got a simple SQLResult: " & oResult.ToString)
oAutoIndexRow.Item("Indexiert") = True
oAutoIndexRow.Item("Indexwert") = oResult
oAutoIndexRow.Item("Indexed") = True
oAutoIndexRow.Item("IndexValueGUI") = oResult
End If
Next
@@ -1772,7 +1770,7 @@ Public Class frmGlobix_Index
Dim idxid As Integer = oDataRow.Item("GUID")
If idxid > 0 Then
' In jedem Fall schon mal den Wert einfügen
oDataRow.Item("Indexwert") = wert_in
oDataRow.Item("IndexValueGUI") = wert_in
'Die Nachbearbeitungsschritte laden
'FILE AND INDEX
'Zuerst nur die Fälle für die Variante ONLY FILE/FOLDER
@@ -1781,8 +1779,8 @@ Public Class frmGlobix_Index
If DTNB Is Nothing = False Then
If DTNB.Rows.Count > 0 Then
value_post = clsPostProcessing.Get_Nachbearbeitung_Wert(wert_in, DTNB)
oDataRow.Item("Indexwert") = wert_in
oDataRow.Item("Indexwert_File") = value_post
oDataRow.Item("IndexValueGUI") = value_post
oDataRow.Item("IndexValue_File") = value_post
End If
End If
'Jetzt die Fälle für die Variante FILE AND INDEX
@@ -1793,11 +1791,11 @@ Public Class frmGlobix_Index
If DTNB Is Nothing = False Then
If DTNB.Rows.Count > 0 Then
value_post = clsPostProcessing.Get_Nachbearbeitung_Wert(wert_in, DTNB)
oDataRow.Item("Indexwert") = value_post
oDataRow.Item("IndexValueGUI") = value_post
End If
End If
End If
oDataRow.Item("Indexiert") = True
oDataRow.Item("Indexed") = True
End If
Next
Catch ex As Exception
@@ -1806,4 +1804,12 @@ Public Class frmGlobix_Index
MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Indexwert_Postprocessing:")
End Try
End Sub
Private Sub PictureEdit1_Click(sender As Object, e As EventArgs) Handles PictureEdit1.Click
GlobixFlow()
End Sub
Private Sub PictureEdit1_EditValueChanged(sender As Object, e As EventArgs) Handles PictureEdit1.EditValueChanged
End Sub
End Class