From 0fb94b6d1b5f6078316754410746df6d2892bfa2 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Thu, 19 May 2022 12:16:19 +0200 Subject: [PATCH] MS --- GUIs.ZooFlow/ClassInit.vb | 13 +++++++------ .../Modules/Globix/frmFileflow_Duplicate.vb | 2 +- GUIs.ZooFlow/Search/frmFlowSearch2.vb | 1 - GUIs.ZooFlow/frmFlowForm.vb | 2 +- GUIs.ZooFlow/modCurrent.vb | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb index 388c1676..83d85cd3 100644 --- a/GUIs.ZooFlow/ClassInit.vb +++ b/GUIs.ZooFlow/ClassInit.vb @@ -261,6 +261,7 @@ Public Class ClassInit My.Tables.DTIDB_COMMON_SQL = My.Database.GetDatatable("TBIDB_COMMON_SQL", oSql, EDMI.API.Constants.DatabaseType.IDB) For Each oRow As DataRow In My.Tables.DTIDB_COMMON_SQL.Rows + Dim oTITLE = oRow.Item("TITLE").ToString Dim oBaseSQL = oRow.Item("SQL_COMMAND").ToString oBaseSQL = oBaseSQL.Replace("@USER_ID", My.Application.User.UserId) oBaseSQL = oBaseSQL.Replace("@USERID", My.Application.User.UserId) @@ -270,13 +271,13 @@ Public Class ClassInit oBaseSQL = oBaseSQL.Replace("@LANG_CODE", My.Application.User.Language) oBaseSQL = oBaseSQL.Replace("{#INT#USERNAME}", My.Application.User.UserName) - If oRow.Item("TITLE") = SQLCMD_FLOW_SEARCH_BASE Then - SQL_DocResultBase = oBaseSQL - ElseIf oRow.Item("TITLE") = SQLCMD_AHW_LAYOUT_SELECT Then + If oTITLE = SQLCMD_FLOW_SEARCH_BASE Then + SQL_FLOW_SEARCH_BASE = oBaseSQL + ElseIf oTITLE = SQLCMD_AHW_LAYOUT_SELECT Then SQL_AHW_LAYOUT_SELECT = oBaseSQL - ElseIf oRow.Item("TITLE") = SQLCMD_AHW_USR_SELECT Then + ElseIf oTITLE = SQLCMD_AHW_USR_SELECT Then SQL_AHW_USR_SELECT = oBaseSQL - ElseIf oRow.Item("TITLE") = SQLCMD_RECENT_FILES_USER Then + ElseIf oTITLE = SQLCMD_RECENT_FILES_USER Then SQL_RECENT_FILES_USER = oBaseSQL End If Next @@ -307,7 +308,7 @@ Public Class ClassInit My.Tables.DTIDB_ATTRIBUTE = My.Database.GetDatatable("VWIDB_BE_ATTRIBUTE", oSql, EDMI.API.Constants.DatabaseType.IDB, $"LANG_CODE = '{MyApplication.User.Language}'") - If SQL_DocResultBase = "" Then + If SQL_FLOW_SEARCH_BASE = "" Then Logger.Warn($"ATTENTION: NO DocResultBaseSearch - Check if entry {SQLCMD_FLOW_SEARCH_BASE} exists in TBIDB_COMMON_SQL") End If diff --git a/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.vb b/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.vb index 57e6b2da..71bcec74 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.vb @@ -19,7 +19,7 @@ Public Class frmFileflow_Duplicate Environment = My.Application.GetEnvironment() Search = New SearchRunner(My.LogConfig, Environment, "FlowSearch") With { - .BaseSearchSQL = SQL_DocResultBase + .BaseSearchSQL = SQL_FLOW_SEARCH_BASE } End Sub diff --git a/GUIs.ZooFlow/Search/frmFlowSearch2.vb b/GUIs.ZooFlow/Search/frmFlowSearch2.vb index aca4e251..dbb39658 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch2.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch2.vb @@ -40,7 +40,6 @@ Public Class frmFlowSearch2 Private Function LoadBaseSQL() As String Dim oSQL = "" - For Each oRow As DataRow In My.Tables.DTIDB_COMMON_SQL.Rows If oRow.Item("TITLE") = SQLCMD_FLOW_SEARCH_BASE Then oSQL = oRow.Item("SQL_COMMAND") diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 688d4bfe..64a3616f 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -232,7 +232,7 @@ Public Class frmFlowForm Modules = New ClassModules(My.LogConfig, My.SystemConfig) FileEx = New Filesystem.File(My.LogConfig) Search = New SearchRunner(My.LogConfig, Environment, "FlowSearch") With { - .BaseSearchSQL = SQL_DocResultBase + .BaseSearchSQL = SQL_FLOW_SEARCH_BASE } ' === Initialize Theming === diff --git a/GUIs.ZooFlow/modCurrent.vb b/GUIs.ZooFlow/modCurrent.vb index 487d8b0e..62d53995 100644 --- a/GUIs.ZooFlow/modCurrent.vb +++ b/GUIs.ZooFlow/modCurrent.vb @@ -13,7 +13,7 @@ Module modCurrent Public Property AHWF_CMD_USR_SELECT As String Public Property AHWF_CMD_LAYOUT_SELECT As String - Public Property SQL_DocResultBase As String + Public Property SQL_FLOW_SEARCH_BASE As String Public Property SQL_AHW_LAYOUT_SELECT As String Public Property SQL_AHW_USR_SELECT As String Public Property SQL_RECENT_FILES_USER As String