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

Conflicts:
	rest/__init__.py

diff --cc rest/__init__.py
index 761e8dc,1ce245b..0f02ccb
--- 1/rest/__init__.py
--- 2/rest/__init__.py
+++ b/rest/__init__.py
@@@ -27,101 -27,100 +27,103 @@@ class DecimalEncoder(json.JSONEncoder)
              return (str(o) for o in [o])
          return super(DecimalEncoder, self)._iterencode(o, markers)
  
- def dispatch(request, object_type, object_name):
-     
-     object_properties = None
-     object_filters = {}
+ class objectRequest(object):
      
-     switch = {
-          'platform' : platform,
-          'slice' : slice,
-          'resource' : resource,
-          'user' : user,
-          'authority' : authority,
-     }
-     
-     if request.method == 'POST':
-         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[]')
+     def __init__(self, request, object_type, object_name):
+         self.type = object_type
+         self.name = object_name
+         self.properties = []
+         self.filters = {}
+         self.options = None
+         
+         self.request = request
+ 
 +    # XXX TODO: What about the local: objects? 
 +    # Example: local:user (Manifold) is different from user (SFA GW)   
-     # platform is local
-     if ((object_type == 'platform') or (object_type == 'testbed')) :
-         object_type = 'local:platform'
-         if object_properties == None :
-             object_properties = ['platform', 'platform_longname', 'platform_url', 'platform_description','gateway_type'];
-         return switch.get('platform', error)(request, object_name, object_properties, object_filters)
-     else :
-         if object_properties == None :
-             query = Query.get('local:object').filter_by('table', '==', object_type).select('column.name')
-             results = execute_query(request, query)
 +
+         if ((self.type == 'platform') or (self.type == 'testbed')) :
+             self.type = 'local:platform'
+             self.id = 'platform'
+             self.properties = ['platform', 'platform_longname', 'platform_url', 'platform_description','gateway_type'];
+             self.filters['disabled'] = '0'
+             self.filters['gateway_type'] = 'sfa'
+             self.filters['platform'] = '!myslice'
+         else :
+             self.id = 'hrn'
+             query = Query.get('local:object').filter_by('table', '==', self.type).select('column.name')
+             results = execute_query(self.request, query)
              if results :
-                 object_properties = []
                  for r in results[0]['column'] :
-                     object_properties.append(r['name'])
+                     self.properties.append(r['name'])
              else :
-                 return error(request, object_name, {})
-         return switch.get(object_type, error)(request, object_name, object_properties, object_filters)
- 
- def platform(request, object_name, object_properties, object_filters = None):
-     query  = Query().get('local:platform').filter_by('disabled', '==', '0').filter_by('gateway_type', '==', 'sfa').filter_by('platform', '!=', 'myslice')
-     if object_filters :
-         for k, f in object_filters.iteritems() :
-             query.filter_by(k, '==', f)
-     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 :
-         for k, f in object_filters.iteritems() :
-             query.filter_by(k, '==', f)
-     query.select(object_properties)
-     return send(request, execute_query(request, query), object_properties)
- 
- def resource(request, object_name, object_properties, object_filters = None):
-     query = Query().get('resource')
-     if object_filters :
-         for k, f in object_filters.iteritems() :
-             query.filter_by(k, '==', f)
-     query.select(object_properties)
-     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')
-     if object_filters :
-         for k, f in object_filters.iteritems() :
-             query.filter_by(k, '==', f)
-     query.select(object_properties)
-     return send(request, execute_query(request, query), object_properties)
+                 return error('db error')
+         return None
+     
+     def addFilters(self, properties):
+         selected_properties = []
+         for p in properties :
+             if p in self.properties :
+                 selected_properties.append(p)
+         self.properties = selected_properties
+         self.setId()
+     
+     def setId(self):
+         if self.id in self.properties :
+             self.properties.remove(self.id)
+             [self.id].extend(self.properties)
+     
+     def execute(self):
+         query = Query.get(self.type).select(self.properties)
+         if self.filters :
+             for k, f in self.filters.iteritems() :
+                 if (f[:1] == "!") :
+                     query.filter_by(k, '!=', f[1:])
+                 elif (f[:2] == ">=") :
+                     query.filter_by(k, '>=', f[2:])
+                 elif (f[:1] == ">") :
+                     query.filter_by(k, '>', f[1:])
+                 elif (f[:2] == "<=") :
+                     query.filter_by(k, '<=', f[2:])
+                 elif (f[:1] == "<") :
+                     query.filter_by(k, '<', f[1:])
+                 else :
+                     query.filter_by(k, '==', f)
+         return execute_query(self.request, query)
  
- def authority(request, object_name, object_properties, object_filters = None):
-     query = Query().get('authority')#.filter_by('user_hrn', '==', '$user_hrn')
-     if object_filters :
-         for k, f in object_filters.iteritems() :
-             query.filter_by(k, '==', f)
-     query.select(object_properties)
-     return send(request, execute_query(request, query), object_properties)
+ def dispatch(request, object_type, object_name):
+     
+     o = objectRequest(request, object_type, object_name)
+     
+     if request.method == 'POST':
+         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]
+         elif el[0].startswith('columns'):
+             o.addFilters(req_items.getlist('columns[]'))
+         elif el[0].startswith('options'):
+             o.options = req_items.getlist('options[]')
  
- def send(request, response, object_properties):
+     response = o.execute()
+     
      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' :
-         return render_to_response('table-default.html', {'data' : response, 'properties' : object_properties})
+         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 = {}
-         response_data['columns'] = object_properties
-         response_data['labels'] = object_properties
+         response_data['columns'] = o.properties
+         response_data['labels'] = o.properties
          response_data['data'] = []
          response_data['total'] = len(response)
          for r in response :