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

r1113 - oipf/js/impl
by ygrego＠users.nuiton.org 08 Apr '15

08 Apr '15

Author: ygrego Date: 2015-04-08 10:27:24 +0000 (Wed, 08 Apr 2015) New Revision: 1113 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1113 Log: Modification of property "_metadataManager" in constructor. Modified: oipf/js/impl/SearchManagerObject.js Modified: oipf/js/impl/SearchManagerObject.js =================================================================== --- oipf/js/impl/SearchManagerObject.js 2015-04-08 10:24:15 UTC (rev 1112) +++ oipf/js/impl/SearchManagerObject.js 2015-04-08 10:27:24 UTC (rev 1113) @@ -110,7 +110,7 @@ this._listeners = {}; this._callbacks = {}; this._eventManager = new EventManager(); - this._metadataManager = new MetadataManager(new XmlTvData()); + this._metadataManager = new MetadataManager(new XmlTvData(metadata)); this._metadata = this._metadataManager.getMetadata("XML_TV"); },

1 0

r1112 - oipf/js/impl
by ygrego＠users.nuiton.org 08 Apr '15

08 Apr '15

Author: ygrego Date: 2015-04-08 10:24:15 +0000 (Wed, 08 Apr 2015) New Revision: 1112 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1112 Log: Additon of a parameter when "_metadataManager" will be instanciated in constructor. Modified: oipf/js/impl/SearchManagerObject.js Modified: oipf/js/impl/SearchManagerObject.js =================================================================== --- oipf/js/impl/SearchManagerObject.js 2015-04-08 10:15:15 UTC (rev 1111) +++ oipf/js/impl/SearchManagerObject.js 2015-04-08 10:24:15 UTC (rev 1112) @@ -110,7 +110,7 @@ this._listeners = {}; this._callbacks = {}; this._eventManager = new EventManager(); - this._metadataManager = new MetadataManager(); + this._metadataManager = new MetadataManager(new XmlTvData()); this._metadata = this._metadataManager.getMetadata("XML_TV"); },

1 0

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

08 Apr '15

Author: ygrego Date: 2015-04-08 10:15:15 +0000 (Wed, 08 Apr 2015) New Revision: 1111 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1111 Log: Global refactoring of "main block else" in method "getResults". During the search, severals test are performed, when a programme is found this one is put in cache. At the end the expected results are gathered (extract from cache) and a event are dispatched. Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-08 09:52:39 UTC (rev 1110) +++ oipf/js/impl/model/SearchResults.js 2015-04-08 10:15:15 UTC (rev 1111) @@ -96,78 +96,107 @@ * that's not necessary. */ if (this._cachedResults) { - - var getResultFromInterval = function(count) { - this.length = 0; - - for (var i = this.offset, l = count; i < l; i++) { - var programme = this._cachedResults[i]; - if (programme) { - this.push(programme); - } else { - this.fireEvent(createCustomEvent("MetadataSearch", - [this._search, - this.SEARCH_CANNOT_BE_COMPLETED])); - break; - } + + var getResultFromInterval = function(count) { + this.length = 0; + + for (var i = this.offset, l = count; i < l; i++) { + var programme = this._cachedResults[i]; + if (programme) { + this.push(programme); + } else { + this.fireEvent(createCustomEvent("MetadataSearch", + [this._search, + this.SEARCH_CANNOT_BE_COMPLETED])); + break; } - }; + } + }; + + this._timeout + .then(getResultFromInterval.bind(null, count)); - this._timeout - .then(getResultFromInterval.bind(null, count)); - } else { if (this.isValidField(this._search._currentQuery.field) && this.isValidComparator( this._search._currentQuery.comparison)) { - var startTime = this._currentQuery.startTime; - for (var i = 0; i< programmes.length; i++) { + var programme = programmes[i]; - var date = new Date(); - /* - * The user searches information on the current program, broadcasted on the current channel. - * In this case don't need start time of program, the search must be proceeded on current time. - */ - if (startTime == null) { - if (programme.duration) { - var stopTime = startTime + programme.duration; - if (date.getTime() >= startTime && date.getTime() <= stopTime) { + var methodToCall = { + 0: "equals", + 1: "notEquals", + 2: "superior", + 3: "superiorOrEquals", + 4: "inferior", + 5: "inferiorOrEquals", + 6: "constains" + }; + + 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 date = new Date(); + if (programme.duration) { + + var stopTime = programme.startTime + + programme.duration; + + if (date.getTime() >= programme.startTime + && date.getTime() <= stopTime) { + + this._timeout + .then(function() { + this._cachedResults.push(programme); + this.push(programme); + this.totalSize = this.length; console.log("[INFO] Program found."); - // Usefull to retrieve severals programs when user wants more than one programmes information. - var currentProgramIndex = i; - break; - } + }); + break; } - - } else { //The search use the start time like a filter to retrieve the required program information. - - if (date.getTime() == startTime) { - currentProgramIndex = i; - break; } + } 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)) { + + /* + * The results found are firstly put in a cache. + */ + this._timeout + .then(function() { + this._cachedResults.push(programme); + console.log("[INFO] Program found."); + }); + } } - console.log("[INFO] Program not yet found."); } - - var self = this; - setTimeout(function() { - console.log("<<<<<<<<<<<<<<", new Date(), ">>>>>>>>>>>>>>>>", currentProgramIndex); - //When user want more than one result into his search. - if (currentProgramIndex != undefined) { - for (var i = 0; i < count; i++) { - self.push(programmes[currentProgramIndex]); - currentProgramIndex++; - } - self._search._searchManager.onMetadataSearch && self._search._searchManager.onMetadataSearch(self._search, 0); - } else { - self._search._searchManager.onMetadataSearch && self._search._searchManager.onMetadataSearch(self._search, 4); - } - - }, 0); + if (this._search._ordering) { + this._timeout + .then(function(){ + getResultFromInterval.bind(null, count); + }); + } else { + this._timeout + .then(getResultFromInterval.bind(null, count)); + } + } else { this._fireEvent(createCustomEvent("MetadataSearch", [this._search, this.SEARCH_CANNOT_BE_COMPLETED]));

1 0

r1110 - oipf/js/impl
by ygrego＠users.nuiton.org 08 Apr '15

08 Apr '15

Author: ygrego Date: 2015-04-08 09:52:39 +0000 (Wed, 08 Apr 2015) New Revision: 1110 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1110 Log: Change condition test because the previous created a wrong behaviour of method "createSearch". Modified: oipf/js/impl/SearchManagerObject.js Modified: oipf/js/impl/SearchManagerObject.js =================================================================== --- oipf/js/impl/SearchManagerObject.js 2015-04-08 09:33:07 UTC (rev 1109) +++ oipf/js/impl/SearchManagerObject.js 2015-04-08 09:52:39 UTC (rev 1110) @@ -135,7 +135,7 @@ */ createSearch: function(searchTarget) { - if (searchTarget === (1 || 2)) { + if (searchTarget === 2 || searchTarget === 1) { return new MetadataSearch(searchTarget, this); } },

1 0

r1109 - oipf/js/test
by ygrego＠users.nuiton.org 08 Apr '15

08 Apr '15

Author: ygrego Date: 2015-04-08 09:33:07 +0000 (Wed, 08 Apr 2015) New Revision: 1109 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1109 Log: Addition of new tests in "testsObjects" about method "createSearch" of "SearchManagerObject". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-04-08 09:25:14 UTC (rev 1108) +++ oipf/js/test/Test.js 2015-04-08 09:33:07 UTC (rev 1109) @@ -321,6 +321,18 @@ method: "testCreateSearchForScheduledContent" }, { + label: "Verify the right creation of search object about content on demand.", + method: "testCreateSearchForContentOnDemand" + }, + { + label: "Call method 'createSearch' with parameter equals to null.", + method: "testCreateSearchWithNull" + }, + { + label: "Call method 'createSearch' with a String parameter.", + method: "testCreateSearchWithString" + }, + { label: "Obtain current program according to oipf norm.", method: "testGetCurrentProgram" }

1 0

r1108 - oipf/js/test
by ygrego＠users.nuiton.org 08 Apr '15

08 Apr '15

Author: ygrego Date: 2015-04-08 09:25:14 +0000 (Wed, 08 Apr 2015) New Revision: 1108 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1108 Log: Addition of new tests about "createSearch". Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-08 09:16:38 UTC (rev 1107) +++ oipf/js/test/SearchManagerTest.js 2015-04-08 09:25:14 UTC (rev 1108) @@ -7,6 +7,8 @@ SCHEDULED_CONTENT: 1, + CONTENT_ON_DEMAND: 2, + UNREALIZED: 0, CONNECTING: 1, @@ -152,5 +154,40 @@ } else { reject(); } + }, + + testCreateSearchForContentOnDemand: function(resolve, reject) { + this.metadataSearch = this.searchManagerObj. + createSearch(this.CONTENT_ON_DEMAND); + + if (this.assertNotNull(this.metadataSearch) && + this.assertEquals(this.metadataSearch.searchTarget, + this.CONTENT_ON_DEMAND)) { + resolve(); + } else { + reject(); + } + }, + + testCreateSearchWithNull: function(resolve, reject) { + this.metadataSearch = this.searchManagerObj. + createSearch(null); + + if (!this.assertNotNull(this.metadataSearch)) { + resolve(); + } else { + reject(); + } + }, + + testCreateSearchWithString: function(resolve, reject) { + this.metadataSearch = this.searchManagerObj. + createSearch("1"); + + if (!this.assertNotNull(this.metadataSearch)) { + resolve(); + } else { + reject(); + } } }); \ No newline at end of file

1 0

r1107 - oipf/js/impl
by ygrego＠users.nuiton.org 08 Apr '15

08 Apr '15

Author: ygrego Date: 2015-04-08 09:16:38 +0000 (Wed, 08 Apr 2015) New Revision: 1107 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1107 Log: The condition test into method "createSearch" use operator "===" in order to prevent any possible errors concerning method parameter. Modified: oipf/js/impl/SearchManagerObject.js Modified: oipf/js/impl/SearchManagerObject.js =================================================================== --- oipf/js/impl/SearchManagerObject.js 2015-04-08 09:12:35 UTC (rev 1106) +++ oipf/js/impl/SearchManagerObject.js 2015-04-08 09:16:38 UTC (rev 1107) @@ -135,7 +135,7 @@ */ createSearch: function(searchTarget) { - if (searchTarget == (1 || 2)) { + if (searchTarget === (1 || 2)) { return new MetadataSearch(searchTarget, this); } },

1 0

r1106 - oipf/js/impl
by ygrego＠users.nuiton.org 08 Apr '15

08 Apr '15

Author: ygrego Date: 2015-04-08 09:12:35 +0000 (Wed, 08 Apr 2015) New Revision: 1106 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1106 Log: The method "createSearch" return a instance of "Metadasearch" only if its argument corresponds to one of expected values. Modified: oipf/js/impl/SearchManagerObject.js Modified: oipf/js/impl/SearchManagerObject.js =================================================================== --- oipf/js/impl/SearchManagerObject.js 2015-04-08 08:56:36 UTC (rev 1105) +++ oipf/js/impl/SearchManagerObject.js 2015-04-08 09:12:35 UTC (rev 1106) @@ -135,7 +135,9 @@ */ createSearch: function(searchTarget) { - return new MetadataSearch(searchTarget, this); + if (searchTarget == (1 || 2)) { + return new MetadataSearch(searchTarget, this); + } }, /*

1 0

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

08 Apr '15

Author: ygrego Date: 2015-04-08 08:56:36 +0000 (Wed, 08 Apr 2015) New Revision: 1105 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1105 Log: Affectation of "_searchManager" is done firstly because this one will be useful for instanciation of "result" just after. Modified: oipf/js/impl/model/MetadataSearch.js Modified: oipf/js/impl/model/MetadataSearch.js =================================================================== --- oipf/js/impl/model/MetadataSearch.js 2015-04-08 08:45:08 UTC (rev 1104) +++ oipf/js/impl/model/MetadataSearch.js 2015-04-08 08:56:36 UTC (rev 1105) @@ -130,9 +130,9 @@ searchTarget: null, init: function(searchTarget, searchManager) { + this._searchManager = searchManager; this.result = new SearchResults(this); this.searchTarget = searchTarget; - this._searchManager = searchManager; this._constraints = { channels: [], ratings: []

1 0

r1104 - oipf/js/test
by ygrego＠users.nuiton.org 08 Apr '15

08 Apr '15

Author: ygrego Date: 2015-04-08 08:45:08 +0000 (Wed, 08 Apr 2015) New Revision: 1104 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1104 Log: Add a new test in "testsObjects". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-04-08 08:39:41 UTC (rev 1103) +++ oipf/js/test/Test.js 2015-04-08 08:45:08 UTC (rev 1104) @@ -317,6 +317,10 @@ object: new SearchManagerTest(), tests: [ { + label: "Verify the right creation of search object.", + method: "testCreateSearchForScheduledContent" + }, + { label: "Obtain current program according to oipf norm.", method: "testGetCurrentProgram" }

1 0