linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SICS-780 Set attributes on environment control objects even if there are errors setting up other objects.

Browse Source
This commit is contained in:
Ferdi Franceschini
2014-09-18 17:01:30 +10:00
parent 0ba5045fd9
commit e31737379c
1 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
site_ansto/instrument/server_config.tcl
View File

@ -254,25 +254,20 @@ proc waitaction {obj action args} {
publish waitaction user
proc server_set_sobj_attributes {} {
if [ catch {
motor_set_sobj_attributes
::utility::set_motor_attributes
#XXX::utility::set_histomem_attributes
::utility::set_sobj_attributes
::utility::set_envcontrol_attributes
::plc::set_sobj_attributes
::counter::set_sobj_attributes
::nexus::set_sobj_attributes
::histogram_memory::set_sobj_attributes
::utility::set_chopper_attributes
::utility::set_sct_object_attributes
## TODO move the following to the new ansto gumxml.tcl
sicslist setatt getgumtreexml privilege internal
clientput "serverport $::serverport"
} message ] {
if {$::errorCode=="NONE"} {return $message}
return -code error $message
}
if [ catch { motor_set_sobj_attributes } msg ] { puts $msg }
if [ catch { ::utility::set_motor_attributes } msg ] { puts $msg }
#XXX::utility::set_histomem_attributes
if [ catch { ::utility::set_sobj_attributes } msg ] { puts $msg }
if [ catch { ::utility::set_envcontrol_attributes } msg ] { puts $msg }
if [ catch { ::plc::set_sobj_attributes } msg ] { puts $msg }
if [ catch { ::counter::set_sobj_attributes } msg ] { puts $msg }
if [ catch { ::nexus::set_sobj_attributes } msg ] { puts $msg }
if [ catch { ::histogram_memory::set_sobj_attributes } msg ] { puts $msg }
if [ catch { ::utility::set_chopper_attributes } msg ] { puts $msg }
if [ catch { ::utility::set_sct_object_attributes } msg ] { puts $msg }
## TODO move the following to the new ansto gumxml.tcl
if [ catch { sicslist setatt getgumtreexml privilege internal } msg ] { puts $msg }
clientput "serverport $::serverport"
}
proc server_init {} {