Allow APD data be accessed via thin client via Connection.get() (#2620)

* Fix:Connection thread safe C++ object Made now thread safe * Fix * Removed comments * Feature:allow PAD data be returned by Connection.get Implemented by retrieving serialized version and deserializing it locally
MDSplus · Sep 23, 2023 · d996b0c · d996b0c
1 parent 21ead65
commit d996b0c
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 7 deletions.
diff --git a/java/mdsobjects/src/main/java/MDSplus/Connection.java b/java/mdsobjects/src/main/java/MDSplus/Connection.java
@@ -96,13 +96,18 @@ public Data get(java.lang.String expr, Data args[]) throws MdsException
 	{
 		if (!checkArgs(args))
 			throw new MdsException(
-					"Invalid arguments: only scalars and arrays arguments can be passed to COnnection.get()");
-		return get(sockId, expr, args);
+					"Invalid arguments: only scalars and arrays arguments can be passed to Connection.get()");
+                java.lang.String expandedExpr = "serializeout(`("+expr+"))";
+                Data serData = get(sockId, expandedExpr, args);
+                return Data.deserialize(serData.getByteArray());
+
 	}
 
 	public Data get(java.lang.String expr) throws MdsException
 	{
-		return get(expr, new Data[0]);
+                java.lang.String expandedExpr = "serializeout(`("+expr+"))";
+                Data serData = get(sockId, expandedExpr, new Data[0]);
+                return Data.deserialize(serData.getByteArray());
 	}
 
 	public void put(java.lang.String path, java.lang.String expr, Data args[]) throws MdsException
@@ -145,7 +150,19 @@ public PutMany putMany()
 	{
 		return new PutManyInConnection();
 	}
-
+       public static void main(java.lang.String args[])
+        {
+            try {
+
+                MDSplus.Connection c = new MDSplus.Connection("localhost:8001");
+                c.openTree("test", -1);
+                System.out.println(c.get("anyapd"));
+            }catch(Exception exc)
+            {
+                System.out.println(exc);
+            }
+        }
+
 	////////// GetMany
 	class GetManyInConnection extends List implements GetMany
 	{
@@ -288,5 +305,7 @@ public void checkStatus(java.lang.String path) throws MdsException
 				throw new MdsException(retMsg.getString());
 		}
 	}
+
+
 
 }
diff --git a/mdsobjects/cpp/mdsipobjects.cpp b/mdsobjects/cpp/mdsipobjects.cpp
@@ -395,8 +395,12 @@ Data *Connection::get(const char *expr, Data **args, int nArgs)
   }
 
   lockLocal();
+  std::string expExpr("serializeout(`(");
+  expExpr +=expr;
+  expExpr += "))";
   status = SendArg(sockId, 0, DTYPE_CSTRING_IP, nArgs + 1,
-                   std::string(expr).size(), 0, 0, (char *)expr);
+                   expExpr.size(), 0, 0, (char *)expExpr.c_str());
+//                   std::string(expr).size(), 0, 0, (char *)expr);
   if (STATUS_NOT_OK)
   {
     unlockLocal();
@@ -519,7 +523,11 @@ Data *Connection::get(const char *expr, Data **args, int nArgs)
 
   if (mem)
     FreeMessage(mem);
-  return resData;
+
+  Data *deserData = deserialize(resData);
+  deleteData(resData);
+
+  return deserData;
 }
 
 void Connection::put(const char *inPath, char *expr, Data **args, int nArgs)

diff --git a/python/MDSplus/connection.py b/python/MDSplus/connection.py
@@ -205,12 +205,16 @@ def get(self, exp, *args, **kwargs):
             args = kwargs['arglist']
         timeout = kwargs.get('timeout', -1)
         num = len(args)+1
+
+        exp = 'serializeout(`('+exp+'))'
+
         exp = _ver.tobytes(exp)
         _exc.checkStatus(_SendArg(self.conid, 0, 14, num,
                                   len(exp), 0, 0, ctypes.c_char_p(exp)))
         for i, arg in enumerate(args):
             self._send_arg(arg, i+1, num)
-        return self._get_answer(timeout)
+        retSerialized = self._get_answer(timeout)
+        return retSerialized.deserialize()
 
 
 class Connection(object):