X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=rest%2F__init__.py;h=854c9e8ce58e1632671df37b74a5b3ed88ab9b2a;hb=d251934bd71c678f552dc9a1d49c3f8efe102e1e;hp=1ce245badc9b8d78bbee8bf406653d5bf07fac88;hpb=f851cee76ceb16a8ff26913e0d4d20101b5cd79a;p=myslice.git

diff --git a/rest/__init__.py b/rest/__init__.py
index 1ce245ba..854c9e8c 100644
--- a/rest/__init__.py
+++ b/rest/__init__.py
@@ -6,10 +6,11 @@ from django.shortcuts               import render_to_response
 from unfold.loginrequired           import LoginRequiredView
 from django.http                    import HttpResponse
 
-from manifold.core.query            import Query, AnalyzedQuery
+from manifold.core.query            import Query
 from manifoldapi.manifoldapi        import execute_query
 
-from string import join
+from string                         import join
+
 import decimal
 import datetime
 import json
@@ -38,6 +39,9 @@ class objectRequest(object):
         
         self.request = request
 
+    # XXX TODO: What about the local: objects? 
+    # Example: local:user (Manifold) is different from user (SFA GW)   
+
         if ((self.type == 'platform') or (self.type == 'testbed')) :
             self.type = 'local:platform'
             self.id = 'platform'
@@ -95,9 +99,7 @@ def dispatch(request, object_type, object_name):
         req_items = request.POST
     elif request.method == 'GET':
         req_items = request.GET
-    
-    print req_items
-    
+
     for el in req_items.items():
         if el[0].startswith('filters'):
             o.filters[el[0][8:-1]] = el[1]
@@ -110,12 +112,8 @@ def dispatch(request, object_type, object_name):
     
     if request.path.split('/')[1] == 'rest' :
         response_data = response
-        print response
         return HttpResponse(json.dumps(response_data, cls=DecimalEncoder, default=DateEncoder), content_type="application/json")
     elif request.path.split('/')[1] == 'table' :
-        print o.properties
-        print o.options
-        print response
         return render_to_response('table-default.html', {'data' : response, 'properties' : o.properties, 'id' : o.id, 'options' : o.options})
     elif request.path.split('/')[1] == 'datatable' :
         response_data = {}
@@ -127,8 +125,6 @@ def dispatch(request, object_type, object_name):
             d = []
             for p in o.properties :
                 d.append(r[p])
-            #print d
-            
             response_data['data'].append(d)
          
         return HttpResponse(json.dumps(response_data, cls=DecimalEncoder, default=DateEncoder), content_type="application/json")