X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fupdater%2Fupdater.js;h=7986fee79ba6a4e08cdec7c44746132c2b145315;hb=69867d5296684463d3aad4f6db867d24005102aa;hp=26390a8921b542a601e4377e126c73a35f734918;hpb=dd7612b7deb9dcccbe26064610999445df19d6ae;p=myslice.git

diff --git a/plugins/updater/updater.js b/plugins/updater/updater.js
index 26390a89..7986fee7 100644
--- a/plugins/updater/updater.js
+++ b/plugins/updater/updater.js
@@ -8,6 +8,9 @@
 
 ( function ( $ ) {
     
+    var debug=false;
+//    debug=true
+
     $.fn.Updater = function ( method ) {
         /* Method calling logic */
         if ( methods[method] ) {
@@ -25,9 +28,12 @@
 		var $this = $(this);
 		var updater = new Updater (options);
 		$this.data('Updater',updater);
-		/* Subscribe to query updates */
+		// xxx not tested yet
                 var results_channel = '/results/' + options.query_uuid + '/changed';
-		$.subscribe(results_channel, function (e,rows) { updater.update_slice (e,rows); } );
+		$.subscribe(results_channel, function (e,rows) { updater.query_completed (e,rows); } );
+		// under test..
+		var failed_channel = '/results/' + options.query_uuid + '/failed';
+		$.subscribe(failed_channel, $this, function (e,code,output) { updater.query_failed (e, code, output); } );
 	    });
 	},
 	destroy : function( ) {
@@ -51,33 +57,39 @@
 	// implementation wouldn't fly
 	// we keep this for a later improvement
 	var query=manifold.find_query (options.query_uuid);
-	console.log("retrieved query " + query.__repr());
 	// very rough way of filling this for now
 	this.update_query = 
 	    new ManifoldQuery ("update", query.subject, null, query.filters, 
 			       {}, // params
 			       query.fields, 
 			       undefined, /* unique */ 
-			       query.query_uuid, /* tmp */
+			       Math.uuid(32,16), 
 			       undefined, undefined /* maybe some day I'll get that one */);
+	manifold.insert_query (this.update_query);
 	// arm button once document is loaded
 	(function(updater) {$(document).ready(function(){updater.arm_button()})})(this);
 
 	this.arm_button = function () {
-	    console.log("arm_button");
 	    $('#updater-' + this.options.plugin_uuid).click(this, this.submit_update_request);
 	},
 	this.submit_update_request = function (e) {
-	    console.log("submit_update_request");
 	    var query_uuid = e.data.options.query_uuid;
 	    var update_query = e.data.update_query;
-	    $.publish("/messages/debug","Updater.submit_update_request " + update_query.__repr());
-	    // publish results as if coming from the original query
-	    manifold.asynchroneous_exec ( [ {'query_uuid': query_uuid, 'publish_uuid' : update_query.query_uuid} ]);
-	    // looks like a previous attempt to disable the button while the query is flying
-            //$('#updateslice-' + options.plugin_uuid).prop('disabled', true);
+	    if (debug) messages.debug("Updater.submit_update_request " + update_query.__repr());
+	    // actually send the Update query, but publish results as if coming from the original query
+	    manifold.asynchroneous_exec ( [ {'query_uuid': update_query.query_uuid, 'publish_uuid' : query_uuid} ], false);
+	    // disable button while the query is flying
+            $('#updater-' + e.data.options.plugin_uuid).attr('disabled', 'disabled');
         },
 
+	this.query_failed = function (e, code, output) {
+	    var plugindiv=e.data;
+	    var updater=plugindiv.data('Updater');
+            $('#updater-' + updater.options.plugin_uuid).removeAttr('disabled');
+	    // just as a means to deom how to retrieve the stuff passed on the channel
+	    if (debug) messages.debug("retrieved error code " + code + " and output " + output);
+	}
+	    
 	update_resources = function (e, resources, change) {
             data = e.data.instance.data().Slices;
 
@@ -92,8 +104,12 @@
 	    $.publish('/update/' + data.options.query_uuid, [data.update_query, true]);
 	},
   
-	update_slice = function (e, rows, query) {
+	    
+
+	query_completed = function (e, rows, query) {
+
 	    /* This function is called twice : get and update */
+	    messages.info("updater.query_completed - not implemented yet");
       
 	    var data = e.data.instance.data().Slices;