X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=rest%2Fdelete.py;h=2548338d455f5bff3335ac379b3b82def57529f2;hb=740a2bea5a69b3702a77c1e559456c13aa491829;hp=0ce5f38710d0230a21f44ebf0d1313fa8672e168;hpb=ed05804919d39c41003f2eac34d90e345cbf6aa6;p=myslice.git

diff --git a/rest/delete.py b/rest/delete.py
index 0ce5f387..2548338d 100644
--- a/rest/delete.py
+++ b/rest/delete.py
@@ -1,69 +1,34 @@
-from manifold.core.query            import Query
-
-from django.views.generic.base      import TemplateView
-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 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
+from rest import ObjectRequest, error, success
 
-# 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)
 
 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")
-
-    query = Query.delete(object_type)
-    
-    if object_filters :
-        for k, f in object_filters.iteritems() :
-            query.filter_by(k, '==', f)
-    else:
-        return HttpResponse(json.dumps({'error' : 'Filters are required for delete'}), content_type="application/json")
-    # DEBUG        
-    print object_filters
+        #return error('only post request is supported')
+        req_items = request.GET
+
+    for el in req_items.items():
+        if el[0].startswith('filters'):
+            o.filters[el[0][8:-1]] = el[1]
+        elif el[0].startswith('options'):
+            o.options = req_items.getlist('options[]')
+
+    try:
+        response = o.delete()
+
+        if response :
+            return success('record deleted')
+        else :
+            return error('an error has occurred')
+ 
+    except Exception, e:
+        return error(str(e))
 
-# No params in delete    
-#    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")
-