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

changeset 899	445631dffdf8
parent 841	8da49ff273e0
child 901	12b2cd7e9159

equal deleted inserted replaced

-:94fea76c883e
+:445631dffdf8
 // then "compress" them as a single "ktbsFullBuffer"
 MAX_BUFFER_SIZE = 500;
 var BufferedService_prototype = {
 /*
-*  Buffered service for traces
+* Buffered service for traces
 */
 // url: "",
 // buffer: [],
 // isReady: false,
 // timer: null,
 // failureCount: 0,
 // 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();
 }
 this.timer = null;
 }
 },
 /*
 * 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();
 }
 };
 BufferedService.prototype = BufferedService_prototype;
 var Trace_prototype = {
 /* FIXME: We could/should use a sorted list such as
 http://closure-library.googlecode.com/svn/docs/class_goog_structs_AvlTree.html
 to speed up queries based on time */
 obsels: [],
 /* Trace URI */
 uri: "",
 default_subject: "",
 /* baseuri is used as the base URI to resolve relative
 * attribute-type names in obsels. Strictly speaking, this
 * should rather be expressed as a reference to model, or
 * more generically, as a qname/URI dict */
 baseuri: "",
 /* Mapping of obsel type or property name to a compact
 * representation (shorthands).
 */
 shorthands: null,
 syncservice: null,
 /* Define the trace URI */
 set_uri: function(uri) {
 this.uri = uri;
 },
 /* 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
 */
 list_obsels: function(_begin, _end, _reverse) {
 var res;
 if (typeof _begin !== 'undefined' || typeof _end !== 'undefined') {
 /*
 * Not optimized yet.
 */
 res = [];
 var l = this.obsels.length;
 for (var i = 0; i < l; i++) {
 var o = this.obsels[i];
 if ((typeof _begin !== 'undefined' && o.begin > _begin) && (typeof _end !== 'undefined' && o.end < _end)) {
 return res;
 },
 /*
 * Return the obsel of this trace identified by the URI, or undefined
 */
 get_obsel: function(id) {
 for (var i = 0; i < this.obsels.length; i++) {
 /* FIXME: should check against variations of id/uri, take this.baseuri into account */
 if (this.obsels[i].uri === id) {
 return this.obsels[i];
 }
 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;
 }
 };
 var Trace = function(uri, requestmode) {
 /* FIXME: We could/should use a sorted list such as
 http://closure-library.googlecode.com/svn/docs/class_goog_structs_AvlTree.html
 to speed up queries based on time */
 this.obsels = [];
 /* Trace URI */
 if (uri === undefined)
 uri = "";
 this.uri = uri;
 };
 Trace.prototype = Trace_prototype;
 var Obsel_prototype = {
 /* The following attributes are here for documentation
 * purposes. They MUST be defined in the constructor
 * function. */
 trace: undefined,
 type: undefined,
 begin: undefined,
 end: undefined,
 subject: undefined,
 },
 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;
 },
 },
 list_relating_obsels: function (rt) {
 /* FIXME: not implemented yet */
 },
 /*
 * Return the value of the given attribute type for this obsel
 */
 get_attribute_value: function(at) {
 if (typeof at === "string")
 /* It is a URI */
 return this.attributes[at];
 else
 del_related_obsel: function(rt, value) {
 /* FIXME: not implemented yet */
 },
 /*
 * Return a JSON representation of the obsel
 */
 toJSON: function() {
 var r = {
 "@id": this.id,
 "@type": this.type,
 "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;
 }
 }
 Obsel.prototype = Obsel_prototype;
 var TraceManager_prototype = {
 traces: [],
 /*
 * Return the trace with id name
 * If it was not registered, return undefined.
 */
 get_trace: function(name) {
 return this.traces[name];
 },
 /*
 * Explicitly create and initialize a new trace with the given name.
 * The optional uri parameter allows to initialize the trace URI.
 *
 * If another existed with the same name before, then it is replaced by a new one.
 */
 init_trace: function(name, params)
 {
 if (window.console) window.console.log("init_trace", params);
 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;
 }
 };
 var TraceManager = function() {
 this.traces = {};
 };
 TraceManager.prototype = TraceManager_prototype;
-var tracemanager  = new TraceManager();
+var tracemanager = new TraceManager();
 return tracemanager;
 };

metadataplayer