More common initialisation code has been moved from the instrument configuration files to server_config.tcl:server_init

server_init now handles restoring status before calling initialisation commands as well as loading extraconfig, building the HDB and catching errors.
Added dummy_motors in the motor_configuration.tcl files for automated tests.

sicshipadaba.c
Fix broken "hset /path start" by set connection object in command callback.

r2724 | ffr | 2008-10-20 11:08:31 +1100 (Mon, 20 Oct 2008) | 7 lines

site_ansto/instrument/server_config.tcl

@@ -1,7 +1,7 @@
 # SICS common configuration
 
-# $Revision: 1.43 $
-# $Date: 2008-09-24 01:37:59 $
+# $Revision: 1.44 $
+# $Date: 2008-10-20 00:08:30 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by $Author: ffr $
 # RELEASE_NUMBER: $Name: not supported by cvs2svn $
@@ -139,7 +139,7 @@ sics_release [lindex $tmpstr [expr [llength $tmpstr] - 1]]
 sics_release lock
 
 ::utility::mkVar sics_revision_num Text internal
-set tmpstr [string map {"$" ""} {$Revision: 1.43 $}]
+set tmpstr [string map {"$" ""} {$Revision: 1.44 $}]
 sics_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]]
 sics_revision_num lock
 
@@ -227,10 +227,17 @@ proc server_set_sobj_attributes {} {
 
 proc server_init {} {
   if [ catch {
+    ########
+    # Parameters set above the restore command will be clobbered by
+    # the values in the status.tcl file
+    if [file exists $::sicsroot/log/status.tcl ] {
+      restore
+    }
     ::source::isc_initialize
     ::counter::isc_initialize
     ::histogram_memory::isc_initialize
     ::scan::isc_initialize
+    ::anticollider::init
     ::commands::isc_initialize
     MakeStateMon hmscan
     sicslist setatt sics_suid privilege readonly
@@ -244,7 +251,21 @@ proc server_init {} {
 
     server_set_sobj_attributes
   } message ] {
-    if {$::errorCode=="NONE"} {return $message}
+    clientput $errorContext
+    clientput $callStack
     return -code error $message
+  } else {
+
+      if [ catch {
+        if [file exists ../extraconfig.tcl] {
+          fileeval ../extraconfig.tcl
+        }
+        buildHDB instrument_dictionary
+      } message ] {
+        clientput $errorContext
+        clientput $callStack
+        return -code error $message
+      }
+      return $message
   }
 }