From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 13 Mar 2013 08:55:18 +0000 (+0100)
Subject: cosmetic
X-Git-Tag: myslice-django-0.1-1~24
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=0f1e6ec6c7cbf1dd2987c633560ab1102a0d3a41

cosmetic
---

diff --git a/engine/manifoldquery.py b/engine/manifoldquery.py
index 84ffc054..dfa8b9b3 100644
--- a/engine/manifoldquery.py
+++ b/engine/manifoldquery.py
@@ -47,14 +47,12 @@ class ManifoldQuery:
         
         return """ new Query('%(a)s', '%(m)s', '%(t)s', %(f)s, %(p)s, %(c)s, %(unique)s, '%(uuid)s', %(aq)s, %(sq)s)"""%locals()
     
-    # 4amine
-    # xxx
-    # this should build an object from a dict as received from javascript
-    # to see an example just look at the server's output
+    # this builds a ManifoldQuery object from a dict as received from javascript through its ajax request 
+    # e.g. here's what I captured from the server's output
     # incoming POST <QueryDict: {u'query[method]': [u'slice'], u'query[fields][]': [u'slice_hrn'], u'query[timestamp]': [u'latest'], u'query[action]': [u'get']}>
     def fill_from_dict (self, d):
         for key in d.keys():
-           for arg in ['action', 'method', 'filters', 'fields', 'timestamp', 'params']:
+            for arg in ['action', 'method', 'filters', 'fields', 'timestamp', 'params']:
                 if arg in key:
                     # dirty hack around fields; fields must be a list
                     if arg == 'fields': 
diff --git a/engine/static/js/query.js b/engine/static/js/query.js
index 4a64bdde..183e55d1 100644
--- a/engine/static/js/query.js
+++ b/engine/static/js/query.js
@@ -96,9 +96,9 @@ INSERT INTO method VALUES(field=value)
         return {'added':added, 'removed':removed};
     } 
     this.to_hash = function() {
-        return {'action': this.action, 'method': this.method, 'timestamp': this.timestamp, 'filters': this.filters, 'params': this.params, 'fields': this.fields};
+        return {'action': this.action, 'method': this.method, 'timestamp': this.timestamp,
+		'filters': this.filters, 'params': this.params, 'fields': this.fields};
     }
-
     this.analyze_subqueries = function() {
         /* adapted from the PHP function in com_tophat/includes/query.php */
         var q = new Query();