From ba21cef1926fc54ca47f75826ab1e4ebc93283c7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jordan=20Aug=C3=A9?= Date: Thu, 10 Jul 2014 15:13:09 +0200 Subject: [PATCH] fixed record_hashcode --- manifoldapi/static/js/manifold.js | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/manifoldapi/static/js/manifold.js b/manifoldapi/static/js/manifold.js index e261efeb..203c44d3 100644 --- a/manifoldapi/static/js/manifold.js +++ b/manifoldapi/static/js/manifold.js @@ -1018,16 +1018,25 @@ var manifold = { if (query_ext.set_query_ext) { // We have a domain query // The results are stored in the corresponding set_query - manifold.query_store.set_records(query_ext.set_query_ext.query.query_uuid, records) + if (query.object == 'lease') { + // temp fix for leases_all + manifold.query_store.set_records(query_ext.set_query_ext.query.query_uuid, records, STATE_SET_IN); + } else { + manifold.query_store.set_records(query_ext.set_query_ext.query.query_uuid, records); + } } else if (query_ext.domain_query_ext) { // We have a set query, it is only used to determine which objects are in the set, we should only retrieve the key // Has it a domain query, and has it completed ? - $.each(records, function(i, record) { - var key = manifold.metadata.get_key(query.object); - var record_key = manifold.record_get_value(record, key); - manifold.query_store.set_record_state(query.query_uuid, record_key, STATE_SET, STATE_SET_IN); - }); + if (query.object == 'lease') { + $.noop(); // slice leases should be included in the results from the domain query lease_all + } else { + $.each(records, function(i, record) { + var key = manifold.metadata.get_key(query.object); + var record_key = manifold.record_get_value(record, key); + manifold.query_store.set_record_state(query.query_uuid, record_key, STATE_SET, STATE_SET_IN); + }); + } } else { // We have a normal query @@ -1154,8 +1163,8 @@ var manifold = { { // To make an object a record, we just add the hash function var key = manifold.metadata.get_key(object); - record.hashCode = manifold.record_hashcode(record, key.sort()); - record.equals = manifold.record_equals(record, key); + record.hashCode = manifold.record_hashcode(key.sort()); + record.equals = manifold.record_equals(key); // Looking after subrecords for (var field in record) { -- 2.47.0