use bootstrap-3.0.0 - I haven't seen any obvious regression at first sight

[myslice.git] / manifold / js / manifold-query.js

diff --git a/manifold/js/manifold-query.js b/manifold/js/manifold-query.js
index 77925c4..4da77da 100644 (file)
--- a/manifold/js/manifold-query.js
+++ b/manifold/js/manifold-query.js
@@ -42,9 +42,31 @@ INSERT INTO object VALUES(field=value)
     }  
 
     this.clone = function() {
-        q = new ManifoldQuery();
-        return jQuery.extend(true, q, this);
+        // 
+        var q = new ManifoldQuery();
+        q.action     = this.action;
+        q.object     = this.object;
+        q.timestamp  = this.timestamp;
+        q.filters    = this.filters.slice();
+        q.fields     = this.fields.slice();
+        q.query_uuid = this.query_uuid;
+
+        if (this.analyzed_query)
+            q.analyzed_query = this.analyzed_query.clone();
+        else
+            q.analyzed_query = null;
+
+        if (this.subqueries) {
+            q.subqueries = {}
+            for (method in this.subqueries)
+                q.subqueries[method] = this.subqueries[method].clone();
+        }
+
+        // deep extend not working for custom objects
+        // $.extend(true, q, this);
+        return q;
     }
+
     this.add_filter = function(key, op, value) {
         this.filters.push(new Array(key, op, value));
     }
@@ -103,10 +125,10 @@ INSERT INTO object VALUES(field=value)
     this.iter_subqueries = function(callback, data)
     {
         rec = function(query, callback, data, parent_query) {
+            callback(query, data, parent_query);
             jQuery.each(query.subqueries, function(object, subquery) {
                 rec(subquery, callback, data, query);
             });
-            callback(query, data, parent_query);
         };
 
         if (this.analyzed_query !== undefined)
@@ -117,6 +139,16 @@ INSERT INTO object VALUES(field=value)
         rec(query, callback, data, null);
     }
 
+    this.select = function(field)
+    {
+        this.fields.push(field);
+    }
+
+    this.unselect = function(field)
+    {   
+        this.fields = $.grep(this.fields, function(x) { return x != field; });
+    }
+
 // we send queries as a json string now 
 //    this.as_POST = function() {
 //        return {'action': this.action, 'object': this.object, 'timestamp': this.timestamp,