Support for time in double format

Benjamin Renard
1 parent 03d0ceed
Showing 3 changed files with 30 additions and 3 deletions Show diff stats
src/DDClientLibC/DD_client.c
src/DDClientLibC/INCLUDE/DD_comm.h
src/DDClientLibCpp/DD_client.cc
@@ -536,10 +536,20 @@ int DD_SetTimeInfo(int VarID, char *Time, double *RealTime)
     if (err < 1) return err;
  
     err = DD_GetData(VarID, "Time", TimeInt, &data);
+
     if (err < 0) return err;
+
     if (data->VarNumber < 1) return OUTOFTIME;
  
-    *RealTime = DD_Time2Double((char *)data->Variables[0]);
+    if (data->type == DD_CHAR) {
+        *RealTime = DD_Time2Double((char *)data->Variables[0]);
+    }
+    else if (data->type == DD_DOUBLE) {
+        *RealTime = *((double*)data->Variables[0]);
+    }
+    else {
+        return DATAFILEERR;
+    }
  
     //BRE - When the corresponding time is the last one of a file, MOREDATA is returned by DDServer.
     // => force recall of DD_GetData to open the next file and finish correctly the request
@@ -302,6 +302,15 @@ extern int Cache_ReleaseDataFileAccess(DD_Var_t *D);
 extern int Cache_CloseFile(DD_Var_t *D);
  
 /*
+ *
+ */
+extern int Time_GetVarID(int ncID);
+
+extern int Time_IsDoubleVar(int ncID, int timeVarID);
+
+extern double Time_GetValueFromVar(int ncID, int timeVarID, int isDoubleTime, int recNum);
+
+/*
  * Open Virtual instrument by name and returns the ID
  * Returns negative value in case of error (see DD.h)or OK
  */
@@ -244,7 +244,7 @@ int DD_Client::GetSocket()
 #ifdef LOG4CXX
 	   LOG4CXX_ERROR(_logger, "DD_Client::GetSocket - Connection to server socket error - " << strerror (errnum));
 #endif
-	   perror("connect");
+	   perror(strerror (errnum));
 	   return(-1);
    }
  
@@ -672,7 +672,15 @@ int DD_Client:: DD_SetTimeInfo(int VarID, char *Time, double *RealTime)
     	return OUTOFTIME;
     }
  
-    *RealTime = DD_Time2Double((char *)data->Variables[0]);
+    if (data->type == DD_CHAR) {
+        *RealTime = DD_Time2Double((char *)data->Variables[0]);
+    }
+    else if (data->type == DD_DOUBLE) {
+        *RealTime = *((double*)data->Variables[0]);
+    }
+    else {
+        return DATAFILEERR; 
+    }
  
     //BRE - When the corresponding time is the last one of a file, MOREDATA is returned by DDServer.
     // => force recall of DD_GetData to open the next file and finish correctly the request