From 1c4d6f398a2c4eb27ad62ece3d1611c7ca0f0960 Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Wed, 5 May 2010 18:07:15 +1000 Subject: [PATCH] Added path info to the script context "Not read yet" error messages Also added extra info to sct_positmotor table lookup error message. r2908 | ffr | 2010-05-05 18:07:15 +1000 (Wed, 05 May 2010) | 3 lines --- scriptcontext.c | 5 ++++- .../instrument/config/motors/sct_positmotor_common.tcl | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scriptcontext.c b/scriptcontext.c index 349698c6..59d62f1f 100644 --- a/scriptcontext.c +++ b/scriptcontext.c @@ -555,12 +555,15 @@ int SctAddPollNode(SctController *controller, Hdb *node, double interval, DevPrio prio, char *action) { SctData *data; hdbCallback *cb; + char nodePath[512], info[1024]; if (! FindHdbCallbackData(node, controller)) { cb = MakeHipadabaCallback(SctMainCallback, controller, NULL); assert(cb); AppendHipadabaCallback(node, cb); - SetHdbProperty(node,"geterror","Not read yet"); + GetHdbPath(node, nodePath, sizeof nodePath); + snprintf(info, 1023, "%s: Not read yet", nodePath); + SetHdbProperty(node,"geterror",info); } data = calloc(1, sizeof(*data)); diff --git a/site_ansto/instrument/config/motors/sct_positmotor_common.tcl b/site_ansto/instrument/config/motors/sct_positmotor_common.tcl index e89bff29..3c81b0fe 100644 --- a/site_ansto/instrument/config/motors/sct_positmotor_common.tcl +++ b/site_ansto/instrument/config/motors/sct_positmotor_common.tcl @@ -106,7 +106,7 @@ proc ::scobj::positmotor::mot2ID {mot precision table} { set iprev $i set mprev $m } - return -code error "lookup failed" + return -code error "positmotor [sct] table lookup failed for position $mot. Table range = $firstMot to $lastMot" } namespace import ::scobj::positmotor::*