AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://172.24.11.74:90/scm/git/ProcessManagerClient

Browse Source
This commit is contained in:
Digital Data - Marlon Schreiber 2019-04-09 15:20:08 +02:00
commit 9932541fe2
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/DD_PM_WINDREAM/frmAdministration.vb
View File

@ -1015,28 +1015,31 @@ Public Class frmAdministration
Else Else
value = ClassFinalIndex.GetValue(obj, obj.IndexName, Windream_Indicies, Windream_Indicies_Types, obj.VectorIndex) value = ClassFinalIndex.GetValue(obj, obj.IndexName, Windream_Indicies, Windream_Indicies_Types, obj.VectorIndex)
End If End If
value = NotNull(value, String.Empty)
Dim guid = obj.GUID Dim guid = obj.GUID
Dim profileId As Integer = PROFILGUIDTextBox.Text Dim profileId As Integer = PROFILGUIDTextBox.Text
Dim connectionId As Integer = obj.ConnectionId Dim connectionId As Integer = obj.ConnectionId
Dim sqlCommand As String = obj.SQLCommand.Value.Replace("'", "''") Dim sqlCommand As String = NotNull(obj.SQLCommand.Value, String.Empty).Replace("'", "''")
Dim indexName As String = obj.IndexName Dim indexName As String = NotNull(obj.IndexName, String.Empty)
Dim isVectorIndex As Boolean = obj.VectorIndex Dim isVectorIndex As Boolean = obj.VectorIndex
Dim addedWho As String = Environment.UserName Dim addedWho As String = Environment.UserName
Dim description As String = obj.Description Dim description As String = obj.Description
Dim active As Integer = IIf(obj.Active, 1, 0) Dim active As Integer = IIf(obj.Active, 1, 0)
If NotNull(indexName, "") = String.Empty Then If indexName = String.Empty Then
MsgBox("Das Feld IndexName muss ausgefüllt sein!", MsgBoxStyle.Exclamation) MsgBox("Das Feld IndexName muss ausgefüllt sein!", MsgBoxStyle.Exclamation)
Exit Sub Exit Sub
End If End If
If NotNull(sqlCommand, "") = String.Empty And NotNull(value, "") = String.Empty Then If sqlCommand = String.Empty And value = String.Empty Then
MsgBox("Entweder SQLCommand oder StaticValue müssen ausgefüllt sein!", MsgBoxStyle.Exclamation) MsgBox("Entweder SQLCommand oder StaticValue müssen ausgefüllt sein!", MsgBoxStyle.Exclamation)
Exit Sub Exit Sub
End If End If
If obj.VectorIndex Then ' Add the vector prefix to the value if index is a vector index
' and value is NOT an SQL-Command
If obj.VectorIndex And value <> "SQL-Command" Then
value = $"{ClassFinalIndex.PREFIX_VECTOR}{value}" value = $"{ClassFinalIndex.PREFIX_VECTOR}{value}"
End If End If