From da5759bed69f35f4db7cde0e34b4e9772c9daf8f Mon Sep 17 00:00:00 2001
From: bergamaschi <bergamaschi@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Wed, 24 Oct 2012 08:12:42 +0000
Subject: [PATCH] changes of get detector status by Anna-with error message

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@310 951219d9-93cf-4727-9268-0efd64621fa3
---
 .../gotthardDetectorServer/server_funcs.c     | 29 ++++---------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
index 308a5ac46..ff0de35cd 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
@@ -1865,14 +1865,14 @@ int get_run_status(int file_des) {
 	
       }
 	  //and readbusy=0,idle
-	  else if(retval==0){
+      else if(!(retval&0xffff)){
 		  //if(!(retval&0x00000001)){
 		  printf("-----------------------------------IDLE--------------------------------------\n");
 		  s=IDLE;
 	  } else {
-	    printf("-----------------------------------Unknown status %04x--------------------------------------\n", retval);
+	    printf("-----------------------------------Unknown status %08x--------------------------------------\n", retval);
 	    s=ERROR;
-
+	    ret=FAIL;
 	  }
   }
   //if runbusy=1
@@ -1890,27 +1890,10 @@ int get_run_status(int file_des) {
 
 
 
-/*
-  if (retval&0x8000)
-	  s=ERROR;
-  else if (retval&0x00000001)
-	  //if (retval&0x00010000)
-	  if (retval&0x00000002)
-		  s=TRANSMITTING;
-	  else
-		  s=RUNNING;
-  else if (retval&0x00010000)
-	  s=RUN_FINISHED;
-  else if (retval&0x00000008)
-	  s=WAITING;
-  else
-	  s=IDLE;
-*/
-
-
-
   if (ret!=OK) {
-    printf("get status failed\n");
+    printf("get status failed %04x\n");
+    sprintf(mess, "get status failed %08x\n", retval);
+    
   } else if (differentClients)
     ret=FORCE_UPDATE;