X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fjs%2Fmanifold-query.js;h=77925c4e6dd8d0f508f6d27a5f6ff374d9ee9a45;hb=4c7212bd04ddb65511c42aac5bae6fc3044cd846;hp=c6ebaabf03959a1dc8840ff7d9315846a7cadd67;hpb=307d273defd24a236655885222f3d3f0561d48b7;p=myslice.git diff --git a/manifold/js/manifold-query.js b/manifold/js/manifold-query.js index c6ebaabf..77925c4e 100644 --- a/manifold/js/manifold-query.js +++ b/manifold/js/manifold-query.js @@ -99,19 +99,22 @@ INSERT INTO object VALUES(field=value) return {'added':added, 'removed':removed}; } + // Callaback received 3 parameters: query, data, parent_query this.iter_subqueries = function(callback, data) { - rec = function(query, callback, data) { + rec = function(query, callback, data, parent_query) { jQuery.each(query.subqueries, function(object, subquery) { - rec(subquery, callback); + rec(subquery, callback, data, query); }); - callback(query, data); + callback(query, data, parent_query); }; + if (this.analyzed_query !== undefined) query = this.analyzed_query; else - query = this - rec(query, callback, data); + query = this; + + rec(query, callback, data, null); } // we send queries as a json string now