X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=rest%2Fupdate.py;h=fdd95783438f2fc37bb2f77c262a1e32562d4876;hb=33710d17d14e2056a27ad77fca004929bf116bd5;hp=953e786747fe8a2ce39d39f411ddb54906e5f082;hpb=d251934bd71c678f552dc9a1d49c3f8efe102e1e;p=myslice.git

diff --git a/rest/update.py b/rest/update.py
index 953e7867..fdd95783 100644
--- a/rest/update.py
+++ b/rest/update.py
@@ -1,67 +1,58 @@
-from manifold.core.query            import Query
+from rest import ObjectRequest, error, success
 
 from django.views.generic.base      import TemplateView
 from django.shortcuts               import render_to_response
+from django.http                    import HttpResponse
 
 from unfold.loginrequired           import LoginRequiredView
-from django.http                    import HttpResponse
 
 from manifold.core.query            import Query, AnalyzedQuery
 from manifoldapi.manifoldapi        import execute_query
 
-from string import join
-import decimal
-import datetime
-import json
-
-# handles serialization of datetime in json
-DateEncoder = lambda obj: obj.strftime("%B %d, %Y %H:%M:%S") if isinstance(obj, datetime.datetime) else None
-
-# support converting decimal in json
-json.encoder.FLOAT_REPR = lambda o: format(o, '.2f')
-
-# handles decimal numbers serialization in json
-class DecimalEncoder(json.JSONEncoder):
-    def _iterencode(self, o, markers=None):
-        if isinstance(o, decimal.Decimal):
-            return (str(o) for o in [o])
-        return super(DecimalEncoder, self)._iterencode(o, markers)
+from myslice.settings import logger
 
 def dispatch(request, object_type, object_name):
     
-    object_filters = {}
-    object_params = {}
-    result = {}
+    o = ObjectRequest(request, object_type, object_name)    
     
     if request.method == 'POST':
-        req_items = request.POST.items()
+        req_items = request.POST
     elif request.method == 'GET':
-        return HttpResponse(json.dumps({'error' : 'only post request is supported'}), content_type="application/json")
+        #return error('only post request is supported')
+        req_items = request.GET
+    logger.debug(req_items)
+    for el in req_items.items():
+        
+        logger.debug("#===============> {}".format(el))
+        if el[0].startswith('filters'):
+            o.filters[el[0][8:-1]] = el[1]
+        elif el[0].startswith('params'):
+            logger.debug("#======> 0 {}".format(el[0]))
+            logger.debug("#======> 1 {}".format(req_items.getlist(el[0])))
+
+            if (el[0][-2:] == '[]') :
+                # when receiving params[key][] = 'value1' ...
+                #o.params.append({el[0][7:-3]:",".join(req_items.getlist(el[0]))})
+                o.params.append({el[0][7:-3]:req_items.getlist(el[0])})
+            else :
+                # when receiving params[key] = 'value'
+                o.params.append({el[0][7:-1]:el[1]})
+            
+            logger.debug("o.params = {}".format(o.params))
+            
+        elif el[0].startswith('fields'):
+            o.fields=req_items.getlist('fields[]')
+        elif el[0].startswith('options'):
+            o.options = req_items.getlist('options[]')
+    
+    try:
+        response = o.update()
+
+        if response :
+            return success('record updated')
+        else :
+            return error('an error has occurred')
+ 
+    except Exception, e:
+        return error("exception:"+str(e))
 
-    query = Query.update(object_type)
-    
-    if object_filters :
-        for k, f in object_filters.iteritems() :
-            query.filter_by(k, '==', f)
-    
-    # DEBUG        
-    print object_filters
-    
-    if object_params :
-        query.set(object_params.iteritems())
-    else :
-        return HttpResponse(json.dumps({'error' : 'an error has occurred'}), content_type="application/json")
-    
-    # DEBUG
-    print object_params
-    
-    #result = execute_query(request, query)
-    
-    # DEBUG
-    print result
-    
-    if result :
-        return HttpResponse(json.dumps({'error' : 'an error has occurred'}), content_type="application/json")
-    else :
-        return HttpResponse(json.dumps({'success' : 'record updated'}), content_type="application/json")
-    
\ No newline at end of file