- Sandbox-commits - mailman.cloud.codelutin.com

r1154 - oipf/js/impl/model
by ygrego＠users.nuiton.org 13 Apr '15

13 Apr '15

Author: ygrego Date: 2015-04-13 08:02:39 +0000 (Mon, 13 Apr 2015) New Revision: 1154 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1154 Log: Modification of loop("for") incrementation. Modified: oipf/js/impl/model/MetadataSearch.js Modified: oipf/js/impl/model/MetadataSearch.js =================================================================== --- oipf/js/impl/model/MetadataSearch.js 2015-04-13 07:59:43 UTC (rev 1153) +++ oipf/js/impl/model/MetadataSearch.js 2015-04-13 08:02:39 UTC (rev 1154) @@ -208,7 +208,7 @@ addChannelConstraint: function(channels) { if (channels) { if (channels.length) { - for (var i = 0, l = channels.length; i <= l; i + 1) { + for (var i = 0, l = channels.length; i <= l; i++) { this._constraints.channels && this._constraints.channels.push(channels[i]); } @@ -335,7 +335,7 @@ _removeConstraints: function() { var keys = Object.keys(this._constraints); - for (var i = 0, l = keys.length; i < l; i + 1) { + for (var i = 0, l = keys.length; i < l; i++) { var constraint = this._constraints[keys[i]]; if (constraint instanceof Array) { constraint.length = 0;

1 0

r1153 - oipf/js/test
by ygrego＠users.nuiton.org 13 Apr '15

13 Apr '15

Author: ygrego Date: 2015-04-13 07:59:43 +0000 (Mon, 13 Apr 2015) New Revision: 1153 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1153 Log: Just transform a line in comment. Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-13 07:57:45 UTC (rev 1152) +++ oipf/js/test/SearchManagerTest.js 2015-04-13 07:59:43 UTC (rev 1153) @@ -275,11 +275,12 @@ var offset = 0; var count = 6; metadataSearch.result.getResults(offset, count); +// //Must return undefined else wrong implementation of getResults method +// console.log(metadataSearch.result[0]); metadataSearch.result.abort(); resolve(); -// //Must return undefined else wrong implementation of getResults method -// console.log(metaDataSearch.result[0]); + this.searchManagerObj.onMetadataSearch = function(search, state) { console.log("[INFO]: onMetadataSearch called"); @@ -308,8 +309,6 @@ } }; - this.vidBroadObj.bindToCurrentChannel(); - }, testGetCurrentProgrammeFromNullStream: function (resolve, reject) {

1 0

r1152 - oipf/js/impl/model
by ygrego＠users.nuiton.org 13 Apr '15

13 Apr '15

Author: ygrego Date: 2015-04-13 07:57:45 +0000 (Mon, 13 Apr 2015) New Revision: 1152 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1152 Log: The method "abort" calls three methods in order to remove the current search. Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-10 21:08:56 UTC (rev 1151) +++ oipf/js/impl/model/SearchResults.js 2015-04-13 07:57:45 UTC (rev 1152) @@ -132,7 +132,6 @@ var loop = function (context, count){ var time = new Date().getTime(); for (var i = 0; i< programmes.length; i++) { - console.log("Hey"); var programme = programmes[i]; var methodToCall = { 0: "equals", @@ -253,6 +252,9 @@ */ abort: function() { this._timerManager.clearTimer(); + this._search._removeConstraints(); + this._search._removeQuery(); + this._search._removeOrdering(); }, /*

1 0

r1151 - oipf/js/impl/model
by ygrego＠users.nuiton.org 10 Apr '15

10 Apr '15

Author: ygrego Date: 2015-04-10 21:08:56 +0000 (Fri, 10 Apr 2015) New Revision: 1151 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1151 Log: Implementation of methods "orderBy", "_removeConstraints", "_removeOrdering" and "_removeQuery". Modified: oipf/js/impl/model/MetadataSearch.js Modified: oipf/js/impl/model/MetadataSearch.js =================================================================== --- oipf/js/impl/model/MetadataSearch.js 2015-04-10 15:11:31 UTC (rev 1150) +++ oipf/js/impl/model/MetadataSearch.js 2015-04-10 21:08:56 UTC (rev 1151) @@ -137,6 +137,7 @@ channels: [], ratings: [] }; + this._ordering = []; }, /* @@ -286,6 +287,68 @@ } return new Query(field, comparison, value); + }, + + /* + * Description: + * Set the order in which results SHOULD be returned in future. + * Any existing search results SHALL not be re-ordered. Subsequent calls + * to orderBy() will apply further levels of ordering within the order + * defined by previous calls. + * For example: + * orderBy("ServiceName", true); + * orderBy("PublishedStart", true); + * will cause results to be ordered by service name and then by start time + * for results with the same channel number. + * + * Arguments: + * -field: The name of the field by which results SHOULD be sorted. + * A value of null indicates that any currently-set order SHALL be cleared + * and the default sort order should be used. + * + * -ascending: Flag indicating whether the results SHOULD + * be returned in ascending or descending order. + */ + orderBy: function(field, ascending) { + var parameters = arguments; + if (parameters.length != 2) { + throw new TypeError + ("Excessive number of arguments."); + } + + if ((!(typeof field === "string") && + field && + Number.isInteger(field)) || + !(typeof ascending === "boolean")) { + throw new TypeError("This function cannot be called with these arguments."); + } + + if (this._ordering) { + this._ordering.push({ + field: field, + ascending: ascending + }); + } + + }, + + _removeConstraints: function() { + + var keys = Object.keys(this._constraints); + for (var i = 0, l = keys.length; i < l; i + 1) { + var constraint = this._constraints[keys[i]]; + if (constraint instanceof Array) { + constraint.length = 0; + } + } + }, + + _removeQuery: function() { + this._currentQuery = null; + }, + + _removeOrdering: function() { + this._ordering = null; } }); \ No newline at end of file

1 0

r1150 - oipf/js/impl/model
by ygrego＠users.nuiton.org 10 Apr '15

10 Apr '15

Author: ygrego Date: 2015-04-10 15:11:31 +0000 (Fri, 10 Apr 2015) New Revision: 1150 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1150 Log: The method "getResults" has been modified so that this current search be stopped. Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-10 13:37:22 UTC (rev 1149) +++ oipf/js/impl/model/SearchResults.js 2015-04-10 15:11:31 UTC (rev 1150) @@ -125,101 +125,99 @@ } else { - var time = new Date().getTime(); if (this.isValidField(this._search._currentQuery._field) && this.isValidComparator( this._search._currentQuery._comparison)) { - for (var i = 0; i< programmes.length; i++) { - - var programme = programmes[i]; - var methodToCall = { - 0: "equals", - 1: "notEquals", - 2: "superior", - 3: "superiorOrEquals", - 4: "inferior", - 5: "inferiorOrEquals", - 6: "contains" - }; + var loop = function (context, count){ + var time = new Date().getTime(); + for (var i = 0; i< programmes.length; i++) { + console.log("Hey"); + var programme = programmes[i]; + var methodToCall = { + 0: "equals", + 1: "notEquals", + 2: "superior", + 3: "superiorOrEquals", + 4: "inferior", + 5: "inferiorOrEquals", + 6: "contains" + }; - var field = this._search._currentQuery._field; - var comparison = this._search._currentQuery._comparison; - var value = this._search._currentQuery._value; - var methodName = methodToCall[comparison]; - - /* - * When the search corresponds to current programme - * the code differs from other usual query. - */ - if (this._search._currentQuery._type == "current") { - - var constraints = this._search. - _constraints.channels; - - if (constraints.length > 0 && + var field = context._search._currentQuery._field; + var comparison = context._search._currentQuery._comparison; + var value = context._search._currentQuery._value; + var methodName = methodToCall[comparison]; + + /* + * When the search corresponds to current programme + * the code differs from other usual query. + */ + if (context._search._currentQuery._type == "current") { + + var constraints = context._search. + _constraints.channels; + + if (constraints.length > 0 && + oipf.utils.isPresent(constraints, + programme.channel.name) && + programme.duration) { + + var stopTime = programme.startTime + + programme.duration*1000; + + if (time >= programme.startTime + && time <= stopTime) { + context._timeout() + .then(function() { + self._cachedResults.push(programme); + // self.push(programme); + // self.totalSize = self.length; + }) + .then(context._timeout.bind(self, 10000)) + .then(getResultFromInterval.bind(null, count)) + .then(context._fireEvent.bind(context, + createCustomEvent("MetadataSearch", + [context._search, context.SEARCH_FINISHED]))); + break; + } + } + + } else if (programme[field] && + oipf.utils[methodName].call(null, + programme[field], value)) { + + var constraints = context._search. + _constraints.channels; + + if(constraints.length > 0 && oipf.utils.isPresent(constraints, - programme.channel.name) && - programme.duration) { - - var stopTime = programme.startTime + - programme.duration*1000; - - if (time >= programme.startTime - && time <= stopTime) { - console.log(programme); - this._timeout() - .then(function() { - self._cachedResults.push(programme); -// self.push(programme); -// self.totalSize = self.length; - console.log("[INFO] Program found."); - }) - .then(this._timeout.bind(self, 10000)) - .then(getResultFromInterval.bind(null, count)) - .then(this._fireEvent.bind(this, - createCustomEvent("MetadataSearch", - [this._search, this.SEARCH_FINISHED]))); - break; + programme.channel.name)) { + + context._cachedResults.push(programme); + continue; } + + if (constraints.length == 0) { + + context._cachedResults.push(programme); + // + } } - - } else if (programme[field] && - oipf.utils[methodName].call(null, - programme[field], value)) { - - var constraints = this._search. - _constraints.channels; + } + }; - if(constraints.length > 0 && - oipf.utils.isPresent(constraints, - programme.channel.name)) { - console.log("constraint", programme); - /* - * The results found are firstly put in a cache, - * then gathered. - */ -// this._timeout() -// .then(function() { -// self._cachedResults.push(programme); -// console.log("[INFO] Program found."); -// }); - this._cachedResults.push(programme); - continue; - } - - if (constraints.length == 0) { - - console.log("without constraint", programme); - this._cachedResults.push(programme); -// this._timeout() -// .then(function() { -// self._cachedResults.push(programme); -// console.log("[INFO] Program found."); -// }); - } + this._timeout() + .then(loop.bind(null, this, count)) + .then(function() { + if (self._search._currentQuery._type == "undifferent") { + self._timeout() + .then(getResultFromInterval.bind(null, count)) + .then(self._fireEvent.bind(self, + createCustomEvent("MetadataSearch", + [self._search, self.SEARCH_FINISHED]))); } - } + }); // if (this._search._ordering) { // this._timeout() @@ -227,14 +225,8 @@ // getResultFromInterval(count); // }); // } - if (this._search._currentQuery._type == "undifferent") { - this._timeout() - .then(getResultFromInterval.bind(null, count)) - .then(this._fireEvent.bind(this, - createCustomEvent("MetadataSearch", - [this._search, this.SEARCH_FINISHED]))); - } + } else { this._fireEvent(createCustomEvent("MetadataSearch", [this._search, this.SEARCH_CANNOT_BE_COMPLETED]));

1 0

r1149 - oipf/js/test
by ygrego＠users.nuiton.org 10 Apr '15

10 Apr '15

Author: ygrego Date: 2015-04-10 13:37:22 +0000 (Fri, 10 Apr 2015) New Revision: 1149 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1149 Log: Implementation of a new test method. Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-10 13:11:05 UTC (rev 1148) +++ oipf/js/test/SearchManagerTest.js 2015-04-10 13:37:22 UTC (rev 1149) @@ -261,6 +261,57 @@ }, + testAbortWhileProgrammesSearchWithoutConstraints: function(resolve, reject) { + var value = 3600; + var self = this; + var stat = "Pending"; + logTest("State: " + stat); + var metadataSearch = this.searchManagerObj. + createSearch(this.SCHEDULED_CONTENT); + + var query = metadataSearch.createQuery("duration", 4, value); + metadataSearch.setQuery(query); + + var offset = 0; + var count = 6; + metadataSearch.result.getResults(offset, count); + metadataSearch.result.abort(); + resolve(); +// //Must return undefined else wrong implementation of getResults method +// console.log(metaDataSearch.result[0]); + + this.searchManagerObj.onMetadataSearch = function(search, state) { + + console.log("[INFO]: onMetadataSearch called"); + + switch (state) { + + case 0: + if (self.assertEquals(search.result.length, 6)) { + console.log("[TEST-RUNNING][Info] Label: Obtain current program according to oipf norm, State: found"); + resolve(); + } else { + console.log("[TEST-RUNNING][Info] Label: Obtain current program according to oipf norm, State: not found"); + reject(); + } + break; + + case 3: + var message = "[INFO] MetadataSearch in Idle state because of either search abort or parameters have been modified (query, constraints or search target)"; + console.log(message); + break; + + default: + console.log("Unknow state"); + reject(); + + } + }; + + this.vidBroadObj.bindToCurrentChannel(); + + }, + testGetCurrentProgrammeFromNullStream: function (resolve, reject) { var self = this;

1 0

r1148 - oipf/js/impl/model
by ygrego＠users.nuiton.org 10 Apr '15

10 Apr '15

Author: ygrego Date: 2015-04-10 13:11:05 +0000 (Fri, 10 Apr 2015) New Revision: 1148 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1148 Log: Perform a verification of parameter number. Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-10 13:07:27 UTC (rev 1147) +++ oipf/js/impl/model/SearchResults.js 2015-04-10 13:11:05 UTC (rev 1148) @@ -81,6 +81,11 @@ * FIX-ME: Yannis - 08/04/2015 - Verification about results ordering constraint */ getResults: function(offset, count) { + var parameters = arguments; + if (parameters.length != 2) { + throw new TypeError("Insufficient number of arguments"); + } + this.offset = offset; var self = this; var programmes = this._search._searchManager._metadata.programmes;

1 0

r1147 - oipf/js/test
by ygrego＠users.nuiton.org 10 Apr '15

10 Apr '15

Author: ygrego Date: 2015-04-10 13:07:27 +0000 (Fri, 10 Apr 2015) New Revision: 1147 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1147 Log: A new method added. Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-10 12:53:56 UTC (rev 1146) +++ oipf/js/test/SearchManagerTest.js 2015-04-10 13:07:27 UTC (rev 1147) @@ -210,6 +210,57 @@ }, + testSearchingForProgrammesWithDurationLowerThanOneHour: function(resolve, reject) { + var self = this; + var value = 3600; + + this.addTransition(this.UNREALIZED, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + + var stat = "Pending"; + logTest("State: " + stat); + var metadataSearch = self.searchManagerObj. + createSearch(self.SCHEDULED_CONTENT); + + var query = metadataSearch.createQuery("duration", 4, + value); + metadataSearch.setQuery(query); + + var offset = 0; + var count = 6; + metadataSearch.result.getResults(offset, count); +// //Must return undefined else wrong implementation of getResults method +// console.log(metaDataSearch.result[0]); + }); + + this.searchManagerObj.onMetadataSearch = function(search, state) { + + console.log("[INFO]: onMetadataSearch called"); + + switch (state) { + + case 0: + if (self.assertEquals(search.result.length, 6)) { + console.log("[TEST-RUNNING][Info] Label: Obtain current program according to oipf norm, State: found"); + resolve(); + } else { + console.log("[TEST-RUNNING][Info] Label: Obtain current program according to oipf norm, State: not found"); + reject(); + } + break; + + default: + console.log("Unknow state"); + reject(); + + } + }; + + this.vidBroadObj.bindToCurrentChannel(); + + }, + testGetCurrentProgrammeFromNullStream: function (resolve, reject) { var self = this;

1 0

r1146 - oipf/js/impl/model
by ygrego＠users.nuiton.org 10 Apr '15

10 Apr '15

Author: ygrego Date: 2015-04-10 12:53:56 +0000 (Fri, 10 Apr 2015) New Revision: 1146 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1146 Log: Refactoring of method "getResults" and minimal implementation of method "abort". Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-10 12:51:17 UTC (rev 1145) +++ oipf/js/impl/model/SearchResults.js 2015-04-10 12:53:56 UTC (rev 1146) @@ -162,7 +162,7 @@ if (time >= programme.startTime && time <= stopTime) { - + console.log(programme); this._timeout() .then(function() { self._cachedResults.push(programme); @@ -170,20 +170,13 @@ // self.totalSize = self.length; console.log("[INFO] Program found."); }) - .then(this._timeout) + .then(this._timeout.bind(self, 10000)) .then(getResultFromInterval.bind(null, count)) - .then(this._timeout) .then(this._fireEvent.bind(this, createCustomEvent("MetadataSearch", [this._search, this.SEARCH_FINISHED]))); break; } - } else { - this._fireEvent( - createCustomEvent("MetadataSearch", - [this._search, - this.SEARCH_CANNOT_BE_COMPLETED])); - break; } } else if (programme[field] && @@ -196,17 +189,30 @@ if(constraints.length > 0 && oipf.utils.isPresent(constraints, programme.channel.name)) { - + console.log("constraint", programme); /* * The results found are firstly put in a cache, * then gathered. */ - this._timeout() - .then(function() { - self._cachedResults.push(programme); - console.log("[INFO] Program found."); - }); +// this._timeout() +// .then(function() { +// self._cachedResults.push(programme); +// console.log("[INFO] Program found."); +// }); + this._cachedResults.push(programme); + continue; } + + if (constraints.length == 0) { + + console.log("without constraint", programme); + this._cachedResults.push(programme); +// this._timeout() +// .then(function() { +// self._cachedResults.push(programme); +// console.log("[INFO] Program found."); +// }); + } } } @@ -219,7 +225,6 @@ if (this._search._currentQuery._type == "undifferent") { this._timeout() .then(getResultFromInterval.bind(null, count)) - .then(this._timeout) .then(this._fireEvent.bind(this, createCustomEvent("MetadataSearch", [this._search, this.SEARCH_FINISHED]))); @@ -250,7 +255,7 @@ * */ abort: function() { - + this._timerManager.clearTimer(); }, /*

1 0

r1145 - oipf/js/utils
by ygrego＠users.nuiton.org 10 Apr '15

10 Apr '15

Author: ygrego Date: 2015-04-10 12:51:17 +0000 (Fri, 10 Apr 2015) New Revision: 1145 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1145 Log: Moving "if" block from method "createTimer" to method "clearTimer" and call "clearTimer" in "createTimer". Modified: oipf/js/utils/TimerManager.js Modified: oipf/js/utils/TimerManager.js =================================================================== --- oipf/js/utils/TimerManager.js 2015-04-10 10:15:18 UTC (rev 1144) +++ oipf/js/utils/TimerManager.js 2015-04-10 12:51:17 UTC (rev 1145) @@ -5,21 +5,21 @@ */ var TimerManager = Class.extend({ - timer: null, - - createTimer: function(time) { - if (this.timer) { - this.timer.cancel(); - console.log("cancelTimer", this.timer.timerId); - } - this.timer = new Timeout(time); - console.log("createTimer", this.timer.timerId); - return this.timer; - }, - - clearTimer: function() { - this.timer.cancel(); - } + timer: null, + + createTimer: function(time) { + this.clearTimer(); + this.timer = new Timeout(time); + console.log("createTimer", this.timer.timerId); + return this.timer; + }, + + clearTimer: function() { + if (this.timer) { + this.timer.cancel(); + console.log("cancelTimer", this.timer.timerId); + } + } });

1 0