Добавлен костыль для работы с ИБ

Если для доступа к ИБ используется infobase-user и infobase-pwd то в конфиге rac_gui.cfg надо раскоентировать
строки (либо добавить их)
set default(infobase_user) "пользователь ИБ"
set default(infobase_pwd) "пароль ИБ"
master
Sergey Kalinin 2019-08-07 11:26:05 +03:00
parent c09b583448
commit 0e2b7ba4e3
3 changed files with 20 additions and 3 deletions

View File

@ -90,7 +90,7 @@ proc RunCommand {par} {
agent_user agent_pwd cluster_user cluster_pwd server_platform agent_user agent_pwd cluster_user cluster_pwd server_platform
set host [lindex [split $par " "] end] set host [lindex [split $par " "] end]
set work_list_row_count 0 set work_list_row_count 0
#puts "$rac_cmd $par" puts "$rac_cmd $par"
set pipe [open "|\"$rac_cmd\" $par" "r"] set pipe [open "|\"$rac_cmd\" $par" "r"]
try { try {
set lst "" set lst ""
@ -428,14 +428,21 @@ proc Run::infobases {tree host values} {
} }
proc Run::infobase {tree host values} { proc Run::infobase {tree host values} {
global active_cluster cluster_user cluster_pwd global active_cluster cluster_user cluster_pwd default
if {$cluster_user ne "" && $cluster_pwd ne ""} { if {$cluster_user ne "" && $cluster_pwd ne ""} {
set auth "--cluster-user=$cluster_user --cluster-pwd=$cluster_pwd" set auth "--cluster-user=$cluster_user --cluster-pwd=$cluster_pwd"
} else { } else {
set auth "" set auth ""
} }
#### Временный костыль ####
if {[info exists default(infobase_user)] == 1 && [info exists default(infobase_pwd)] == 1} {
set ib_auth "--infobase-user=$default(infobase_user) --infobase-pwd=$default(infobase_pwd)"
} else {
set ib_auth ""
}
###########################
.frm_work.tree_work delete [ .frm_work.tree_work children {}] .frm_work.tree_work delete [ .frm_work.tree_work children {}]
set lst [RunCommand "infobase info --cluster=$active_cluster $auth --infobase=$values $host"] set lst [RunCommand "infobase info --cluster=$active_cluster $auth --infobase=$values $ib_auth $host"]
foreach l $lst { foreach l $lst {
InsertItemsWorkList $l InsertItemsWorkList $l
@ -2425,3 +2432,4 @@ proc Del::inet {tree host profile_name} {

View File

@ -113,6 +113,13 @@ set default(auth) {
pwd pwd
os os
} }
## Раскоментировать строки и прописать свои значения если
## для Информационных Баз используются эти параметры
#set default(infobase_user) "ib_user"
#set default(infobase_pwd) "ib_password"
# цвета строк в таблице # цвета строк в таблице
#set color(dark_table_bg) "#e2e2e2" #set color(dark_table_bg) "#e2e2e2"
#set color(light_table_bg) "#ffffff" #set color(light_table_bg) "#ffffff"
@ -120,3 +127,4 @@ set color(dark_table_bg) "#6f6f6f"
set color(light_table_bg) "#424242" set color(light_table_bg) "#424242"

View File

@ -51,6 +51,7 @@ if {[file exists $rac_cmd] == 0} {
puts $file $line puts $file $line
} }
} }
#puts $rac_cmd
close $file close $file
close $orig_file close $orig_file
#return "$host:$port" #return "$host:$port"