\r
_scope_set_leases: function()\r
{\r
+ var status;\r
var self = this;\r
var scope = this._get_scope();\r
\r
manifold.query_store.iter_records(this.options.query_lease_uuid, function(lease_key, lease) {\r
-\r
console.log("SET LEASES", lease.resource, new Date(lease.start_time* 1000), new Date(lease.end_time* 1000));\r
// XXX We should ensure leases are correctly merged, otherwise our algorithm won't work\r
\r
// Populate leases by resource array: this will help us merging leases later\r
+\r
+ // let's only put _our_ leases\r
+ lease_status = manifold.query_store.get_record_state(self.options.query_lease_uuid, lease_key, STATE_SET);\r
+ if (lease_status != STATE_SET_IN)\r
+ return true; // ~continue\r
if (!(lease.resource in scope._leases_by_resource))\r
scope._leases_by_resource[lease.resource] = [];\r
scope._leases_by_resource[lease.resource].push(lease);\r
lease_success = '';\r
break;\r
case STATE_SET_OUT_SUCCESS:\r
- lease_class = 'reserved'; // other leases\r
+ lease_class = 'free'; // other leases\r
lease_success = 'success';\r
break;\r
case STATE_SET_IN_FAILURE:\r
- lease_class = 'reserved'; // other leases\r
+ lease_class = 'free'; // other leases\r
lease_success = 'failure';\r
break;\r
case STATE_SET_IN_PENDING:\r