diff --git a/app/TaskFlow/My Project/AssemblyInfo.vb b/app/TaskFlow/My Project/AssemblyInfo.vb index 2c19423..65a31c3 100644 --- a/app/TaskFlow/My Project/AssemblyInfo.vb +++ b/app/TaskFlow/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/TaskFlow/frmAdministration.vb b/app/TaskFlow/frmAdministration.vb index 3125174..dee0480 100644 --- a/app/TaskFlow/frmAdministration.vb +++ b/app/TaskFlow/frmAdministration.vb @@ -776,11 +776,16 @@ Public Class frmAdministration ElseIf oName = "ContinueOnIndifferentState" Then obj.ContinueOnIndifferentState = oValue ElseIf oName = "VectorBehaviour" Then - If oValue = "Delete" Then - obj.StringValue = "DeleteWMAttributeValue" - ElseIf oValue = "Add" And obj.StringValue = "" Then - obj.StringValue = "Your value to set" + If Not IsNothing(oValue) Then + If oValue = "Delete" Then + obj.StringValue = "DeleteWMAttributeValue" + obj.SQLCommand.Value = "" + + ElseIf oValue = "Add" And obj.StringValue = "" Then + obj.StringValue = "Your value to set" + End If End If + End If pgFinalIndexes.Refresh() End If diff --git a/app/TaskFlow/frmMain.resx b/app/TaskFlow/frmMain.resx index 4e8735e..ae96ace 100644 --- a/app/TaskFlow/frmMain.resx +++ b/app/TaskFlow/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAATgBCwE4AQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAVABCwFQAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb index 9d9ba42..5f7e3ee 100644 --- a/app/TaskFlow/frmValidator.vb +++ b/app/TaskFlow/frmValidator.vb @@ -4273,7 +4273,7 @@ Public Class frmValidator oErrorOcurred = True _ItemWorked = False Else - ValidatorLogger.Warn($"FinalIndexResult from SQL is EmptyValue - AttributeName [{oFinalIndexRow.Item("INDEXNAME")}] - oContinueOnIndifferentState = true, So continuing with next Attribute") + ValidatorLogger.Warn($"FinalIndexResult from SQL is EmptyValue - AttributeName [{oFinalIndex}] - oContinueOnIndifferentState = true, So continuing with next Attribute") Continue For End If End If @@ -4345,8 +4345,8 @@ Public Class frmValidator oNewValue = oValueList.ToArray() - If Indexiere_File(CURRENT_WMFILE, oFinalIndexRow.Item("INDEXNAME"), oNewValue) = True Then - ValidatorLogger.Debug("Final Vektorindex '" & oFinalIndexRow.Item("INDEXNAME").ToString & "' has been set successfully!") + If Indexiere_File(CURRENT_WMFILE, oFinalIndex, oNewValue) = True Then + ValidatorLogger.Debug("Final Vektorindex '" & oFinalIndex & "' has been set successfully!") Else errormessage = "Error in final indexing:" & vbNewLine & idxerr_message My.Settings.Save() @@ -4371,20 +4371,20 @@ Public Class frmValidator End If Dim oFIResult As Boolean = False If IDB_ACTIVE = False Then - If Indexiere_File(CURRENT_WMFILE, oFinalIndexRow.Item("INDEXNAME"), oResult) = True Then + If Indexiere_File(CURRENT_WMFILE, oFinalIndex, oResult) = True Then oFIResult = True - ValidatorLogger.Debug("FINALER INDEX '" & oFinalIndexRow.Item("INDEXNAME") & "' WURDE ERFOLGREICH GESETZT") + ValidatorLogger.Debug("FINALER INDEX '" & oFinalIndex & "' WURDE ERFOLGREICH GESETZT") 'Nun das Logging If PROFIL_LOGINDEX <> "" Then - Dim logstr = Return_LOGString(oValue, "DDFINALINDEX", oFinalIndexRow.Item("INDEXNAME")) + Dim logstr = Return_LOGString(oValue, "DDFINALINDEX", oFinalIndex) WMIndexVectofield(logstr, PROFIL_LOGINDEX) End If End If Else - If IDBData.SetVariableValue(oFinalIndexRow.Item("INDEXNAME"), oValue) = True Then + If IDBData.SetVariableValue(oFinalIndex, oValue) = True Then oFIResult = True - ValidatorLogger.Debug($"Final index IDB '{oFinalIndexRow.Item("INDEXNAME")}' was updated with [{oValue.ToString}]") + ValidatorLogger.Debug($"Final index IDB '{oFinalIndex}' was updated with [{oValue.ToString}]") End If End If If oFIResult = False Then @@ -5727,7 +5727,7 @@ Public Class frmValidator Next End If - If oExistingItems.Count > 0 Then + If oExistingItems.Count > 0 And oIndexType <> 4100 Then ValidatorLogger.Debug("oOverwrite = False and WMObject already contains [{0}] values in attribute,Values will be concatted", oExistingItems.Count) oListofString = oExistingItems.Concat(oListofString).ToList() End If