From 0a61eff7db288f389ad123dbc59c8232bedbf3c6 Mon Sep 17 00:00:00 2001 From: Sergey Date: Sat, 24 Aug 2019 15:37:04 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D1=8B=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D0=B8=20=D0=BD=D0=B0=20json.=20=D0=9A=D0=BE=D0=BD=D1=84=D0=B8?= =?UTF-8?q?=D0=B3=20=D0=B1=D1=83=D0=B4=D0=B5=D1=82=20=D0=B2=D0=B2=D0=B8?= =?UTF-8?q?=D0=B4=D0=B5=20tcl-=D1=81=D0=BB=D0=BE=D0=B2=D0=B0=D1=80=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/function.tcl | 37 +++++++++++++++++++++++++++++ lib/json.tcl | 60 ------------------------------------------------ rac_gui.cfg | 3 --- 3 files changed, 37 insertions(+), 63 deletions(-) delete mode 100644 lib/json.tcl diff --git a/lib/function.tcl b/lib/function.tcl index af6861f..8429a90 100644 --- a/lib/function.tcl +++ b/lib/function.tcl @@ -311,6 +311,39 @@ proc SaveMainServer {host port path_to_rac} { return "$host:$port" } +proc SaveConfig {} { + global host server active_cluster infobase profile_name dir rac_cmd_for_host rac_cmd servers_list + set file [open [file join $dir(work) 1c_srv_new.cfg] "a+"] + + puts "$host:$port $rac_cmd" + puts $file "$host:$port,$rac_cmd" + close $file + return "$host:$port" + + + +} + +set servers_list { + server_id { + command rac_cmd + cluster_id { + cluster_name "" + infobase-id1 { + infobase_name "" + infobase_user "" + infobase_pwd "" + } + infobase-id2 { + infobase_name "" + infobase_user "" + infobase_pwd "" + } + } + } +} + + proc GetWorkTreeItems {par} { set work_tree_id [.frm_work.tree_work selection] set work_tree_values [.frm_work.tree_work item $work_tree_id -values] @@ -377,6 +410,9 @@ proc CreateInfoBasesJSONfile {serversList} { } } + + + namespace eval Run {} {} # Получение данных по кластерам @@ -2475,3 +2511,4 @@ proc Del::inet {tree host profile_name} { + diff --git a/lib/json.tcl b/lib/json.tcl deleted file mode 100644 index 3920849..0000000 --- a/lib/json.tcl +++ /dev/null @@ -1,60 +0,0 @@ -proc tcl2json value { - # https://rosettacode.org/wiki/JSON#Tcl - # Guess the type of the value; deep *UNSUPPORTED* magic! - regexp {^value is a (.*?) with a refcount} \ - [::tcl::unsupported::representation $value] -> type - - switch $type { - string { - return [json::write string $value] - } - dict { - return [json::write object {*}[ - dict map {k v} $value {tcl2json $v}]] - } - list { - return [json::write array {*}[lmap v $value {tcl2json $v}]] - } - int - double { - return [expr {$value}] - } - booleanString { - return [expr {$value ? "true" : "false"}] - } - default { - # Some other type; do some guessing... - if {$value eq "null"} { - # Tcl has *no* null value at all; empty strings are semantically - # different and absent variables aren't values. So cheat! - return $value - } elseif {[string is integer -strict $value]} { - return [expr {$value}] - } elseif {[string is double -strict $value]} { - return [expr {$value}] - } elseif {[string is boolean -strict $value]} { - return [expr {$value ? "true" : "false"}] - } - return [json::write string $value] - } - } -} - -proc jsonget {json args} { - # https://wiki.tcl-lang.org/page/JSON - foreach key $args { - if {[dict exists $json $key]} { - set json [dict get $json $key] - } elseif {[string is integer $key]} { - if {$key >= 0 && $key < [llength $json]} { - set json [lindex $json $key] - } else { - error "can't get item number $key from {$json}" - } - } else { - error "can't get \"$key\": no such key in {$json}" - } - } - return $json -} - - diff --git a/rac_gui.cfg b/rac_gui.cfg index d7b8982..955c4aa 100644 --- a/rac_gui.cfg +++ b/rac_gui.cfg @@ -126,6 +126,3 @@ set default(auth) { set color(dark_table_bg) "#6f6f6f" set color(light_table_bg) "#424242" - - -