Skip to content

Provide APD access over thin client #2737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
GabrieleManduchi wants to merge 1 commit into from
Closed

Provide APD access over thin client #2737

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 27 additions & 5 deletions python/MDSplus/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,16 +201,25 @@ def _send_arg(self, value, idx, num):
info['address']))

def get(self, exp, *args, **kwargs):
if 'serialized' in kwargs:
serialized = kwargs['serialized']
else:
serialized = True
if 'arglist' in kwargs:
args = kwargs['arglist']
timeout = kwargs.get('timeout', -1)
num = len(args)+1
if serialized:
exp = 'serializeout(`(data('+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)
if not serialized or isinstance(retSerialized, _sca.Scalar):
return retSerialized
return retSerialized.deserialize()


class Connection(object):
Expand Down Expand Up @@ -286,7 +295,7 @@ def openTree(self, tree, shot):
@type shot: int
@rtype: None
"""
_exc.checkStatus(self.get("TreeOpen($,$)", tree, shot))
_exc.checkStatus(self.get("TreeOpen($,$)", tree, shot,serialized=False))

def put(self, node, exp, *args):
"""Put data into a node in an MDSplus tree
Expand All @@ -298,9 +307,22 @@ def put(self, node, exp, *args):
@type args: Data
@rtype: None
"""
pexp = 'TreePut($,$%s)' % (',$'*len(args),)
pargs = [node, exp] + list(args)
_exc.checkStatus(self.get(pexp, arglist=pargs))
#Check is any passed argument is APD
anyApd = False
for arg in args:
if isinstance(arg, Apd):
anyApd = True

if anyApd:
pexp = 'TreePutDeserialized($,$%s)' % (',$'*len(args),)
pargs = [node, exp] + list(args)
for i in range(2, len(pargs)):
pargs[i] = _arr.Uint8Array(pargs[i].serialize())
else:
pexp = 'TreePut($,$%s)' % (',$'*len(args),)
pargs = [node, exp] + list(args)

_exc.checkStatus(self.get(pexp, arglist=pargs, serialized = False))

def putMany(self, value=None):
"""Return an instance of a connection.PutMany class. See the connection.PutMany documentation for further information."""
Expand Down