metadataplayer: comparison src/js/libs/tracemanager.js

Mercurial Mercurial > metadataplayer / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

src/js/libs/tracemanager.js

branch	new-model
changeset 882	61c384dda19e
parent 841	8da49ff273e0
child 906	4b6e154ae8de

equal deleted inserted replaced

-:f11b234497f7
+:61c384dda19e
 /*
 * Modelled Trace API
+*
+* This file is part of ktbs4js.
+*
+* ktbs4js is free software: you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation, either version 3 of the
+* License, or (at your option) any later version.
+*
+* ktbs4js is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with ktbs4js.  If not, see <http://www.gnu.org/licenses/>.
+*
 */
-IriSP.TraceManager = function($) {
+/* FIXME: properly use require.js feature. This will do for debugging in the meantime */
+window.tracemanager = (function($) {
 // If there are more than MAX_FAILURE_COUNT synchronisation
 // failures, then disable synchronisation
 MAX_FAILURE_COUNT = 20;
 // If there are more than MAX_BUFFER_SIZE obsels in the buffer,
 // prefixing it with c
 var data = 'c' + JSON.stringify(temp.map(function (o) { return o.toCompactJSON(); }));
 // Swap " (very frequent, which will be
 // serialized into %22) and ; (rather rare), this
 // saves some bytes
-data = data.replace(/[;"]/g, function(s){ return s == ';' ? '"' : ';'; }).replace(/#/g, '%23');
+data = data.replace(/[;"#]/g, function(s){ return s == ';' ? '"' : ( s == '"' ? ';' : '%23'); });
 // FIXME: check data length (< 2K is safe)
 var request=$('<img />').error( function() { this.failureCount += 1; })
 .load( function() { this.failureCount = 0; })
 .attr('src', this.url + 'trace/?data=' + data);
 }
 },
 /* Sync mode: delayed, sync (immediate sync), none (no
 * synchronisation with server, the trace has to be explicitly saved
 * if needed */
-set_sync_mode: function(mode) {
+set_sync_mode: function(mode, default_subject) {
 this.sync_mode = mode;
 if (! this.isReady && mode !== "none")
-this.init();
+this.init(default_subject);
 if (mode == 'delayed') {
 this.start_timer();
 } else {
 this.stop_timer();
 }
 },
 /*
 * Initialize the sync service
 */
-init: function() {
+init: function(default_subject) {
 var self = this;
 if (this.isReady)
 /* Already initialized */
 return;
+if (typeof default_subject === 'undefined')
+default_subject = 'anonymous';
 if (this.mode == 'GET')
 {
-var request=$('<img/>').attr('src', this.url + 'login?userinfo={"name":"ktbs4js"}');
+var request=$('<img/>').attr('src', this.url + 'login?userinfo={"default_subject": "' + default_subject + '"}');
 // Do not wait for the return, assume it is
 // initialized. This assumption will not work anymore
 // if login returns some necessary information
 this.isReady = true;
 }
 else
 {
 $.ajax({ url: this.url + 'login',
 type: 'POST',
-data: 'userinfo={"name":"ktbs4js"}',
+data: 'userinfo={"default_subject":"' + default_subject + '"}',
 success: function(data, textStatus, jqXHR) {
 self.isReady = true;
 if (self.buffer.length) {
 self.flush();
 }
 /* Sync mode: delayed, sync (immediate sync), none (no
 * synchronisation with server, the trace has to be explicitly saved
 * if needed */
 set_sync_mode: function(mode) {
 if (this.syncservice !== null) {
-this.syncservice.set_sync_mode(mode);
+this.syncservice.set_sync_mode(mode, this.default_subject);
 }
 },
 /*
 * Return a list of the obsels of this trace matching the parameters
 }
 return undefined;
 },
 set_default_subject: function(subject) {
+// FIXME: if we call this method after the sync_service
+// init method, then the default_subject will not be
+// consistent anymore. Maybe we should then call init() again?
 this.default_subject = subject;
 },
 get_default_subject: function() {
 return this.default_subject;
 },
 list_attribute_types: function() {
 var result = [];
 for (var prop in this.attributes) {
-if (this.hasOwnProperty(prop))
+if (this.attributes.hasOwnProperty(prop))
 result.push(prop);
 }
 /* FIXME: we return URIs here instead of AttributeType elements */
 return result;
 },
 "begin": this.begin,
 "end": this.end,
 "subject": this.subject
 };
 for (var prop in this.attributes) {
-if (this.hasOwnProperty(prop))
+if (this.attributes.hasOwnProperty(prop))
 r[prop] = this.attributes[prop];
 }
 return r;
 },
 * Return a compact JSON representation of the obsel.
 * Use predefined + custom shorthands for types/properties
 */
 toCompactJSON: function() {
 var r = {
-"@i": this.id,
 "@t": (this.trace.shorthands.hasOwnProperty(this.type) ? this.trace.shorthands[this.type] : this.type),
 "@b": this.begin,
-"@s": this.subject
 };
+// Transmit subject only if different from default_subject
+if (this.subject !== this.trace.default_subject)
+r["@s"] = this.subject;
 // Store duration (to save some bytes) and only if it is non-null
 if (this.begin !== this.end)
 r["@d"] = this.end - this.begin;
+// Store id only if != ""
+if (this.id !== "")
+r["@i"] = this.id;
 for (var prop in this.attributes) {
-if (this.hasOwnProperty(prop))
+if (this.attributes.hasOwnProperty(prop))
 {
 var v = this.attributes[prop];
 r[prop] = this.trace.shorthands.hasOwnProperty(v) ? this.trace.shorthands[v] : v;
 }
 }
 url = params.url ? params.url : "";
 requestmode = params.requestmode ? params.requestmode : "POST";
 syncmode = params.syncmode ? params.syncmode : "none";
 default_subject = params.default_subject ? params.default_subject : "default";
 var t = new Trace(url, requestmode);
+t.set_default_subject(default_subject);
 t.set_sync_mode(syncmode);
-t.set_default_subject(default_subject);
 this.traces[name] = t;
 return t;
 }
 };
 };
 TraceManager.prototype = TraceManager_prototype;
 var tracemanager  = new TraceManager();
 return tracemanager;
-};
+})(jQuery);

metadataplayer