rest parameters can be sent also with a get

[myslice.git] / rest / __init__.py

diff --git a/rest/__init__.py b/rest/__init__.py
index 3b6c48d..636f1e5 100644 (file)
--- a/rest/__init__.py
+++ b/rest/__init__.py
@@ -13,7 +13,6 @@ from string import join
 import decimal
 import datetime
 import json
-import urlparse
 
 # handles serialization of datetime in json
 DateEncoder = lambda obj: obj.strftime("%B %d, %Y %H:%M:%S") if isinstance(obj, datetime.datetime) else None
@@ -37,15 +36,20 @@ def dispatch(request, object_type, object_name):
          'platform' : platform,
          'slice' : slice,
          'resource' : resource,
-         'user' : user
+         'user' : user,
     }
     
     if request.method == 'POST':
-        for el in request.POST.items():
-            if el[0].startswith('filters'):
-                object_filters[el[0][8:-1]] = el[1]
-            elif el[0].startswith('columns'):
-                object_properties = request.POST.getlist('columns[]')
+        req_items = request.POST.items()
+    elif request.method == 'GET':
+        req_items = request.GET.items()
+        
+    for el in req_items:
+        if el[0].startswith('filters'):
+            object_filters[el[0][8:-1]] = el[1]
+        elif el[0].startswith('columns'):
+            object_properties = request.POST.getlist('columns[]')
+        
     
     # platform is local
     if ((object_type == 'platform') or (object_type == 'testbed')) :
@@ -73,6 +77,7 @@ def platform(request, object_name, object_properties, object_filters = None):
     query.select(object_properties)
     return send(request, execute_query(request, query), object_properties)
 
+# Add different filters possibilities [['user.user_hrn','==','$user_hrn'],['parent_authority','==','ple.upmc']]
 def slice(request, object_name, object_properties, object_filters = None):
     query = Query().get('slice').filter_by('user.user_hrn', '==', '$user_hrn')
     if object_filters :
@@ -90,7 +95,9 @@ def resource(request, object_name, object_properties, object_filters = None):
     return send(request, execute_query(request, query), object_properties)
 
 def user(request, object_name, object_properties, object_filters = None):
-    query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn')
+#    query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select(object_properties)
+    query = Query().get('user').filter_by('parent_authority', '==', 'ple.upmc').select(object_properties)
+    #query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn')
     if object_filters :
         for k, f in object_filters.iteritems() :
             query.filter_by(k, '==', f)
@@ -107,7 +114,6 @@ def send(request, response, object_properties):
         response_data = {}
         response_data['columns'] = object_properties
         response_data['labels'] = object_properties
-        #response_data['labels'] = [ 'Platform', 'Name', 'Url', 'Description','Gateway Type' ]
         response_data['data'] = []
         response_data['total'] = len(response)
         for r in response :
@@ -122,22 +128,3 @@ def send(request, response, object_properties):
 
 def error(request, object_name, object_properties):
     return HttpResponse(json.dumps({'error' : 'an error has occurred'}), content_type="application/json")
-
-def getDictArray(post, name):
-    dic = {}
-    for k in post.keys():
-        if k.startswith(name):
-            rest = k[len(name):]
-
-            # split the string into different components
-            parts = [p[:-1] for p in rest.split('[')][1:]
-            print parts
-            id = int(parts[0])
-
-            # add a new dictionary if it doesn't exist yet
-            if id not in dic:
-                dic[id] = {}
-
-            # add the information to the dictionary
-            dic[id][parts[1]] = post.get(k)
-    return dic
\ No newline at end of file