From ba0e53797f8b6cd6b7637557dabd03d15d797e86 Mon Sep 17 00:00:00 2001 From: Sergey Date: Sat, 30 Nov 2019 12:28:52 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=B8=D0=BC=D1=8F=20=D0=BA=D0=BB=D0=B0=D1=81?= =?UTF-8?q?=D1=82=D0=B5=D1=80=D0=B0=20=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=84?= =?UTF-8?q?=D0=B8=D0=B3.=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3=20=D1=81=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D0=B1=D0=B5=D0=BB=D0=B0=D0=BC=D0=B8=20=D0=B2=20=D0=B8=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=D1=85=20=D0=BA=D0=BB=D0=B0=D1=81=D1=82=D0=B5?= =?UTF-8?q?=D1=80=D0=B0=20=D0=B8=20=D0=98=D0=91=20=D0=BF=D1=80=D0=B8=20?= =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/config.tcl | 1 - lib/function.tcl | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/config.tcl b/lib/config.tcl index 7b48e78..0addc82 100644 --- a/lib/config.tcl +++ b/lib/config.tcl @@ -211,4 +211,3 @@ proc CopyNewConfig {} { } } - diff --git a/lib/function.tcl b/lib/function.tcl index 53a969a..2f66006 100644 --- a/lib/function.tcl +++ b/lib/function.tcl @@ -47,7 +47,8 @@ proc SetGlobalVarFromTreeItems {tree id} { set server $values } cluster { - set active_cluster $values + set active_cluster $values + #puts $values #dict set servers_list servers $host clusters "$values {}" set cluster_user [GetClusterAdmin $host $active_cluster] set cluster_pwd [GetClusterPassword $host $active_cluster] @@ -441,7 +442,7 @@ proc Run::server {tree host values} { InsertClusterItems $tree $id } #dict replace servers_list [dict get servers_list servers $host clusters] - #dict set servers_list servers $host clusters $id name $cluster_name + dict set servers_list servers $host clusters $id cluster_name $cluster_name #puts $cluster_name #puts $servers_list } @@ -1242,7 +1243,7 @@ proc Add::infobases {tree host values} { } RunCommand "infobase create $db_create \ - --name=[.add.frm.ent_name get] \ + --name=[regsub -all -- " " [.add.frm.ent_name get] "\\ "] \ --dbms=$dbms \ --db-server=[.add.frm.ent_db_server get] \ --db-name=[.add.frm.ent_db_name get] \ @@ -1911,7 +1912,7 @@ proc Edit::cluster {tree host values} { .add.frm_btn.btn_ok configure -command { RunCommand "cluster update \ --cluster=$active_cluster $auth \ - --name=[.add.frm.ent_name get] \ + --name=[regsub -all -- " " [.add.frm.ent_name get] "\\ "] \ --expiration-timeout=$expiration_timeout \ --lifetime-limit=$lifetime_limit \ --max-memory-size=$max_memory_size \ @@ -2582,3 +2583,4 @@ proc Del::inet {tree host profile_name} { +