From: Jordan Augé <jordan.auge@lip6.fr>
Date: Mon, 7 Jul 2014 08:49:24 +0000 (+0200)
Subject: updated gmaps plugin
X-Git-Tag: myslice-1.1~59
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=aa4d616f76726d8ace17518a11dd603856674d85;p=unfold.git

updated gmaps plugin
---

diff --git a/plugins/googlemap/static/js/googlemap.js b/plugins/googlemap/static/js/googlemap.js
index 8a740b2a..0ecf1134 100644
--- a/plugins/googlemap/static/js/googlemap.js
+++ b/plugins/googlemap/static/js/googlemap.js
@@ -8,6 +8,10 @@
  * - infowindow is not properly reopened when the maps does not have the focus
  */
 
+GOOGLEMAP_BGCOLOR_RESET   = 0;
+GOOGLEMAP_BGCOLOR_ADDED   = 1;
+GOOGLEMAP_BGCOLOR_REMOVED = 2;
+
 (function($){
 
     // events that happen in the once-per-view range
@@ -21,27 +25,30 @@
 
     var GoogleMap = Plugin.extend({
 
-        init: function(options, element) {
-	    this.classname="googlemap";
+        /**************************************************************************
+         *                          CONSTRUCTOR
+         **************************************************************************/
+
+        init: function(options, element) 
+        {
             this._super(options, element);
 
             /* Member variables */
-            // query status
-            this.received_all = false;
-            this.received_set = false;
-            this.in_set_backlog = [];
-
-            // we keep a couple of global hashes
-	    // lat_lon --> { marker, <ul> }
-	    // id --> { <li>, <input> }
-	    this.by_lat_lon = {};
-	    // locating checkboxes by DOM selectors might be abstruse, as we cannot safely assume 
-	    // all the items will belong under the toplevel <div>
-	    this.by_id = {};
-	    this.by_init_id = {};
+
+            /* we keep a couple of global hashes
+             * lat_lon --> { marker, <ul> }
+             * id --> { <li>, <input> }
+             */
+            this.by_lat_lon = {};
+            /* locating checkboxes by DOM selectors might be abstruse, as we cannot safely assume 
+             * all the items will belong under the toplevel <div>
+             */
+            this.by_id = {};
+            this.by_init_id = {};
+
+            this.markers = Array();
 
             /* Events */
-	    // xx somehow non of these triggers at all for now
             this.elmt().on('show', this, this.on_show);
             this.elmt().on('shown.bs.tab', this, this.on_show);
             this.elmt().on('resize', this, this.on_resize);
@@ -49,53 +56,48 @@
             var query = manifold.query_store.find_analyzed_query(this.options.query_uuid);
             this.object = query.object;
 
-	    // see querytable.js for an explanation
-	    var keys = manifold.metadata.get_key(this.object);
-	    this.canonical_key = (keys && keys.length == 1) ? keys[0] : undefined;
-	    // 
-	    this.init_key = this.options.init_key;
-	    // have init_key default to canonical_key
-	    this.init_key = this.init_key || this.canonical_key;
-	    // sanity check
-	    if ( ! this.init_key ) messages.warning ("QueryTable : cannot find init_key");
-	    if ( ! this.canonical_key ) messages.warning ("QueryTable : cannot find canonical_key");
-	    if (debug) messages.debug("googlemap: canonical_key="+this.canonical_key+" init_key="+this.init_key);
-
-            //// Setup query and record handlers 
-	    // this query is the one about the slice itself 
-	    // event related to this query will trigger callbacks like on_new_record
+            /* see querytable.js for an explanation */
+            var keys = manifold.metadata.get_key(this.object);
+            this.canonical_key = (keys && keys.length == 1) ? keys[0] : undefined;
+            this.init_key = this.options.init_key;
+            this.init_key = this.init_key || this.canonical_key;
+
+            /* sanity check */
+            if ( ! this.init_key ) 
+                messages.warning ("QueryTable : cannot find init_key");
+            if ( ! this.canonical_key )
+                messages.warning ("QueryTable : cannot find canonical_key");
+            if (debug)
+                messages.debug("googlemap: canonical_key="+this.canonical_key+" init_key="+this.init_key);
+
             this.listen_query(options.query_uuid);
-	    // this one is the complete list of resources
-	    // and will be bound to callbacks like on_all_new_record
-            this.listen_query(options.query_all_uuid, 'all');
 
             /* GUI setup and event binding */
             this.initialize_map();
+
         }, // init
 
-        /* PLUGIN EVENTS */
+        /**************************************************************************
+         *                         PLUGIN EVENTS
+         **************************************************************************/
 
         on_show: function(e) {
 	        if (debug) messages.debug("googlemap.on_show");
             var googlemap = e.data;
             google.maps.event.trigger(googlemap.map, 'resize');
         }, 
-	// dummy to see if this triggers at all
-        on_resize: function(e) {
-	    if (debug) messages.debug("googlemap.on_resize ...");
-        }, 
-
-        /* GUI EVENTS */
 
-        /* GUI MANIPULATION */
+        /**************************************************************************
+         *                        GUI MANIPULATION
+         **************************************************************************/
 
-        initialize_map: function() {
+        initialize_map: function() 
+        {
             this.markerCluster = null;
             //create empty LatLngBounds object in order to automatically center the map on the displayed objects
             this.bounds = new google.maps.LatLngBounds();
             var center = new google.maps.LatLng(this.options.latitude, this.options.longitude);
 
-            console.log("GoogleMap zoom = "+this.options.zoom);
             var myOptions = {
                 zoom: this.options.zoom,
                 center: center,
@@ -103,182 +105,195 @@
                 mapTypeId: google.maps.MapTypeId.ROADMAP,
             }
 	    
-            var domid = this.options.plugin_uuid + '--' + 'googlemap';
-	    var elmt = document.getElementById(domid);
+            var domid = this.id('googlemap');
+	        var elmt = document.getElementById(domid);
             this.map = new google.maps.Map(elmt, myOptions);
             this.infowindow = new google.maps.InfoWindow();
+
         }, // initialize_map
 
-	// return { marker: gmap_marker, ul : <ul DOM> }
-	create_marker_struct: function (object,lat,lon) {
-	    // the DOM fragment
-	    var dom = $("<p>").addClass("geo").append(object+"(s)");
-	    var ul = $("<ul>").addClass("geo");
-	    dom.append(ul);
-	    // add a gmap marker to the mix
-	    var marker = new google.maps.Marker({
-		position: new google.maps.LatLng(lat, lon),
+        // return { marker: gmap_marker, ul : <ul DOM> }
+        create_marker_struct: function(object, lat, lon) 
+        {
+            /* the DOM fragment */
+            var dom = $("<p>").addClass("geo").append(object+"(s)");
+            var ul = $("<ul>").addClass("geo");
+            dom.append(ul);
+            /* add a gmap marker to the mix */
+            var marker = new google.maps.Marker({
+                position: new google.maps.LatLng(lat, lon),
                 title: object,
-		// gmap can deal with a DOM element but not a jquery object
+                /* gmap can deal with a DOM element but not a jquery object */
                 content: dom.get(0),
-        }); 
-        //extend the bounds to include each marker's position
-        this.bounds.extend(marker.position);
-	    return {marker:marker, ul:ul};
-	},
-
-	// given an input <ul> element, this method inserts a <li> with embedded checkbox 
-	// for displaying/selecting the resource corresponding to the input record
-	// returns the created <input> element for further checkbox manipulation
-	create_record_checkbox: function (record,ul,checked) {
-	    var checkbox = $("<input>", {type:'checkbox', checked:checked, class:'geo'});
-	    var id=record[this.canonical_key];
-	    var init_id=record[this.init_key];
-	    // xxx use init_key to find out label - or should we explicitly accept an incoming label_key ?
-	    var label=init_id;
-	    ul.append($("<li>").addClass("geo").append(checkbox).
-		      append($("<span>").addClass("geo").append(label)));
-	    // hash by id and by init_id 
-	    this.by_id[id]=checkbox;
+                keys = Array(),
+            }); 
+            //extend the bounds to include each marker's position
+            this.bounds.extend(marker.position);
+            return { marker: marker, ul: ul };
+        },
+
+        /* given an input <ul> element, this method inserts a <li> with embedded checkbox 
+         * for displaying/selecting the resource corresponding to the input record
+         * returns the created <input> element for further checkbox manipulation
+         */
+        create_record_checkbox: function (record, ul, checked)
+        {
+            var key, key_value;
+
+            var checkbox = $("<input>", {type:'checkbox', checked:checked, class:'geo'});
+            var id = record[this.canonical_key];
+            var init_id = record[this.init_key];
+
+            // xxx use init_key to find out label - or should we explicitly accept an incoming label_key ?
+            var label = init_id;
+
+            key = this.canonical_key;
+            key_value = manifold.record_get_value(record, key);
+
+            ul.append($("<li>").addClass("geo")
+              .append($('<div>') // .addId(this.id_from_key(key, key_value))
+                .append(checkbox)
+                .append($("<span>").addClass("geo")
+                  .append(label)
+                )
+              )
+            );
+
+            // XXX STATE / BACKGROUND
+
+            // hash by id and by init_id 
+            this.by_id[id]=checkbox;
             this.by_init_id[init_id] = checkbox;
-	    //
-	    // the callback for when a user clicks
-	    // NOTE: this will *not* be called for changes done by program
-	    var self=this;
-	    checkbox.change( function (e) {
-		manifold.raise_event (self.options.query_uuid, this.checked ? SET_ADD : SET_REMOVED, id);
-	    });
-	    return checkbox;
-	},
-	    
-	warning: function (record,message) {
-	    try {messages.warning (message+" -- "+this.key+"="+record[this.key]); }
-	    catch (err) {messages.warning (message); }
-	},
-	    
-	// retrieve DOM checkbox and make sure it is checked/unchecked
-	set_checkbox_from_record: function(record, checked) {
-	    var init_id=record[this.init_key];
-	    var checkbox = this.by_init_id [ init_id ];
-	    if (checkbox) checkbox.prop('checked',checked);
-	    else this.warning(record, "googlemap.set_checkbox_from_record - not found "+init_id);
-	}, 
-
-	set_checkbox_from_data: function(id, checked) {
-	    var checkbox = this.by_id [ id ];
-	    if (checkbox) checkbox.prop('checked',checked);
-	    else messages.warning("googlemap.set_checkbox_from_data - id not found "+id);
-	}, 
-
-	// this record is *in* the slice
-        new_record: function(record) {
-	    if (debug_deep) messages.debug ("googlemap.new_record");
-            if (!(record['latitude'])) return false;
-	    
-            // get the coordinates
-            var latitude=unfold.get_value(record['latitude']);
-            var longitude=unfold.get_value(record['longitude']);
+
+            /* the callback for when a user clicks
+             * NOTE: this will *not* be called for changes done by program
+             */
+            var self=this;
+            checkbox.change( function (e) {
+                manifold.raise_event (self.options.query_uuid, this.checked ? SET_ADD : SET_REMOVED, id);
+            });
+            return checkbox;
+        },
+            
+        set_checkbox_from_record_key: function (record_key, checked) 
+        {
+            if (checked === undefined) checked = true;
+
+            var checkbox = this.by_init_id [record_key];
+            if (!checkbox) 
+                console.log("googlemap.set_checkbox_from_record - not found " + record_key);
+
+            checkbox.prop('checked', checked);
+        },
+
+
+        set_checkbox_from_data: function(id, checked) 
+        {
+            var checkbox = this.by_id[id];
+            if (!checkbox)
+                console.log("googlemap.set_checkbox_from_data - id not found " + id);
+            checkbox.prop('checked', checked);
+        }, 
+
+        set_bgcolor: function(key_value, class_name)
+        {
+            var elt = $(document.getElementById(this.id_from_key(this.canonical_key, key_value)))
+            if (class_name == GOOGLEMAP_BGCOLOR_RESET)
+                elt.removeClass('added removed');
+            else
+                elt.addClass((class_name == GOOGLEMAP_BGCOLOR_ADDED ? 'added' : 'removed'));
+        },
+
+
+        /**
+         * Populates both this.by_lat_lon and this.arm_marker arrays
+         */
+        new_record: function(record) 
+        {
+            var record_key;
+
+            if (!(record['latitude'])) 
+                return;
+
+            /* get the coordinates*/
+            var latitude  = unfold.get_value(record['latitude']);
+            var longitude = unfold.get_value(record['longitude']);
             var lat_lon = latitude + longitude;
 
     	    // check if we've seen anything at that place already
     	    // xxx might make sense to allow for some fuzziness, 
     	    // i.e. consider 2 places equal if not further away than 300m or so...
-    	    var marker_s = this.by_lat_lon [lat_lon];
+    	    var marker_s = this.by_lat_lon[lat_lon];
     	    if ( marker_s == null ) {
-        	marker_s = this.create_marker_struct (this.object, latitude, longitude);
-        	this.by_lat_lon [ lat_lon ] = marker_s;
-        	this.arm_marker(marker_s.marker, this.map);
-	    }
+        	    marker_s = this.create_marker_struct(this.object, latitude, longitude);
+        	    this.by_lat_lon[lat_lon] = marker_s;
+        	    this.arm_marker(marker_s.marker, this.map);
+	        }
+
+            /* Add key to the marker */
+            record_key = manifold.record_get_value(record, this.canonical_key);
+            marker_s.keys.push(record_key);
 	    
     	    // now add a line for this resource in the marker
     	    // xxx should compute checked here ?
     	    // this is where the checkbox will be appended
-    	    var ul=marker_s.ul;
-    	    var checkbox = this.create_record_checkbox (record, ul, false);
+    	    var ul = marker_s.ul;
+    	    var checkbox = this.create_record_checkbox(record, ul, false);
         }, // new_record
 
-        arm_marker: function(marker, map) {
-	    if (debug_deep) messages.debug ("arm_marker content="+marker.content);
-            var googlemap = this;
+        arm_marker: function(marker, map)
+        {
+            var self = this;
             google.maps.event.addListener(marker, 'click', function () {
-                googlemap.infowindow.close();
-                googlemap.infowindow.setContent(marker.content);
-                googlemap.infowindow.open(map, marker);
+                self.infowindow.close();
+                self.infowindow.setContent(marker.content);
+                self.infowindow.open(map, marker);
             });
         }, // arm_marker
 
-        /*************************** QUERY HANDLER ****************************/
-
-        /*************************** RECORD HANDLER ***************************/
-        on_new_record: function(record) {
-	    if (debug_deep) messages.debug("googlemap.on_new_record");
-            if (this.received_all)
-                // update checkbox for record
-                this.set_checkbox_from_record(record, true);
-            else
-                // store for later update of checkboxes
-                this.in_set_backlog.push(record);
-        },
-
-        on_clear_records: function(record) {
-	    if (debug_deep) messages.debug("googlemap.on_clear_records");
+        clear_map: function()
+        {
+            /* XXX */
         },
 
-        // Could be the default in parent
-        on_query_in_progress: function() {
-	    if (debug) messages.debug("googlemap.on_query_in_progress (spinning)");
-            this.spin();
-        },
-
-        on_query_done: function() {
-	        if (debug) messages.debug("googlemap.on_query_done");	    
-            if (this.received_all) {
-                this.unspin();
-	        }
-            this.received_set = true;
-        },
-
-        on_field_state_changed: function(data) {
-	    if (debug_deep) messages.debug("googlemap.on_field_state_changed");	    
-            switch(data.request) {
-            case FIELD_REQUEST_ADD:
-            case FIELD_REQUEST_ADD_RESET:
-                this.set_checkbox_from_data(data.value, true);
-                break;
-            case FIELD_REQUEST_REMOVE:
-            case FIELD_REQUEST_REMOVE_RESET:
-                this.set_checkbox_from_data(data.value, false);
-                break;
-            default:
-                break;
+        filter_map: function()
+        {
+            var self = this;
+            var visible;
+
+            /* Loop on every marker and sets it visible */
+            $.each(this.markers, function(i, marker) {
+                /* For a marker to be visible, at least one of its keys has to
+                 * be visible */
+                visible = false;
+                $.each(marker.keys, function(j, key) {
+                    visible |= manifold.query_store.get_record_state(self.options.query_uuid, key, STATE_VISIBLE);
+                }
+                marker.setVisible(visible);
             }
         },
 
+        redraw_map: function()
+        {
+            // Let's clear the table and only add lines that are visible
+            var self = this;
+            this.clear_map();
+
+            /* Add records to internal hash structure */
+            var record_keys = [];
+            manifold.query_store.iter_records(this.options.query_uuid, function (record_key, record) {
+                self.new_record(record);
+                record_keys.push(record_key);
+            });
+            this.table.fnAddData(lines);
 
-        // all : this 
-
-        on_all_new_record: function(record) {
-	    if (debug_deep) messages.debug("googlemap.on_all_new_record");
-            this.new_record(record);
-        },
-
-        on_all_clear_records: function() {
-	    if (debug) messages.debug("googlemap.on_all_clear_records");	    
-        },
-
-        on_all_query_in_progress: function() {
-	    if (debug) messages.debug("googlemap.on_all_query_in_progress (spinning)");
-            // XXX parent
-            this.spin();
-        },
-
-        on_all_query_done: function() {
-	    if (debug) messages.debug("googlemap.on_all_query_done");
+            /* Add markers to cluster */
+            this.markers = Array();
+            $.each(this.by_lat_lon, function (k, s) {
+                this.markers.push(s.marker); 
+            });
 
-            // MarkerClusterer
-            var markers = [];
-            $.each(this.by_lat_lon, function (k, s) { markers.push(s.marker); });
-            this.markerCluster = new MarkerClusterer(this.map, markers, {zoomOnClick: false});
+            this.markerCluster = new MarkerClusterer(this.map, this.markers, {zoomOnClick: false});
             google.maps.event.addListener(this.markerCluster, "clusterclick", function (cluster) {
                 var cluster_markers = cluster.getMarkers();
                 var bounds  = new google.maps.LatLngBounds();
@@ -291,24 +306,84 @@
             //now fit the map to the bounds
             this.map.fitBounds(this.bounds);
             // Fix the zoom of fitBounds function, it's too close when there is only 1 marker
-            if(markers.length==1){
+            if (this.markers.length==1) {
                 this.map.setZoom(this.map.getZoom()-4);
             }
-            var googlemap = this;
-            if (this.received_set) {
-                /* ... and check the ones specified in the resource list */
-                $.each(this.in_set_backlog, function(i, record) {
-                    googlemap.set_checkbox_from_record(record, true);
-                });
-		// reset 
-		googlemap.in_set_backlog = [];
-                this.unspin();
+
+            /* Set checkbox and background color */
+            $.each(record_keys, function(i, record_key) {
+                var state = manifold.query_store.get_record_state(self.options.query_uuid, record_key, STATE_SET);
+                var warnings = manifold.query_store.get_record_state(self.options.query_uuid, record_key, STATE_WARNINGS);
+                switch(state) {
+                    // XXX The row and checkbox still does not exists !!!!
+                    case STATE_SET_IN:
+                    case STATE_SET_IN_SUCCESS:
+                    case STATE_SET_OUT_FAILURE:
+                        self.set_checkbox_from_record_key(record_key, true);
+                        break;
+                    case STATE_SET_OUT:
+                    case STATE_SET_OUT_SUCCESS:
+                    case STATE_SET_IN_FAILURE:
+                        break;
+                    case STATE_SET_IN_PENDING:
+                        self.set_checkbox_from_record_key(record_key, true);
+                        self.set_bgcolor(record_key, GOOGLEMAP_BGCOLOR_ADDED);
+                        break;
+                    case STATE_SET_OUT_PENDING:
+                        self.set_bgcolor(record_key, GOOGLEMAP_BGCOLOR_REMOVED);
+                        break;
+                }
+                self.change_status(record_key, warnings); // XXX will retrieve status again
+            });
+        },
+
+       /**************************************************************************
+        *                           QUERY HANDLERS
+        **************************************************************************/ 
+
+        on_filter_added: function(filter)
+        {
+            this.filter_map();
+        },
+
+        on_filter_removed: function(filter)
+        {
+            this.filter_map();
+        },
+        
+        on_filter_clear: function()
+        {
+            this.filter_map();
+        },
+
+        on_query_in_progress: function() 
+        {
+            this.spin();
+        },
+
+        on_query_done: function()
+        {
+            this.redraw_map();
+            this.unspin();
+        },
+
+        on_field_state_changed: function(data)
+        {
+            switch(data.request) {
+                case FIELD_REQUEST_ADD:
+                case FIELD_REQUEST_ADD_RESET:
+                    this.set_checkbox_from_data(data.value, true);
+                    break;
+                case FIELD_REQUEST_REMOVE:
+                case FIELD_REQUEST_REMOVE_RESET:
+                    this.set_checkbox_from_data(data.value, false);
+                    break;
+                default:
+                    break;
             }
-            this.received_all = true;
+        },
 
-        } // on_all_query_done
     });
-        /************************** PRIVATE METHODS ***************************/
 
     $.plugin('GoogleMap', GoogleMap);
 
diff --git a/plugins/googlemap/templates/googlemap.html b/plugins/googlemap/templates/googlemap.html
index 15b82fb5..e487ea10 100644
--- a/plugins/googlemap/templates/googlemap.html
+++ b/plugins/googlemap/templates/googlemap.html
@@ -1 +1 @@
-<div id="{{domid}}--googlemap" class="geo"></div>
+<div id="{{domid}}__googlemap" class="geo"></div>
diff --git a/plugins/querytable/static/js/querytable.js b/plugins/querytable/static/js/querytable.js
index 47e0a97a..479819f6 100644
--- a/plugins/querytable/static/js/querytable.js
+++ b/plugins/querytable/static/js/querytable.js
@@ -4,9 +4,9 @@
  * License: GPLv3
  */
 
-BGCOLOR_RESET   = 0;
-BGCOLOR_ADDED   = 1;
-BGCOLOR_REMOVED = 2;
+QUERYTABLE_BGCOLOR_RESET   = 0;
+QUERYTABLE_BGCOLOR_ADDED   = 1;
+QUERYTABLE_BGCOLOR_REMOVED = 2;
 
 (function($){
 
@@ -23,49 +23,42 @@ BGCOLOR_REMOVED = 2;
     var QueryTable = Plugin.extend({
 
         init: function(options, element) {
-	    this.classname="querytable";
+        this.classname="querytable";
             this._super(options, element);
 
             /* Member variables */
-	    // in general we expect 2 queries here
-	    // query_uuid refers to a single object (typically a slice)
-	    // query_all_uuid refers to a list (typically resources or users)
-	    // these can return in any order so we keep track of which has been received yet
-            this.received_query = false;
-
-            // We need to remember the active filter for datatables filtering
-            this.filters = Array(); 
+            var query = manifold.query_store.find_analyzed_query(this.options.query_uuid);
+            this.object = query.object; // XXX
 
             /* Events */
-	    // xx somehow non of these triggers at all for now
             this.elmt().on('show', this, this.on_show);
             this.elmt().on('shown.bs.tab', this, this.on_show);
             this.elmt().on('resize', this, this.on_resize);
 
-            var query = manifold.query_store.find_analyzed_query(this.options.query_uuid);
-            this.object = query.object;
-
-	    //// we need 2 different keys
-	    // * canonical_key is the primary key as derived from metadata (typically: urn)
-	    //   and is used to communicate about a given record with the other plugins
-	    // * init_key is a key that both kinds of records 
-	    //   (i.e. records returned by both queries) must have (typically: hrn or hostname)
-	    //   in general query_all will return well populated records, but query
-	    //   returns records with only the fields displayed on startup
-	    var keys = manifold.metadata.get_key(this.object);
-	    this.canonical_key = (keys && keys.length == 1) ? keys[0] : undefined;
-	    // 
-	    this.init_key = this.options.init_key;
-	    // have init_key default to canonical_key
-	    this.init_key = this.init_key || this.canonical_key;
-	    // sanity check
-	    if ( ! this.init_key ) messages.warning ("QueryTable : cannot find init_key");
-	    if ( ! this.canonical_key ) messages.warning ("QueryTable : cannot find canonical_key");
-	    if (debug) messages.debug("querytable: canonical_key="+this.canonical_key+" init_key="+this.init_key);
+            //// we need 2 different keys
+            // * canonical_key is the primary key as derived from metadata (typically: urn)
+            //   and is used to communicate about a given record with the other plugins
+            // * init_key is a key that both kinds of records 
+            //   (i.e. records returned by both queries) must have (typically: hrn or hostname)
+            //   in general query_all will return well populated records, but query
+            //   returns records with only the fields displayed on startup
+            var keys = manifold.metadata.get_key(this.object);
+            this.canonical_key = (keys && keys.length == 1) ? keys[0] : undefined;
+            // 
+            this.init_key = this.options.init_key;
+            // have init_key default to canonical_key
+            this.init_key = this.init_key || this.canonical_key;
+
+            /* sanity check */
+            if ( ! this.init_key ) 
+                messages.warning ("QueryTable : cannot find init_key");
+            if ( ! this.canonical_key ) 
+                messages.warning ("QueryTable : cannot find canonical_key");
+            if (debug)
+                messages.debug("querytable: canonical_key="+this.canonical_key+" init_key="+this.init_key);
 
             /* Setup query and record handlers */
             this.listen_query(options.query_uuid);
-            //this.listen_query(options.query_all_uuid, 'all');
 
             /* GUI setup and event binding */
             this.initialize_table();
@@ -74,16 +67,16 @@ BGCOLOR_REMOVED = 2;
         /* PLUGIN EVENTS */
 
         on_show: function(e) {
-	    if (debug) messages.debug("querytable.on_show");
+        if (debug) messages.debug("querytable.on_show");
             var self = e.data;
             self.table.fnAdjustColumnSizing();
-	},        
+    },        
 
         on_resize: function(e) {
-	    if (debug) messages.debug("querytable.on_resize");
+        if (debug) messages.debug("querytable.on_resize");
             var self = e.data;
             self.table.fnAdjustColumnSizing();
-	},        
+    },        
 
         /* GUI EVENTS */
 
@@ -98,9 +91,9 @@ BGCOLOR_REMOVED = 2;
                 // we use a fluid row on top and another on the bottom, making sure we take 12 grid elt's each time
                 //sDom: "<'row'<'col-xs-5'l><'col-xs-1'r><'col-xs-6'f>>t<'row'<'col-xs-5'i><'col-xs-7'p>>",
                 sDom: "<'row'<'col-xs-5'f><'col-xs-1'r><'col-xs-6 columns_selector'>>t<'row'<'col-xs-5'l><'col-xs-7'p>>",
-		// XXX as of sept. 2013, I cannot locate a bootstrap3-friendly mode for now
-		// hopefully this would come with dataTables v1.10 ?
-		// in any case, search for 'sPaginationType' all over the code for more comments
+        // XXX as of sept. 2013, I cannot locate a bootstrap3-friendly mode for now
+        // hopefully this would come with dataTables v1.10 ?
+        // in any case, search for 'sPaginationType' all over the code for more comments
                 sPaginationType: 'bootstrap',
                 // Handle the null values & the error : Datatables warning Requested unknown parameter
                 // http://datatables.net/forums/discussion/5331/datatables-warning-...-requested-unknown-parameter/p2
@@ -129,16 +122,16 @@ BGCOLOR_REMOVED = 2;
                 // XXX use $.proxy here !
             };
             // the intention here is that options.datatables_options as coming from the python object take precedence
-	    // xxx DISABLED by jordan: was causing errors in datatables.js
-	    // xxx turned back on by Thierry - this is the code that takes python-provided options into account
-	    // check your datatables_options tag instead 
-	    // however, we have to accumulate in aoColumnDefs from here (above) 
-	    // and from the python wrapper (checkboxes management, plus any user-provided aoColumnDefs)
-	    if ( 'aoColumnDefs' in this.options.datatables_options) {
-		actual_options['aoColumnDefs']=this.options.datatables_options['aoColumnDefs'].concat(actual_options['aoColumnDefs']);
-		delete this.options.datatables_options['aoColumnDefs'];
-	    }
-	    $.extend(actual_options, this.options.datatables_options );
+        // xxx DISABLED by jordan: was causing errors in datatables.js
+        // xxx turned back on by Thierry - this is the code that takes python-provided options into account
+        // check your datatables_options tag instead 
+        // however, we have to accumulate in aoColumnDefs from here (above) 
+        // and from the python wrapper (checkboxes management, plus any user-provided aoColumnDefs)
+        if ( 'aoColumnDefs' in this.options.datatables_options) {
+        actual_options['aoColumnDefs']=this.options.datatables_options['aoColumnDefs'].concat(actual_options['aoColumnDefs']);
+        delete this.options.datatables_options['aoColumnDefs'];
+        }
+        $.extend(actual_options, this.options.datatables_options );
             this.table = this.elmt('table').dataTable(actual_options);
 
             /* Setup the SelectAll button in the dataTable header */
@@ -165,7 +158,6 @@ BGCOLOR_REMOVED = 2;
 
             /* Processing hidden_columns */
             $.each(this.options.hidden_columns, function(i, field) {
-                //manifold.raise_event(self.options.query_all_uuid, FIELD_REMOVED, field);
                 self.hide_column(field);
             });
             $(".dataTables_filter").append("<div style='display:inline-block;height:27px;width:27px;padding-left:6px;padding-top:4px;'><span class='glyphicon glyphicon-search'></span></div>");
@@ -183,25 +175,25 @@ BGCOLOR_REMOVED = 2;
             return (tabIndex.length > 0) ? tabIndex[0] : -1;
         }, // getColIndex
 
-	// create a checkbox <input> tag
-	// computes 'id' attribute from canonical_key
-	// computes 'init_id' from init_key for initialization phase
-	// no need to used convoluted ids with plugin-uuid or others, since
-	// we search using table.$ which looks only in this table
+    // create a checkbox <input> tag
+    // computes 'id' attribute from canonical_key
+    // computes 'init_id' from init_key for initialization phase
+    // no need to used convoluted ids with plugin-uuid or others, since
+    // we search using table.$ which looks only in this table
         checkbox_html : function (record) {
             var result="";
             // Prefix id with plugin_uuid
             result += "<input";
             result += " class='querytable-checkbox'";
-	 // compute id from canonical_key
-	    var id = record[this.canonical_key]
-	 // compute init_id form init_key
-	    var init_id=record[this.init_key];
-	 // set id - for retrieving from an id, or for posting events upon user's clicks
-	    result += " id='"+record[this.canonical_key]+"'";
-	 // set init_id
-	    result += "init_id='" + init_id + "'";
-	 // wrap up
+     // compute id from canonical_key
+        var id = record[this.canonical_key]
+     // compute init_id form init_key
+        var init_id=record[this.init_key];
+     // set id - for retrieving from an id, or for posting events upon user's clicks
+        result += " id='"+record[this.canonical_key]+"'";
+     // set init_id
+        result += "init_id='" + init_id + "'";
+     // wrap up
             result += " type='checkbox'";
             result += " autocomplete='off'";
             result += "></input>";
@@ -223,13 +215,13 @@ BGCOLOR_REMOVED = 2;
             var nb_col = cols.length;
             /* if we've requested checkboxes, then forget about the checkbox column for now */
             //if (this.options.checkboxes) nb_col -= 1;
-			// catch up with the last column if checkboxes were requested 
+            // catch up with the last column if checkboxes were requested 
             if (this.options.checkboxes) {
                 // Use a key instead of hostname (hard coded...)
                 line.push(this.checkbox_html(record));
-	        }
+            }
             line.push('<span id="' + this.id_from_key('status', record[this.init_key]) + '"></span>'); // STATUS
-	        
+            
             /* fill in stuff depending on the column name */
             for (var j = 2; j < nb_col - 1; j++) { // nb_col includes status
                 if (typeof colnames[j] == 'undefined') {
@@ -264,9 +256,9 @@ BGCOLOR_REMOVED = 2;
                 }
             }
     
-    	    // adding an array in one call is *much* more efficient
-	        // this.table.fnAddData(line);
-	        return line;
+            // adding an array in one call is *much* more efficient
+            // this.table.fnAddData(line);
+            return line;
         },
 
         clear_table: function()
@@ -297,30 +289,24 @@ BGCOLOR_REMOVED = 2;
                 this.table.fnSetColumnVis(index, false);
         },
 
-	// this is used at init-time, at which point only init_key can make sense
-	// (because the argument record, if it comes from query, might not have canonical_key set
-	set_checkbox_from_record: function (record, checked) {
-        if (checked === undefined) checked = true;
-	    var init_id = record[this.init_key];
-        this.set_checkbox_from_record_key(init_id, checked);
-	},
-
-	set_checkbox_from_record_key: function (record_key, checked) {
-        if (checked === undefined) checked = true;
-	    if (debug) messages.debug("querytable.set_checkbox_from_record, record_key="+record_key);
-	    // using table.$ to search inside elements that are not visible
-	    var element = this.table.$('[init_id="'+record_key+'"]');
-	    element.attr('checked',checked);
-	},
-
-	// id relates to canonical_key
-	set_checkbox_from_data: function (id, checked) {
+        set_checkbox_from_record_key: function (record_key, checked) 
+        {
+            if (checked === undefined) checked = true;
+
+            // using table.$ to search inside elements that are not visible
+            var element = this.table.$('[init_id="'+record_key+'"]');
+            element.attr('checked',checked);
+        },
+
+        // id relates to canonical_key
+        set_checkbox_from_data: function (id, checked) 
+        {
             if (checked === undefined) checked = true;
-	    if (debug) messages.debug("querytable.set_checkbox_from_data, id="+id);
-	    // using table.$ to search inside elements that are not visible
-	    var element = this.table.$("[id='"+id+"']");
-	    element.attr('checked',checked);
-	},
+
+            // using table.$ to search inside elements that are not visible
+            var element = this.table.$("[id='"+id+"']");
+            element.attr('checked',checked);
+        },
 
         /**
          * Arguments
@@ -369,10 +355,10 @@ BGCOLOR_REMOVED = 2;
         set_bgcolor: function(key_value, class_name)
         {
             var elt = $(document.getElementById(this.id_from_key(this.canonical_key, key_value)))
-            if (class_name == BGCOLOR_RESET)
+            if (class_name == QUERYTABLE_BGCOLOR_RESET)
                 elt.removeClass('added removed');
             else
-                elt.addClass((class_name == BGCOLOR_ADDED ? 'added' : 'removed'));
+                elt.addClass((class_name == QUERYTABLE_BGCOLOR_ADDED ? 'added' : 'removed'));
         },
 
         populate_table: function()
@@ -381,17 +367,13 @@ BGCOLOR_REMOVED = 2;
             var self = this;
             this.clear_table();
 
-            // XXX Here we have lost checkboxes
-            // set checkbox from record.
-            // only the current plugin known that we have an element in a set
-
             lines = Array();
             var record_keys = [];
             manifold.query_store.iter_records(this.options.query_uuid, function (record_key, record) {
                 lines.push(self.new_record(record));
                 record_keys.push(record_key);
             });
-	    	this.table.fnAddData(lines);
+            this.table.fnAddData(lines);
             $.each(record_keys, function(i, record_key) {
                 var state = manifold.query_store.get_record_state(self.options.query_uuid, record_key, STATE_SET);
                 var warnings = manifold.query_store.get_record_state(self.options.query_uuid, record_key, STATE_WARNINGS);
@@ -409,11 +391,11 @@ BGCOLOR_REMOVED = 2;
                         break;
                     case STATE_SET_IN_PENDING:
                         self.set_checkbox_from_record_key(record_key, true);
-                        self.set_bgcolor(record_key, BGCOLOR_ADDED);
+                        self.set_bgcolor(record_key, QUERYTABLE_BGCOLOR_ADDED);
                         break;
                     case STATE_SET_OUT_PENDING:
                         //self.set_checkbox_from_record_key(record_key, false);
-                        self.set_bgcolor(record_key, BGCOLOR_REMOVED);
+                        self.set_bgcolor(record_key, QUERYTABLE_BGCOLOR_REMOVED);
                         break;
                 }
                 self.change_status(record_key, warnings); // XXX will retrieve status again
@@ -421,6 +403,7 @@ BGCOLOR_REMOVED = 2;
         },
 
         /*************************** QUERY HANDLER ****************************/
+                                    HANDLERS
 
         on_filter_added: function(filter)
         {
@@ -463,7 +446,7 @@ BGCOLOR_REMOVED = 2;
         on_query_done: function()
         {
             this.populate_table();
-            this.spin(false);
+            this.unspin();
         },
         
         on_field_state_changed: function(data)
@@ -476,21 +459,21 @@ BGCOLOR_REMOVED = 2;
                         case STATE_SET_IN_SUCCESS:
                         case STATE_SET_OUT_FAILURE:
                             this.set_checkbox_from_data(data.value, true);
-                            this.set_bgcolor(data.value, BGCOLOR_RESET);
+                            this.set_bgcolor(data.value, QUERYTABLE_BGCOLOR_RESET);
                             break;  
                         case STATE_SET_OUT:
                         case STATE_SET_OUT_SUCCESS:
                         case STATE_SET_IN_FAILURE:
                             this.set_checkbox_from_data(data.value, false);
-                            this.set_bgcolor(data.value, BGCOLOR_RESET);
+                            this.set_bgcolor(data.value, QUERYTABLE_BGCOLOR_RESET);
                             break;
                         case STATE_SET_IN_PENDING:
                             this.set_checkbox_from_data(data.value, true);
-                            this.set_bgcolor(data.value, BGCOLOR_ADDED);
+                            this.set_bgcolor(data.value, QUERYTABLE_BGCOLOR_ADDED);
                             break;  
                         case STATE_SET_OUT_PENDING:
                             this.set_checkbox_from_data(data.value, false);
-                            this.set_bgcolor(data.value, BGCOLOR_REMOVED);
+                            this.set_bgcolor(data.value, QUERYTABLE_BGCOLOR_REMOVED);
                             break;
                     }
                     break;
@@ -572,10 +555,10 @@ BGCOLOR_REMOVED = 2;
             e.stopPropagation();
 
             var self = e.data;
-	    var id=this.id;
+        var id=this.id;
 
             // this.id = key of object to be added... what about multiple keys ?
-	    if (debug) messages.debug("querytable._check_click key="+this.canonical_key+"->"+id+" checked="+this.checked);
+        if (debug) messages.debug("querytable._check_click key="+this.canonical_key+"->"+id+" checked="+this.checked);
             manifold.raise_event(self.options.query_uuid, this.checked?SET_ADD:SET_REMOVED, id);
             //return false; // prevent checkbox to be checked, waiting response from manifold plugin api
             
@@ -611,9 +594,9 @@ BGCOLOR_REMOVED = 2;
      was in fact given as a third argument, and not second 
      as the various online resources had it - go figure */
     $.fn.dataTableExt.afnSortData['dom-checkbox'] = function  ( oSettings, _, iColumn ) {
-		return $.map( oSettings.oApi._fnGetTrNodes(oSettings), function (tr, i) {
-		    return result=$('td:eq('+iColumn+') input', tr).prop('checked') ? '1' : '0';
-		});
+        return $.map( oSettings.oApi._fnGetTrNodes(oSettings), function (tr, i) {
+            return result=$('td:eq('+iColumn+') input', tr).prop('checked') ? '1' : '0';
+        });
     };
 
 })(jQuery);
diff --git a/plugins/queryupdater/static/js/queryupdater.js b/plugins/queryupdater/static/js/queryupdater.js
index 4bd5189f..8e5793a1 100644
--- a/plugins/queryupdater/static/js/queryupdater.js
+++ b/plugins/queryupdater/static/js/queryupdater.js
@@ -28,6 +28,10 @@
 
     var QueryUpdaterPlugin = Plugin.extend({
 
+        /**************************************************************************
+         *                          CONSTRUCTOR
+         **************************************************************************/
+
         init: function(options, element) {
 	        this.classname="queryupdater";
             this._super(options, element);
@@ -299,42 +303,15 @@
         },
 
      
-        do_update: function(e) {
-            var self = e.data;
-
-            var username = e.data.options.username;
-            var urn = data.value;
-            // XXX check that the query is not disabled
-
-            self.spin();
-            console.log("do_update");
-            // XXX check that the query is not disabled
-            //manifold.raise_event(self.options.query_uuid, RUN_UPDATE);
-
-            // how to stop the spinning after the event? 
-            // this should be triggered by some on_updatequery_done ?
-
-        },
-
-	// related buttons are also disabled in the html template
-        do_refresh: function(e)
-        {
-            throw 'resource_selected.do_refresh Not implemented';
-        },
-
-        do_reset: function(e)
-        {
-            throw 'queryupdater.do_reset Not implemented';
-        },
+        /************************** GUI MANIPULATION **************************/
 
-        do_clear_annotations: function(e)
+        populate_table: function()
         {
-            throw 'queryupdater.do_clear_annotations Not implemented';
+            // Loop over records and display pending ones
+            manifold.query_store.iter_records(this.options.query_uuid, function (record_key, record) {
+            }
         },
         
-        /************************** GUI MANIPULATION **************************/
-
-        
         set_button_state: function(name, state)
         {
             this.elmt(name).attr('disabled', state ? false : 'disabled');
@@ -457,11 +434,42 @@
             }
         },
 
-        /*************************** QUERY HANDLER ****************************/
+        do_update: function(e) {
+            var self = e.data;
+
+            var username = e.data.options.username;
+            var urn = data.value;
+            // XXX check that the query is not disabled
+
+            self.spin();
+            console.log("do_update");
+            // XXX check that the query is not disabled
+            //manifold.raise_event(self.options.query_uuid, RUN_UPDATE);
+
+            // how to stop the spinning after the event? 
+            // this should be triggered by some on_updatequery_done ?
+
+        },
+
+        // related buttons are also disabled in the html template
+        do_refresh: function(e)
+        {
+            throw 'resource_selected.do_refresh Not implemented';
+        },
 
-        // NONE
+        do_reset: function(e)
+        {
+            throw 'queryupdater.do_reset Not implemented';
+        },
 
-        /*************************** RECORD HANDLER ***************************/
+        do_clear_annotations: function(e)
+        {
+            throw 'queryupdater.do_clear_annotations Not implemented';
+        },
+        
+       /**************************************************************************
+        *                           QUERY HANDLERS
+        **************************************************************************/ 
 
         on_new_record: function(record)
         {
@@ -532,7 +540,6 @@
 
         on_query_in_progress: function()
         {
-	        messages.debug("queryupdater.on_query_in_progress");
             this.spin();
         },
 
@@ -586,8 +593,6 @@
                     this.selected_resources.splice(i,1);
                 }
             }
-            messages.debug(result)
-
             this.set_state(result);
         },