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

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

14 Apr '15

Author: ygrego Date: 2015-04-14 12:00:15 +0000 (Tue, 14 Apr 2015) New Revision: 1164 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1164 Log: Reset results and cached results in method "abort". Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-14 10:36:52 UTC (rev 1163) +++ oipf/js/impl/model/SearchResults.js 2015-04-14 12:00:15 UTC (rev 1164) @@ -169,6 +169,8 @@ this._search._removeConstraints(); this._search._removeQuery(); this._search._removeOrdering(); + this._cachedResults.length = 0; + this.length = 0; }, _getResultFromInterval: function() {

1 0

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

14 Apr '15

Author: ygrego Date: 2015-04-14 10:36:52 +0000 (Tue, 14 Apr 2015) New Revision: 1163 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1163 Log: Reset the array "ratings". Modified: oipf/js/impl/model/MetadataSearch.js Modified: oipf/js/impl/model/MetadataSearch.js =================================================================== --- oipf/js/impl/model/MetadataSearch.js 2015-04-14 10:32:24 UTC (rev 1162) +++ oipf/js/impl/model/MetadataSearch.js 2015-04-14 10:36:52 UTC (rev 1163) @@ -293,7 +293,7 @@ this._constraints.ratings.push(rating); } else if (this._constraints.ratings) { - this._constraints.ratings = []; + this._constraints.ratings.length = 0; } },

1 0

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

14 Apr '15

Author: ygrego Date: 2015-04-14 10:32:24 +0000 (Tue, 14 Apr 2015) New Revision: 1162 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1162 Log: Condition changement. Modified: oipf/js/impl/model/MetadataSearch.js Modified: oipf/js/impl/model/MetadataSearch.js =================================================================== --- oipf/js/impl/model/MetadataSearch.js 2015-04-14 09:03:21 UTC (rev 1161) +++ oipf/js/impl/model/MetadataSearch.js 2015-04-14 10:32:24 UTC (rev 1162) @@ -177,7 +177,7 @@ throw new TypeError("Insufficient number of arguments."); } - if (!(typeof channel === "object") || + if (!(channel instanceof Channel) || (startTime && !Number.isInteger(startTime)) || (count && !Number.isInteger(count))) { throw new TypeError

1 0

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

14 Apr '15

Author: ygrego Date: 2015-04-14 09:03:21 +0000 (Tue, 14 Apr 2015) New Revision: 1161 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1161 Log: Addition of a verification on parameter of method "addChannelConstraint". And simplification of the constraint addition. Modified: oipf/js/impl/model/MetadataSearch.js Modified: oipf/js/impl/model/MetadataSearch.js =================================================================== --- oipf/js/impl/model/MetadataSearch.js 2015-04-14 08:14:05 UTC (rev 1160) +++ oipf/js/impl/model/MetadataSearch.js 2015-04-14 09:03:21 UTC (rev 1161) @@ -238,21 +238,33 @@ * */ addChannelConstraint: function(channels) { - if (channels) { - if (channels.length) { - for (var i = 0, l = channels.length; i <= l; i++) { - this._constraints.channels && - this._constraints.channels.push(channels[i]); - } - } else { - this._constraints.channels && - this._constraints.channels.push(channels); - } + var parameters = arguments; + + if (parameters.length > 1) { + throw new TypeError("Excessive number of arguments."); + } + + if (parameters.length < 1) { + throw new TypeError("Insufficient number of arguments."); + } + + if (!channels) { + this._constraints.channels.length = 0; - } else if (this._constraints.channels) { - this._constraints.channels = []; + } else if (!(channels instanceof ChannelList) && + !(channels instanceof Channel) || channels != null) { + + throw new TypeError + ("This function cannot be called with this argument."); + } + if (this._constraints.channels) { + this._constraints.channels = + this._constraints.channels.concat(channels); + + } + }, /*

1 0

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

14 Apr '15

Author: ygrego Date: 2015-04-14 08:14:05 +0000 (Tue, 14 Apr 2015) New Revision: 1160 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1160 Log: The method "setQuery" verifies some criteria on its parameter. Modified: oipf/js/impl/model/MetadataSearch.js Modified: oipf/js/impl/model/MetadataSearch.js =================================================================== --- oipf/js/impl/model/MetadataSearch.js 2015-04-14 07:40:10 UTC (rev 1159) +++ oipf/js/impl/model/MetadataSearch.js 2015-04-14 08:14:05 UTC (rev 1160) @@ -202,7 +202,23 @@ * -query: The query terms to be used. * */ - setQuery: function(query){ + setQuery: function(query) { + var parameters = arguments; + + if (parameters.length > 1) { + throw new TypeError("Excessive number of arguments."); + } + + if (parameters.length < 1) { + throw new TypeError("Insufficient number of arguments."); + } + + if (!(query instanceof Query)) { + + throw new TypeError + ("This function cannot be called with this argument."); + + } this._currentQuery = query; },

1 0

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

14 Apr '15

Author: ygrego Date: 2015-04-14 07:40:10 +0000 (Tue, 14 Apr 2015) New Revision: 1159 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1159 Log: The method "getResults" has been modified, some parts are performed by using methods. Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-13 09:23:12 UTC (rev 1158) +++ oipf/js/impl/model/SearchResults.js 2015-04-14 07:40:10 UTC (rev 1159) @@ -67,6 +67,16 @@ }, + _methodToCall: { + 0: "equals", + 1: "notEquals", + 2: "superior", + 3: "superiorOrEquals", + 4: "inferior", + 5: "inferiorOrEquals", + 6: "contains" + }, + /* * Description: * Perform the search and retrieve the specified subset of the items that match the query. @@ -86,14 +96,14 @@ throw new TypeError("Insufficient number of arguments"); } - if (!offset || !count || - !Number.isInteger(offset) || + if (!Number.isInteger(offset) || !Number.isInteger(count)) { throw new TypeError ("This function cannot be called with these arguments."); } this.offset = offset; + this._count = count; var self = this; var programmes = this._search._searchManager._metadata.programmes; @@ -101,25 +111,8 @@ * Verify some conditions before beginning of * search. */ - if (this._search._currentQuery && programmes && offset != null && count != null) { + if (this._search._currentQuery && programmes) { - var getResultFromInterval = function(count) { - self.length = 0; - if (self._cachedResults) { - - for (var i = self.offset, l = count; i < l; i++) { - var programme = self._cachedResults[i]; - if (programme) { - self.push(programme); - } else { - self._fireEvent(createCustomEvent("MetadataSearch", - [self._search, - self.SEARCH_CANNOT_BE_COMPLETED])); - break; - } - } - } - }; /* * A verification must be done on the presence of cached results * in order to not restart a complete search when @@ -128,115 +121,14 @@ if (this._cachedResults.length != 0) { this._timeout() - .then(getResultFromInterval.bind(null, count)); + .then(this._getResultFromInterval.bind(this)); } else { - - if (this.isValidField(this._search._currentQuery._field) && - this.isValidComparator( - this._search._currentQuery._comparison)) { - - var loop = function (context, count){ - var time = new Date().getTime(); - 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 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)) { - - context._cachedResults.push(programme); - continue; - } - - if (constraints.length == 0) { - - context._cachedResults.push(programme); - // - } - } - } - }; - - 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() -// .then(function(){ -// getResultFromInterval(count); -// }); -// } - - - } else { - this._fireEvent(createCustomEvent("MetadataSearch", - [this._search, this.SEARCH_CANNOT_BE_COMPLETED])); - } + this._timeout() + .then(this.begin.bind(this, programmes)) + .then(this._timeout) + .then(this._getResultFromInterval.bind(this)); } } else { @@ -247,6 +139,21 @@ return false; }, + begin: function(programmes) { + /* + * When the search corresponds to current programme + * the code differs from other usual query. + */ + if (this._search._currentQuery._type == "current") { + + this._getCurrentProgramme(programmes); + + } else { + + this._getAnyProgramme(programmes); + } + }, + /* * Description: * Abort any outstanding request for results and remove any query, constraints or ordering @@ -264,6 +171,83 @@ this._search._removeOrdering(); }, + _getResultFromInterval: function() { + this.length = 0; + if (this._cachedResults) { + + for (var i = this.offset, l = this._count; i < l; i++) { + var programme = this._cachedResults[i]; + if (programme) { + this.push(programme); + + } else { + console.log("[Info]No results found."); + } + } + this._fireEvent(createCustomEvent("MetadataSearch", + [this._search, this.SEARCH_FINISHED])); + this.totalSize = this._cachedResults.length; + } + }, + + _getAnyProgramme: function(programmes) { + var field = this._search._currentQuery._field; + var comparison = this._search._currentQuery._comparison; + var value = this._search._currentQuery._value; + var methodName = this._methodToCall[comparison]; + + for (var i = 0, l = programmes.length; i < l; i++) { + var programme = programmes[i]; + if (programme[field] && methodName && + oipf.utils[methodName].call(null, programme[field], value)) { + + var constraints = this._search. + _constraints.channels; + + var next = true; + + if (constraints.length > 0 && + oipf.utils.isPresent(constraints, programme.channel.name)) { + + this._cachedResults.push(programme); + var next = false; + } + + if (next && constraints.length == 0) { + + this._cachedResults.push(programme); + + } + } + } + }, + + _getCurrentProgramme: function(programmes) { + var time = new Date().getTime(); + var constraints = this._search. + _constraints.channels; + + for (var i = 0, l = programmes.length; i < l; i++) { + var programme = programmes[i]; + + if (constraints.length > 0 && + oipf.utils.isPresent(constraints, programme.channel.name) && + programme.duration) { + + var stopTime = programme.startTime + + programme.duration*1000; + var self = this; + + if (time >= programme.startTime && time <= stopTime) { + + this._cachedResults.push(programme); + + i = l; + } + } + } + }, + /* * Description: * Return the item at position index in the collection of currently available results, or

1 0

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

13 Apr '15

Author: ygrego Date: 2015-04-13 09:23:12 +0000 (Mon, 13 Apr 2015) New Revision: 1158 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1158 Log: Verification on parameter type for method "getResults". Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-13 08:43:03 UTC (rev 1157) +++ oipf/js/impl/model/SearchResults.js 2015-04-13 09:23:12 UTC (rev 1158) @@ -86,6 +86,13 @@ throw new TypeError("Insufficient number of arguments"); } + if (!offset || !count || + !Number.isInteger(offset) || + !Number.isInteger(count)) { + throw new TypeError + ("This function cannot be called with these arguments."); + } + this.offset = offset; var self = this; var programmes = this._search._searchManager._metadata.programmes;

1 0

r1157 - oipf/data
by ygrego＠users.nuiton.org 13 Apr '15

13 Apr '15

Author: ygrego Date: 2015-04-13 08:43:03 +0000 (Mon, 13 Apr 2015) New Revision: 1157 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1157 Log: Deletion of severals calls to "console.log". Modified: oipf/data/XmlTvData.js Modified: oipf/data/XmlTvData.js =================================================================== --- oipf/data/XmlTvData.js 2015-04-13 08:40:48 UTC (rev 1156) +++ oipf/data/XmlTvData.js 2015-04-13 08:43:03 UTC (rev 1157) @@ -57,11 +57,10 @@ createProgramme(element, programme, key); } else { if (key == "-start") { - element = this.transformInSecondSince01011970(element); + element = self.transformInSecondSince01011970(element); } if (key == "-channel") { channelName = self.channelNameMap[element]; - console.log(channelName); } if (key == "#text") { key = parentKey+key; @@ -81,7 +80,6 @@ programme.channel = this.initChannel(channelName); this.programmes.push(programme); } - console.log(this.programmes); }, initChannel: function(name){ @@ -93,7 +91,6 @@ var tmpDate = wrongDateFormat; tmpDate = pattern.exec(tmpDate); - console.log(tmpDate); var dateTmp = new Date(); /*year = parseInt(tmpSSTime[1]);

1 0

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

13 Apr '15

Author: ygrego Date: 2015-04-13 08:40:48 +0000 (Mon, 13 Apr 2015) New Revision: 1156 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1156 Log: Addition of a new test in "testsObjects". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-04-13 08:39:53 UTC (rev 1155) +++ oipf/js/test/Test.js 2015-04-13 08:40:48 UTC (rev 1156) @@ -380,6 +380,10 @@ { label: "Create a query with its last parameters.", method: "testCreateQueryWithValueArgumentNull" + }, + { + label: "Abort a search.", + method: "testAbortWhileProgrammesSearchWithoutConstraints" } ] }],

1 0

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

13 Apr '15

Author: ygrego Date: 2015-04-13 08:39:53 +0000 (Mon, 13 Apr 2015) New Revision: 1155 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1155 Log: The method "findProgrammesFromStream" performs a verification on its parameters. Modified: oipf/js/impl/model/MetadataSearch.js Modified: oipf/js/impl/model/MetadataSearch.js =================================================================== --- oipf/js/impl/model/MetadataSearch.js 2015-04-13 08:02:39 UTC (rev 1154) +++ oipf/js/impl/model/MetadataSearch.js 2015-04-13 08:39:53 UTC (rev 1155) @@ -168,6 +168,22 @@ * */ findProgrammesFromStream: function(channel, startTime, count) { + var parameters = arguments; + if (parameters.length > 3) { + throw new TypeError("Excessive number of arguments."); + } + + if (parameters.length < 1) { + throw new TypeError("Insufficient number of arguments."); + } + + if (!(typeof channel === "object") || + (startTime && !Number.isInteger(startTime)) || + (count && !Number.isInteger(count))) { + throw new TypeError + ("This function cannot be called with these arguments."); + } + console.log("[INFO]: findProgrammesFromStream [IN]"); this.addChannelConstraint(channel); this._currentQuery = new Query("startTime", 0, startTime, count);

1 0