Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan

[myslice.git] / manifold / manifoldresult.py

diff --git a/manifold/manifoldresult.py b/manifold/manifoldresult.py
index fcda3ad..a20c5b0 100644 (file)
--- a/manifold/manifoldresult.py
+++ b/manifold/manifoldresult.py
@@ -6,7 +6,7 @@ ManifoldCode = enum (
     SUCCESS=0,
     SESSION_EXPIRED=1,
     NOT_IMPLEMENTED=2,
-    OTHERS=3,
+    UNKNOWN_ERROR=3,
 )
 
 # being a dict this can be used with json.dumps
@@ -15,17 +15,43 @@ class ManifoldResult (dict):
         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)
         for k in ['code','value','output']:
             self[k]=d[k]
 
+    # raw accessors
+    def code (self): return self['code']
+    def output (self): return self['output']
+
     # this returns None if there's a problem, the value otherwise
     def ok_value (self):
         if self['code']==ManifoldCode.SUCCESS:
             return self['value']
 
+    # both data in a single string
     def error (self):
         return "code=%s -- %s"%(self['code'],self['output'])
     
+
+    def __repr__ (self):
+        result="[[MFresult code=%s"%self['code']
+        if self['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 += "]]"
+        return result
+
+# probably simpler to use a single class and transport the whole result there
+# instead of a clumsy set of derived classes 
+class ManifoldException (Exception):
+    def __init__ (self, manifold_result):
+        self.manifold_result=manifold_result
+    def __repr__ (self):
+        return "Manifold Exception %s"%(self.manifold_result.error())