Revert "Allow APD data be accessed via thin client via Connection.get…

…() (MDSplus#2620)" This reverts commit d996b0c.
WhoBrokeTheBuild · Feb 23, 2024 · 2f1ea31 · 2f1ea31
1 parent c4ca59b
commit 2f1ea31
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 33 deletions.
diff --git a/java/mdsobjects/src/main/java/MDSplus/Connection.java b/java/mdsobjects/src/main/java/MDSplus/Connection.java
@@ -96,18 +96,13 @@ 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()");
-                java.lang.String expandedExpr = "serializeout(`("+expr+"))";
-                Data serData = get(sockId, expandedExpr, args);
-                return Data.deserialize(serData.getByteArray());
-
+					"Invalid arguments: only scalars and arrays arguments can be passed to COnnection.get()");
+		return get(sockId, expr, args);
 	}
 
 	public Data get(java.lang.String expr) throws MdsException
 	{
-                java.lang.String expandedExpr = "serializeout(`("+expr+"))";
-                Data serData = get(sockId, expandedExpr, new Data[0]);
-                return Data.deserialize(serData.getByteArray());
+		return get(expr, new Data[0]);
 	}
 
 	public void put(java.lang.String path, java.lang.String expr, Data args[]) throws MdsException
@@ -150,19 +145,7 @@ 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
 	{
@@ -305,7 +288,5 @@ 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,12 +395,8 @@ 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,
-                   expExpr.size(), 0, 0, (char *)expExpr.c_str());
-//                   std::string(expr).size(), 0, 0, (char *)expr);
+                   std::string(expr).size(), 0, 0, (char *)expr);
   if (STATUS_NOT_OK)
   {
     unlockLocal();
@@ -523,11 +519,7 @@ Data *Connection::get(const char *expr, Data **args, int nArgs)
 
   if (mem)
     FreeMessage(mem);
-
-  Data *deserData = deserialize(resData);
-  deleteData(resData);
-
-  return deserData;
+  return resData;
 }
 
 void Connection::put(const char *inPath, char *expr, Data **args, int nArgs)