From 49d96d60d820e6d9b8434fa070470e39d5c08422 Mon Sep 17 00:00:00 2001 From: Ciro Scognamiglio Date: Mon, 3 Mar 2014 15:29:42 +0100 Subject: [PATCH] Generic ObjectRequest class can be used for the rest interface --- manifoldapi/__init__.pyc | Bin 137 -> 0 bytes manifoldapi/manifoldapi.pyc | Bin 6526 -> 0 bytes manifoldapi/manifoldproxy.pyc | Bin 2938 -> 0 bytes manifoldapi/manifoldresult.pyc | Bin 3502 -> 0 bytes manifoldapi/metadata.pyc | Bin 2472 -> 0 bytes myslice/urls.py | 7 +- portal/static/js/myslice-ui.js | 2 +- .../static/js/onelab_slice-resource-view.js | 3 + .../onelab/onelab_slice-resource-view.html | 4 + rest/__init__.py | 142 ++++++++++-------- rest/delete.py | 87 +---------- rest/get.py | 80 +++------- rest/platform.py | 42 ------ rest/templates/table-default.html | 6 +- rest/update.py | 84 +---------- rest/urls.py | 8 - ui/templates/layout-unfold1.html | 4 +- 17 files changed, 129 insertions(+), 340 deletions(-) delete mode 100644 manifoldapi/__init__.pyc delete mode 100644 manifoldapi/manifoldapi.pyc delete mode 100644 manifoldapi/manifoldproxy.pyc delete mode 100644 manifoldapi/manifoldresult.pyc delete mode 100644 manifoldapi/metadata.pyc create mode 100644 portal/static/js/onelab_slice-resource-view.js delete mode 100644 rest/platform.py delete mode 100644 rest/urls.py diff --git a/manifoldapi/__init__.pyc b/manifoldapi/__init__.pyc deleted file mode 100644 index a3ccdebfcfc8ef2f23cf786cc669abeb34c983ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 137 zcmZSn%*%B|f-g9k0SXuy7#JKF7#NCK7#J8*7#M;zKq7t`AZawB*oc9FLBA+JzeK+% zwIIJ(Kew_tCo?%!Hzg}EFFjvBH!&|WEk7qEu^>}FK0Y%qvm`!Vub{GogMop;CO1E& NG$+*#WOy;iY5-r89RdIV diff --git a/manifoldapi/manifoldapi.pyc b/manifoldapi/manifoldapi.pyc deleted file mode 100644 index 4286a73ebe6ba6cdf9c6e7790f23a1d3f76cf719..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6526 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 Q3u;kSrVoEwK3SgnFOb?d3;+NC diff --git a/manifoldapi/manifoldproxy.pyc b/manifoldapi/manifoldproxy.pyc deleted file mode 100644 index 7c8be6c6fbefdf9399c34164ce0d56e2e9755467..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2938 zcmb_eTW=f375-*<5lK;^WJ|JS$IT{4VnV1WASl#8h?Ay?EfsBKch%g8q{Mn>NDZ|& z&kQ4}AfJ@i{FuD=G0*)KLHN!v;Ll#sw;&t=Y>^PSsPep+dLzrA`Iq5OFO z{sh4O8-N6)Kn(O3?*e^~`5xj5k}CRDBsKJF5Tso}Tt~8m{!&3#5jT)D(Qg)X4RH&} zGWyE}T}RwTvV#6fK`$X*MbbgPQ_u~>Ye?47Ux!dP(7y?KZa_Bi4bb0&Y+)qO--29* zY~ve&{w;F)w7UX8KYRA<*-4jza%}*|&gFr!d6rt`Hh;!=n3*S9N|km6>DK`KeWJ`& zK`sLbl%2%x(=eW>=gg18R1dRQe(?A&1#=x(Fdtk-Dt9_7ZB_vMEgKbjDp z5(uG8$Xhs?mheoMFka`VZqQX^ssXu;X#?kVm>917KXUhLts|!E0Hj8xVl=LsO zJM;IGvV!+>lU-iz`z>aZ{!^-dKM$={(w|tJj{L`uPXFPm0O-ZO4PbtpPxr!HANrG2 zUFIsHD-z|-GU>l*{k=V3U23P((Fq$E+bp$z_=N#B^OA{SW|GjoY{I_w{|*}UbfT>5 zv41T9aTbN~;lwKA>Hs36LZ|HNLXyX!qbs;ON6NVd0E+n{Gt!ZT4<_#HV~&GmpIBwm zFi{KHsWUnqv1|?oM;K1rnWn+YRFp}@Q{`(KAod}EKVR+9MTG02FV&ODXrPkZUHNbM z_eRRyn+M|``bN2lNl7#GhvB*M3&mL5!r??G%3bBkt^o-1Jl0W2gJ+*%{yl*E_wT>w z&;2WsRbp*bD#^0T{3l^_u2RY4PAVH2&Ew0`P}|-09|w;<|H6L|1djrLcbCU&_bvrU z$QG&Q5IL5BfDCx}652x@$Ah8Ck^$Ec2}jB?hmj;AjL7F;iA=uoLWT#SOmsS+Bn}p- zAuX${)md8ly8w{=DU7i{adx3h&?K`o*X1P1Z9tg`sFc~#Ff$jSk^Jtmfz**>x3tx% zbzvG6$#auDR-8|Uo+i3g&XMV%$^NBivjoJQ8#;4I%;Lo^V9J>=QiL{BxzVW`sLQBJ z!=I0qbK$igIhy5dfeUoKw->5vZ`^lA!b)@#>I7~;`V#0*EUc8qTc*O}} zf(prgL`G{J(H7NOTQo&gRJ=MmqUo(w-w?{10H)tYtYBkyvo8{7fncD%$dcJfO?g`r{?_L#Ob&fXQO}yjw7_oQtL(h zDW&*Rsu&=2`e7Jb72G1%DR}`EYH&yoLgP8GzrKuVp1qr7auTceD9x6DXp44rtFk5* Of3IGvH=6G^#eV?^OTSY9 diff --git a/manifoldapi/manifoldresult.pyc b/manifoldapi/manifoldresult.pyc deleted file mode 100644 index 6960dc773644177520eeb6866c0f2fa1b5221cf0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3502 zcmcImU2_vv7=Cs)Nt+ZX6e!d$*3mdYExmE7ViBRlu>(z+T`F3pvlDVo%cjY0*mDBZ zNw3OFxO^sTVfZr#;2Qwu z7XS))3G4tGP!5y}*|gRbr#ygo&$A`8jgVE!4|`gK*b42?Py0HtakC@rNwce!oOIIfnp`?nm@fdVWNB(wGTlqfO83xo;+9@k z?Pju{u5_D8yq9)VvloxgnKu27z1BMvy%gwB677WZp<_=2*lyfyY&~p5^&r>^;**n; z6FUPS++JU=hha=sJ5NGA3^%qKQT>Pe8$ta}Oi6Ol*m@9cY~H_D->f$t)bGSDFBasD z;QM+IZ8w7Yt@ZD2-M&|k85j}2og5_T^Td*Q>#h+6+L$;^{Q8StoM|PrMr!?yZm*-e zITKccoou<|fNDDp5%;POx=DtV|7#5~L)2y11!#%Q&uieEarPL-bmgwsIO ztPNZ_xmX(r;*^IqRS;ScYYGT!#AuGNR;sk1;aRiO*OnJ)-}d@8V1z9TPHEH1;+~Du zBu5K%OTvxr>;>lm1Q+;V8B7aLvjCzfPGTEH=jbB|a4Pa?F{`5}NCdvhgVS~xhhr(L z7u88u*!OT}_X3VQ*4V(q(g6Ik_VfxKNlL z96ffCJ!UPd5OslhcM z>S|+}``SdZE9`44)$iyi3RwM8xZ+YH zO>{s>0UO4oI0B#lvibrln>Zn-H(HPa4zaWJfICFVxmYTf%1+rU7t009yU|)vf6>x1 zYsZ@fGa;J=mlF+c7Q@xoWgFmv;Bi4<)yZV!VLTDo3-a9{l9f4>*42=wtXHGGF3Qs< zVq{7L*ItRio4L2ax*tkaV@y7x3t0p&=c1qT!-jxLg zYZJ3`)DsQCCwvHorVf>50AErm3$f&s-A0WYbHG&~NAd?e$pmHCWJef>MP8pKbfpN_ X@>2SmN)1=Ta-rmmK4tH!w|Mn$(nHGX diff --git a/manifoldapi/metadata.pyc b/manifoldapi/metadata.pyc deleted file mode 100644 index a6906818e931e991b6d4404e214bf05dd0fa9548..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2472 zcmb_d-EJF27(M%ACr;DEEu;_x(pE^wTqKb|ibPda1X|i&)SyizR7qG2PlET4get}$M!>iTWeZgsgLd;Aqg+9?ioq%Z)4^a3x&^%g-Nsws z4e(-cgR39*Rsj^}=jZ4BUI4&v0C=Xx#n6^IHEvq^X8y*N`GcRHHk16gGR~=yaq{rY zc=b?ub;*cpen&w7MI z2f#eQ9LRtIGLTIU1!KR*XdeSmQ-3V{j+Hykj%JxXIx)Fl1~^j=Q%3ff54pLo0PNM) z`n}prtlO(*t}Jr1qfgX$WcR8Isnn#{tBhA#d9^#4i5OW{j0>M-l+Zxi(Pyp3UqUqih5llwC%EhhZ1w*{c@TjZ*aO5^CK+?La7ygOEv zaoy$ftEnoBVPWd4L4GzdZgUw_xJ=cxnz`G{Ic;2C7ZYFDv7_i0>uWPq)6#oZ*Gn_= zYkZ|9>Zm9SKa=T^@t*clxqQ41ptQLv?==>YcUOkP!j#&HsdB4LL6-}VXOEsAJUn=Q zkoE_pC24@(W|3?=K8=WE=qO_E{pTQanDvgp6}?v0FZHpDNlMa?;mDSVIWLYXLV4I#})uo^DmhkrZJMO#AftE5aY%0@-KQnHiQxR_^;V%{aVIb3&hJN9*PlyVu7 m{0CJ!liuZC#IqFtI@Cnk`;C|n2tg>W2kT)s=!V^}9sLWDMiIII diff --git a/myslice/urls.py b/myslice/urls.py index cc8b2592..0a811d97 100644 --- a/myslice/urls.py +++ b/myslice/urls.py @@ -25,7 +25,6 @@ import portal.sliceview import portal.sliceresourceview from portal.sliceuserview import SliceUserView - #### high level choices # main entry point (set to the / URL) # beware that if this view is broken you end up in an endless cycle... @@ -63,9 +62,9 @@ urls = [ # # # RESTful interface - (r'^rest/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.dispatch'), - (r'^table/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.dispatch'), - (r'^datatable/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.dispatch'), + (r'^rest/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.get.dispatch'), + (r'^table/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.get.dispatch'), + (r'^datatable/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.get.dispatch'), (r'^update/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.update.dispatch'), (r'^create/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.create.dispatch'), (r'^delete/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.delete.dispatch'), diff --git a/portal/static/js/myslice-ui.js b/portal/static/js/myslice-ui.js index 04199868..1195969d 100644 --- a/portal/static/js/myslice-ui.js +++ b/portal/static/js/myslice-ui.js @@ -35,7 +35,7 @@ $(document).ready(function() { }); //{'columns' : ['hostname','country','type'], 'filters' : { 'country' : 'France' } } - oTable.load("/table/resource/", {'columns' : ['hostname','country','type'] }, function(data) { + oTable.load("/table/resource/", {'fields' : ['hostname','hrn','country','type'], 'options': ['checkbox'] }, function(data) { $(this).dataTable( { "sScrollY": window.innerHeight - 275, "sDom": "frtiS", diff --git a/portal/static/js/onelab_slice-resource-view.js b/portal/static/js/onelab_slice-resource-view.js new file mode 100644 index 00000000..9ec5df13 --- /dev/null +++ b/portal/static/js/onelab_slice-resource-view.js @@ -0,0 +1,3 @@ +$(document).ready(function() { + +}); \ No newline at end of file diff --git a/portal/templates/onelab/onelab_slice-resource-view.html b/portal/templates/onelab/onelab_slice-resource-view.html index 5432be77..a2971d18 100644 --- a/portal/templates/onelab/onelab_slice-resource-view.html +++ b/portal/templates/onelab/onelab_slice-resource-view.html @@ -1,5 +1,9 @@ {% extends "layout_wide.html" %} +{% block head %} + +{% endblock %} + {% block content %}
diff --git a/rest/__init__.py b/rest/__init__.py index 854c9e8c..c21c5ec9 100644 --- a/rest/__init__.py +++ b/rest/__init__.py @@ -1,15 +1,8 @@ from manifold.core.query import Query +from manifoldapi.manifoldapi import execute_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 -from manifoldapi.manifoldapi import execute_query - -from string import join import decimal import datetime @@ -27,54 +20,67 @@ class DecimalEncoder(json.JSONEncoder): if isinstance(o, decimal.Decimal): return (str(o) for o in [o]) return super(DecimalEncoder, self)._iterencode(o, markers) - -class objectRequest(object): + +class ObjectRequest(object): def __init__(self, request, object_type, object_name): self.type = object_type self.name = object_name - self.properties = [] + self.fields = [] 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) + self.request = request + 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.fields = ['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 : - for r in results[0]['column'] : - self.properties.append(r['name']) - else : - return error('db error') - return None + self.setKey() + + self.setLocalFields() + - 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 setKey(self): + print self.type + # What about key formed of multiple fields??? + query = Query.get('local:object').filter_by('table', '==', self.type).select('key') + results = execute_query(self.request, query) + print "key of object = %s" % results + if results : + for r in results[0]['key'] : + self.id = r + else : + raise Exception, 'Manifold db error' + + def setLocalFields(self): + query = Query.get('local:object').filter_by('table', '==', self.type).select('column.name') + results = execute_query(self.request, query) + if results : + for r in results[0]['column'] : + self.fields.append(r['name']) + else : + raise Exception, 'Manifold db error' - def setId(self): - if self.id in self.properties : - self.properties.remove(self.id) - [self.id].extend(self.properties) + def setFields(self, fields): + selected_fields = [] + for p in fields : + if p in self.fields : + selected_fields.append(p) + self.fields = selected_fields + + # + if self.id in self.fields : + self.fields.remove(self.id) + [self.id].extend(self.fields) - def execute(self): - query = Query.get(self.type).select(self.properties) + def applyFilters(self, query, force_filters = False): + if (force_filters and not self.filters) : + raise Exception, "Filters required" if self.filters : for k, f in self.filters.iteritems() : if (f[:1] == "!") : @@ -89,41 +95,44 @@ class objectRequest(object): query.filter_by(k, '<', f[1:]) else : query.filter_by(k, '==', f) + return query + + def get(self): + query = Query.get(self.type).select(self.fields) + query = self.applyFilters(query) return execute_query(self.request, query) - -def dispatch(request, object_type, object_name): - o = objectRequest(request, object_type, object_name) + def update(self): + query = Query.update(self.type) + query = self.applyFilters(query, True) + if self.params : + query.set(self.params) + else: + raise Exception, "Params are required for update" + return execute_query(self.request, query) - if request.method == 'POST': - req_items = request.POST - elif request.method == 'GET': - 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('columns'): - o.addFilters(req_items.getlist('columns[]')) - elif el[0].startswith('options'): - o.options = req_items.getlist('options[]') - - response = o.execute() + def delete(self): + query = Query.delete(self.type) + query = self.applyFilters(query, True) + if self.params : + query.set(self.params) + else: + raise Exception, "Params are required for update" + return execute_query(self.request, query) - if request.path.split('/')[1] == 'rest' : - response_data = 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' : o.properties, 'id' : o.id, 'options' : o.options}) - elif request.path.split('/')[1] == 'datatable' : + def json(self): + return HttpResponse(json.dumps(self.get(), cls=DecimalEncoder, default=DateEncoder), content_type="application/json") + + def datatable(self): + response = self.get() response_data = {} - response_data['columns'] = o.properties - response_data['labels'] = o.properties + response_data['fields'] = self.fields + response_data['labels'] = self.fields response_data['data'] = [] response_data['total'] = len(response) for r in response : d = [] - for p in o.properties : + for p in self.fields : d.append(r[p]) response_data['data'].append(d) @@ -131,3 +140,6 @@ def dispatch(request, object_type, object_name): def error(msg): return HttpResponse(json.dumps({'error' : msg}), content_type="application/json") + +def success(msg): + return HttpResponse(json.dumps({'success' : msg}), content_type="application/json") diff --git a/rest/delete.py b/rest/delete.py index f6800b08..41a39e4d 100644 --- a/rest/delete.py +++ b/rest/delete.py @@ -1,86 +1,9 @@ -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 - -# 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) - -class objectRequest(object): - - def __init__(self, request, object_type, object_name): - self.type = object_type - self.name = object_name - # No params in delete - self.properties = [] - self.filters = {} - self.options = None - - self.request = request - - # What about key formed of multiple fields??? - query = Query.get('local:object').filter_by('table', '==', self.type).select('key') - results = execute_query(self.request, query) - print "key of object = %s" % results - if results : - for r in results[0]['key'] : - self.id = r - else : - return error('Manifold db error') - - query = Query.get('local:object').filter_by('table', '==', self.type).select('column.name') - results = execute_query(self.request, query) - if results : - for r in results[0]['column'] : - self.properties.append(r['name']) - else : - return error('Manifold db error') - def setId(self): - if self.id in self.properties : - self.properties.remove(self.id) - [self.id].extend(self.properties) +from rest import ObjectRequest, error, success - def execute(self): - query = Query.delete(self.type) - 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) - else: - raise Exception, "Filters are required for delete" - return execute_query(self.request, query) def dispatch(request, object_type, object_name): @@ -93,7 +16,7 @@ def dispatch(request, object_type, object_name): if request.method == 'POST': 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 for el in req_items.items(): @@ -106,10 +29,10 @@ def dispatch(request, object_type, object_name): response = o.execute() if response : - return HttpResponse(json.dumps({'success' : 'record deleted'}), content_type="application/json") + return success('record deleted') else : - return HttpResponse(json.dumps({'error' : 'an error has occurred'}), content_type="application/json") + return error('an error has occurred') except Exception, e: - return HttpResponse(json.dumps({'error' : str(e)}), content_type="application/json") + return error(str(e)) diff --git a/rest/get.py b/rest/get.py index d5866483..02c651b5 100644 --- a/rest/get.py +++ b/rest/get.py @@ -1,63 +1,31 @@ -from manifold.core.query import Query, AnalyzedQuery - -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 rest import ObjectRequest, error -import json +from string import join -def platform(request, platform_name): - - platform_query = Query().get('local:platform').filter_by('disabled', '==', '0').select('platform', 'platform_longname', 'platform_url', 'platform_description','gateway_type') - response = execute_query(request,platform_query) +def dispatch(request, object_type, object_name): - response_data = {} - response_data['columns'] = [ 'platform', 'platform_longname', 'platform_url', 'platform_description','gateway_type' ] - response_data['labels'] = [ 'Platform', 'Name', 'Url', 'Description','Gateway Type' ] - response_data['data'] = [] - for r in response : - response_data['data'].append([ r['platform'], r['platform_longname'], r['platform_url'], r['platform_description'], r['gateway_type'] ]) - - return HttpResponse(json.dumps(response_data), content_type="application/json") - -def slice(request, slice_name): + o = ObjectRequest(request, object_type, object_name) - platform_query = Query().get('local:platform').filter_by('disabled', '==', '0').select('platform', 'platform_longname', 'platform_url', 'platform_description','gateway_type') - response = execute_query(request,platform_query) - - - - response_data = {} - response_data['columns'] = [ 'platform', 'platform_longname', 'platform_url', 'platform_description','gateway_type' ] - response_data['labels'] = [ 'Platform', 'Name', 'Url', 'Description','Gateway Type' ] - response_data['data'] = [] - for r in response : - response_data['data'].append([ r['platform'], r['platform_longname'], r['platform_url'], r['platform_description'], r['gateway_type'] ]) - - return HttpResponse(json.dumps(response_data), content_type="application/json") - -# slicename = 'ple.upmc.myslicedemo' -# main_query = Query.get('slice').filter_by('slice_hrn', '=', slicename) -# main_query.select( -# 'slice_hrn', -# 'resource.hrn', 'resource.urn', -# 'resource.hostname', 'resource.type', -# 'resource.network_hrn', -# 'lease.urn', -# 'user.user_hrn', -# #'application.measurement_point.counter' -# ) -# -# res = execute_query(self.request,main_query) -# -# print res -# -# return render(request, self.template_name, {"resources": res[0]['resource']}) - - -# def get (self, request, name='default'): -# return HttpResponse() + if request.method == 'POST': + req_items = request.POST + elif request.method == 'GET': + 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('fields'): + o.setFields(req_items.getlist('fields[]')) + elif el[0].startswith('options'): + o.options = req_items.getlist('options[]') + + if request.path.split('/')[1] == 'rest' : + return o.json() + elif request.path.split('/')[1] == 'table' : + return render_to_response('table-default.html', {'data' : o.get(), 'fields' : o.fields, 'id' : o.id, 'options' : o.options}) + elif request.path.split('/')[1] == 'datatable' : + return o.datatable() diff --git a/rest/platform.py b/rest/platform.py deleted file mode 100644 index bdb6e069..00000000 --- a/rest/platform.py +++ /dev/null @@ -1,42 +0,0 @@ -from manifold.core.query import Query, AnalyzedQuery - -from django.views.generic.base import TemplateView - -from unfold.loginrequired import LoginRequiredView -from django.http import HttpResponse - -from manifold.core.query import Query, AnalyzedQuery -from manifoldapi.manifoldapi import execute_query - -import json - - -def dispatch(request, platform_name): - return get(request, platform_name) - -def get(request, platform_name): - - platform_query = Query().get('local:platform').filter_by('disabled', '==', '0').select('platform', 'platform_longname', 'platform_url', 'platform_description','gateway_type') - response = execute_query(request,platform_query) - - q = Query.get('slice').select('slice_hrn') - result = execute_query(request,q) - print result -# # -# query = Query.get('local:object').select('table') -# results = execute_query(request, query) -# print results -# - query = Query.get('local:object').filter_by('table', '==', 'slice').select('column.name') - results = execute_query(request, query) - print results - - response_data = {} - response_data['columns'] = [ 'platform', 'platform_longname', 'platform_url', 'platform_description','gateway_type' ] - response_data['labels'] = [ 'Platform', 'Name', 'Url', 'Description','Gateway Type' ] - response_data['data'] = [] - #response_data['resources'] = { 'total' : len(r) } - for r in response : - response_data['data'].append([ r['platform'], r['platform_longname'], r['platform_url'], r['platform_description'], r['gateway_type'] ]) - - return HttpResponse(json.dumps(response_data), content_type="application/json") diff --git a/rest/templates/table-default.html b/rest/templates/table-default.html index da7ba0c2..d8397ce1 100644 --- a/rest/templates/table-default.html +++ b/rest/templates/table-default.html @@ -1,15 +1,15 @@ {% load rest_filters %} - {% if "checkbox" in options %}checkbox{% endif %} - {% for p in properties %}{{ p }}{% endfor %} + {% if "checkbox" in options %}{% endif %} + {% for f in fields %}{{ f }}{% endfor %} {% for d in data %} {% if "checkbox" in options %}{% endif %} - {% for p in properties %}
{{ d|key:p }}
{% endfor %} + {% for f in fields %}
{{ d|key:f }}
{% endfor %} {% endfor %} \ No newline at end of file diff --git a/rest/update.py b/rest/update.py index 6cdf7826..7b277593 100644 --- a/rest/update.py +++ b/rest/update.py @@ -1,5 +1,3 @@ -from manifold.core.query import Query - from django.views.generic.base import TemplateView from django.shortcuts import render_to_response @@ -9,80 +7,12 @@ 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) - -class objectRequest(object): +from rest import ObjectRequest, error, success - def __init__(self, request, object_type, object_name): - self.type = object_type - self.name = object_name - # params required in update - self.params = [] - self.properties = [] - self.filters = {} - self.options = None - - self.request = request - - # What about key formed of multiple fields??? - query = Query.get('local:object').filter_by('table', '==', self.type).select('key') - results = execute_query(self.request, query) - print "key of object = %s" % results - if results : - for r in results[0]['key'] : - self.id = r - else : - return error('Manifold db error') - - query = Query.get('local:object').filter_by('table', '==', self.type).select('column.name') - results = execute_query(self.request, query) - if results : - for r in results[0]['column'] : - self.properties.append(r['name']) - else : - return error('Manifold db error') +from string import join - def execute(self): - query = Query.update(self.type) - 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) - else: - raise Exception, "Filters are required for update" - if self.params : - query.set(self.params) - else: - raise Exception, "Params are required for update" - +import json - return execute_query(self.request, query) def dispatch(request, object_type, object_name): @@ -95,7 +25,7 @@ def dispatch(request, object_type, object_name): if request.method == 'POST': 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 for el in req_items.items(): @@ -112,10 +42,10 @@ def dispatch(request, object_type, object_name): response = o.execute() if response : - return HttpResponse(json.dumps({'success' : 'record updated'}), content_type="application/json") + return success('record updated') else : - return HttpResponse(json.dumps({'error' : 'an error has occurred'}), content_type="application/json") + return error('an error has occurred') except Exception, e: - return HttpResponse(json.dumps({'error' : str(e)}), content_type="application/json") + return error(str(e)) diff --git a/rest/urls.py b/rest/urls.py deleted file mode 100644 index 55d364d2..00000000 --- a/rest/urls.py +++ /dev/null @@ -1,8 +0,0 @@ - -from django.conf.urls import patterns, include, url -from django.conf import settings - - -urlpatterns = patterns('', - url(r'^rest/get/slice/(?P[^/]+)/?$', 'rest.get.slice') -) diff --git a/ui/templates/layout-unfold1.html b/ui/templates/layout-unfold1.html index 7d3ee2e6..01e22fb7 100644 --- a/ui/templates/layout-unfold1.html +++ b/ui/templates/layout-unfold1.html @@ -1,9 +1,9 @@ {% extends "base.html" %} {% block base_content %} -
+
{% block unfold_main %} "The main content area (define block 'unfold_main')" {% endblock unfold_main %} -
+
{% endblock %} -- 2.47.0