X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldresult.py;h=4ffe072bb9dc8fba1abf70dd6a4a40775f59110b;hb=804932e8a431ddbf0d7c56457625457967b48d4c;hp=483fd914077d3f11c47384025659085317cb6d2b;hpb=6656b13932a99246b7e75af4ba2f0a137af1bfe1;p=myslice.git diff --git a/manifold/manifoldresult.py b/manifold/manifoldresult.py index 483fd914..4ffe072b 100644 --- a/manifold/manifoldresult.py +++ b/manifold/manifoldresult.py @@ -3,18 +3,22 @@ def enum(*sequential, **named): return type('Enum', (), enums) ManifoldCode = enum ( + UNKNOWN_ERROR=-1, SUCCESS=0, SESSION_EXPIRED=1, NOT_IMPLEMENTED=2, - UNKNOWN_ERROR=3, + SERVER_UNREACHABLE=3, ) +_messages_ = { -1 : "Unknown", 0: "OK", 1: "Session Expired", 2: "Not Implemented", 3: "Backend server unreachable"} + # being a dict this can be used with json.dumps class ManifoldResult (dict): def __init__ (self, code=ManifoldCode.SUCCESS, value=None, output=""): self['code']=code self['value']=value self['output']=output + self['description'] = '' # Jordan: needed by javascript code def from_json (self, json_string): d=json.dumps(json_string) @@ -36,15 +40,16 @@ class ManifoldResult (dict): def __repr__ (self): - result="[[MFresult code=%s"%self['code'] - if self['code']==0: + code=self['code'] + result="[MFresult %s (code=%s)"%(_messages_.get(code,"???"),code) + if code==0: value=self['value'] if isinstance(value,list): result += " [value=list with %d elts]"%len(value) elif isinstance(value,dict): result += " [value=dict with keys %s]"%value.keys() else: result += " [value=%s: %s]"%(type(value).__name__,value) else: result += " [output=%s]"%self['output'] - result += "]]" + result += "]" return result # probably simpler to use a single class and transport the whole result there