X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fjs%2Fmanifold-query.js;h=09ba089f97b59976f79ccbdcb729384b8153abf0;hb=d2ab222245b6311d81f9465cde3f48761c077168;hp=710f5d94fb01e862513ba025c35b6bff9280752d;hpb=c187f0b7d99eea1275cd6d322b37e6212447ace9;p=myslice.git

diff --git a/manifold/js/manifold-query.js b/manifold/js/manifold-query.js
index 710f5d94..09ba089f 100644
--- a/manifold/js/manifold-query.js
+++ b/manifold/js/manifold-query.js
@@ -1,5 +1,5 @@
-function ManifoldQuery(action, method, timestamp, filters, params, fields, unique, uuid, aq, sq)
-{  
+function ManifoldQuery(action, method, timestamp, filters, params, fields, unique, query_uuid, aq, sq) {  
+
     // get, update, delete, create
     var action;
     
@@ -21,8 +21,8 @@ function ManifoldQuery(action, method, timestamp, filters, params, fields, uniqu
     // 0,1 : list of element of an object or single object  
     var unique;
     
-    // uuid : unique identifier of a query
-    var uuid;
+    // query_uuid : unique identifier of a query
+    var query_uuid;
     
     // Query : root query (no sub-Query)
     var analyzed_query;
@@ -102,7 +102,7 @@ INSERT INTO method VALUES(field=value)
     this.analyze_subqueries = function() {
         /* adapted from the PHP function in com_tophat/includes/query.php */
         var q = new ManifoldQuery();
-        q.uuid = this.uuid;
+        q.query_uuid = this.query_uuid;
         q.action = this.action;
         q.method = this.method;
         q.timestamp = this.timestamp;
@@ -174,7 +174,7 @@ INSERT INTO method VALUES(field=value)
     this.params = params;
     this.fields = fields;
     this.unique = unique;
-    this.uuid = uuid;
+    this.query_uuid = query_uuid;
     this.analyzed_query = aq;
     this.subqueries = sq;
 }