X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fjs%2Fmanifold-query.js;h=4e146ada1d657f516da8dc0dcd5b9feaf8a2e93c;hb=928d9b692b74f7ebc2a6abaae24c00d9b2618acf;hp=710f5d94fb01e862513ba025c35b6bff9280752d;hpb=17622dc433eee384bcddbe1001f478e7e3267d8a;p=unfold.git

diff --git a/manifold/js/manifold-query.js b/manifold/js/manifold-query.js
index 710f5d94..4e146ada 100644
--- a/manifold/js/manifold-query.js
+++ b/manifold/js/manifold-query.js
@@ -1,32 +1,22 @@
-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;
-    
-    // slice, user, network... : Metadata
+    // slice, user, network... 
     var method; 
-    
     // timestamp, now, latest(cache) : date of the results queried    
     var timestamp;
-    
     // key(field),op(=<>),value
     var filters;
-
     // todo
     var params;
-    
-    // hostname, ip,... : Metadata
+    // hostname, ip,... 
     var fields;
-    
     // 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;
-    
     // {} : Assoc Table of sub-queries ["resources"->subQ1, "users"->subQ2]
     var subqueries;
 
@@ -102,7 +92,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 +164,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;
 }