- Removed SCStart/EndBuffering as far as possible and fixed an issue with

the capture command in that it not put resluts into the Tcl interpreter.
  This broke scriptcontext scripts in complicated situations.
- Resolved some issues with the TAS calculation and negative scattering sense.
- Fixed a bug which did not reset the state to idle after checking
  reachability in confvirtualmot.c


SKIPPED:
	psi/autowin.c
	psi/eigera2.c
	psi/jvlprot.c
	psi/makefile_linux
	psi/sinqhttpopt.c
	psi/tasscan.c

sicsobj.c

@@ -38,7 +38,7 @@ void DefaultFree(void *data)
 }
 
 /*---------------------------------------------------------------------------*/
-static void saveSICSNode(pHdb node, char *prefix, FILE * fd)
+static void saveSICSNodeBroken(pHdb node, char *prefix, FILE * fd)
 {
   /*
     nodes with the property __save are saved
@@ -78,6 +78,38 @@ static void saveSICSNode(pHdb node, char *prefix, FILE * fd)
       }
       ReleaseHdbValue(&v);
     }
+  }
+  child = node->child;
+  while (child != NULL) {
+    snprintf(newprefix, 1024, "%s/%s", prefix, child->name);
+    saveSICSNodeBroken(child, newprefix, fd);
+    child = child->next;
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void saveSICSNode(pHdb node, char *prefix, FILE * fd)
+{
+  char newprefix[1024], val[20];
+  char path[MAX_HDB_PATH];
+  pHdb child;
+  hdbValue v;
+  pDynString data = NULL;
+  char *cmd;
+  
+  cmd = GetHdbProp(node, "creationCmd");
+  if (cmd != NULL) {
+    GetHdbPath(node, path, sizeof path);
+    fprintf(fd, cmd, prefix, path);
+    fprintf(fd, "\n");
+  }
+  if (GetHdbProperty(node, "__save", val, 20) == 1) {
+    GetHipadabaPar(node, &v, NULL);
+    data = formatValue(v, node);
+    if (data != NULL) {
+      fprintf(fd, "%s %s\n", prefix, GetCharArray(data));
+      DeleteDynString(data);
+    }
+    ReleaseHdbValue(&v);
     child = node->child;
     while (child != NULL) {
       snprintf(newprefix, 1024, "%s/%s", prefix, child->name);
@@ -96,6 +128,33 @@ int SaveSICSOBJ(void *data, char *name, FILE * fd)
   pHdb node;
   char *cmd;
   
+  if (self != NULL && self->objectNode != NULL) {
+    node = self->objectNode->child;
+    cmd = GetHdbProp(self->objectNode, "creationCmd");
+    if (cmd != NULL) {
+      GetHdbPath(self->objectNode, path, sizeof path);
+      fprintf(fd, cmd, name, path);
+      fprintf(fd, "\n");
+    }
+    while (node != NULL) {
+      snprintf(prefix, 1024, "%s %s", name, node->name);
+      saveSICSNode(node, prefix, fd);
+      node = node->next;
+    }
+  }
+  return 1;
+}
+
+
+/*---------------------------------------------------------------------------*/
+int SaveSICSOBJBroken(void *data, char *name, FILE * fd)
+{
+  pSICSOBJ self = (pSICSOBJ) data;
+  char prefix[1024];
+  char path[MAX_HDB_PATH];
+  pHdb node;
+  char *cmd;
+  
   if (self != NULL && self->objectNode != NULL) {
     /*
     node = self->objectNode->child;