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

r1084 - oipf/data
by ygrego＠users.nuiton.org 07 Apr '15

07 Apr '15

Author: ygrego Date: 2015-04-07 09:07:13 +0000 (Tue, 07 Apr 2015) New Revision: 1084 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1084 Log: Addition of a "if" condition in method "createProgramme" in order to convert a time in seconds. Modified: oipf/data/XmlTvData.js Modified: oipf/data/XmlTvData.js =================================================================== --- oipf/data/XmlTvData.js 2015-04-07 08:23:25 UTC (rev 1083) +++ oipf/data/XmlTvData.js 2015-04-07 09:07:13 UTC (rev 1084) @@ -65,6 +65,9 @@ } if (key == "#text") { key = parentKey+key; + if (key == "length#text") { + element = self.minutesToSeconds(element); + } } else { var mapping = self.map[key]; if (mapping) {

1 0

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

07 Apr '15

Author: ygrego Date: 2015-04-07 08:23:25 +0000 (Tue, 07 Apr 2015) New Revision: 1083 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1083 Log: The method "getResults" has been modifed in order to perform the search only at some conditions. Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-07 08:15:36 UTC (rev 1082) +++ oipf/js/impl/model/SearchResults.js 2015-04-07 08:23:25 UTC (rev 1083) @@ -128,8 +128,10 @@ } }, 0); + } else { - this._fireEvent(createCustomEvent("MetadataSearch", [this.playState, error])); + this._fireEvent(createCustomEvent("MetadataSearch", + [this._search, this.SEARCH_CANNOT_BE_COMPLETED])); } return false;

1 0

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

07 Apr '15

Author: ygrego Date: 2015-04-07 08:15:36 +0000 (Tue, 07 Apr 2015) New Revision: 1082 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1082 Log: New properties added: "SEARCH_FINISHED", "SEARCH_MODIFIED", "SEARCH_CANNOT_BE_COMPLETED". Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-07 08:07:27 UTC (rev 1081) +++ oipf/js/impl/model/SearchResults.js 2015-04-07 08:15:36 UTC (rev 1082) @@ -15,7 +15,13 @@ * access the results in this collection. */ var SearchResults = Array.extend({ - + + SEARCH_FINISHED: 0, + + SEARCH_MODIFIED: 3, + + SEARCH_CANNOT_BE_COMPLETED: 4, + /* * Description: * The number of items in the current window within the overall result set. The value of this property SHALL be @@ -123,7 +129,7 @@ }, 0); } else { - + this._fireEvent(createCustomEvent("MetadataSearch", [this.playState, error])); } return false;

1 0

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

07 Apr '15

Author: ygrego Date: 2015-04-07 08:07:27 +0000 (Tue, 07 Apr 2015) New Revision: 1081 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1081 Log: A copy for method "_fireEvent" of "SearchManagerObject" named "_fireEvent" is created in constructor. Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-07 08:00:37 UTC (rev 1080) +++ oipf/js/impl/model/SearchResults.js 2015-04-07 08:07:27 UTC (rev 1081) @@ -53,6 +53,9 @@ this._search = search; this.lentgh = 0; this.totalSize = 0; + this._fireEvent = this._search._searchManager + ._fireEvent.bind(this._search._searchManager); + }, /*

1 0

r1080 - oipf/js/impl
by ygrego＠users.nuiton.org 07 Apr '15

07 Apr '15

Author: ygrego Date: 2015-04-07 08:00:37 +0000 (Tue, 07 Apr 2015) New Revision: 1080 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1080 Log: Addition of following methods: "addEventListener", "removeEventListener" and "_fireEvent". Modified: oipf/js/impl/SearchManagerObject.js Modified: oipf/js/impl/SearchManagerObject.js =================================================================== --- oipf/js/impl/SearchManagerObject.js 2015-04-07 07:57:34 UTC (rev 1079) +++ oipf/js/impl/SearchManagerObject.js 2015-04-07 08:00:37 UTC (rev 1080) @@ -89,6 +89,7 @@ _metadataManager: null, init: function() { + this._eventManager = new EventManager(); this._metadataManager = new MetadataManager(); this._metadata = this._metadataManager.getMetadata("XML_TV"); }, @@ -130,6 +131,18 @@ */ getChannelConfig: function() { return oipfObjectFactory.createChannelConfig(); + }, + + addEventListener: function(type, listener) { + this._eventManager.addEventListener(type, listener, this); + }, + + _fireEvent: function(event) { + this._eventManager.fireEvent(event, this); + }, + + removeEventListener: function(type, listener) { + this._eventManager.removeEventListener(type, listener, this); } });

1 0

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

07 Apr '15

Author: ygrego Date: 2015-04-07 07:57:34 +0000 (Tue, 07 Apr 2015) New Revision: 1079 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1079 Log: Addition of following properties: "_timerManager", "_timeout". Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-03 14:50:18 UTC (rev 1078) +++ oipf/js/impl/model/SearchResults.js 2015-04-07 07:57:34 UTC (rev 1079) @@ -48,6 +48,8 @@ _search: null, init: function(search) { + this._timerManager = new TimerManager(); + this._timeout = this._timerManager.createTimer.bind(this._timerManager, 0); this._search = search; this.lentgh = 0; this.totalSize = 0; @@ -71,51 +73,55 @@ var programmes = this._search._searchManager._metadata; - var startTime = this._currentQuery.startTime; + if (this._currentQuery && programmes) { + var startTime = this._currentQuery.startTime; - for (var i = 0; i< programmes.length; i++) { - var programme = programmes[i]; - var currentDate = 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 (currentDate.getTime() >= startTime && currentDate.getTime() <= stopTime) { - console.log("[INFO] Program found."); - // Usefull to retrieve severals programs when user wants more than one programmes information. - var currentProgramIndex = i; - break; + for (var i = 0; i< programmes.length; i++) { + var programme = programmes[i]; + var currentDate = 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 (currentDate.getTime() >= startTime && currentDate.getTime() <= stopTime) { + console.log("[INFO] Program found."); + // Usefull to retrieve severals programs when user wants more than one programmes information. + var currentProgramIndex = i; + break; + } } - } - } else { //The search use the start time like a filter to retrieve the required program information. + } else { //The search use the start time like a filter to retrieve the required program information. - if (currentDate.getTime() == startTime) { - currentProgramIndex = i; - break; + if (currentDate.getTime() == startTime) { + currentProgramIndex = i; + break; + } } + console.log("[INFO] Program not yet 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++; + + 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); } - self._search._searchManager.onMetadataSearch && self._search._searchManager.onMetadataSearch(self._search, 0); - } else { - self._search._searchManager.onMetadataSearch && self._search._searchManager.onMetadataSearch(self._search, 4); - } + + }, 0); + } else { - }, 0); + } return false; },

1 0

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

03 Apr '15

Author: ygrego Date: 2015-04-03 14:50:18 +0000 (Fri, 03 Apr 2015) New Revision: 1078 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1078 Log: Deletion of property "_currentQuery". Constructor set property "_search" with his argument. Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-03 14:41:38 UTC (rev 1077) +++ oipf/js/impl/model/SearchResults.js 2015-04-03 14:50:18 UTC (rev 1078) @@ -47,10 +47,8 @@ _search: null, - _currentQuery: null, - - init: function(currentQuery) { - this._currentQuery = currentQuery; + init: function(search) { + this._search = search; this.lentgh = 0; this.totalSize = 0; },

1 0

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

03 Apr '15

Author: ygrego Date: 2015-04-03 14:41:38 +0000 (Fri, 03 Apr 2015) New Revision: 1077 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1077 Log: Instanciation of "result" is done in constructor. Modified: oipf/js/impl/model/MetadataSearch.js Modified: oipf/js/impl/model/MetadataSearch.js =================================================================== --- oipf/js/impl/model/MetadataSearch.js 2015-04-03 14:39:12 UTC (rev 1076) +++ oipf/js/impl/model/MetadataSearch.js 2015-04-03 14:41:38 UTC (rev 1077) @@ -130,6 +130,7 @@ searchTarget: null, init: function(searchTarget, searchManager) { + this.result = new SearchResults(this); this.searchTarget = searchTarget; this._searchManager = searchManager; this._constraints = {

1 0

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

03 Apr '15

Author: ygrego Date: 2015-04-03 14:39:12 +0000 (Fri, 03 Apr 2015) New Revision: 1076 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1076 Log: Modification of method "findProgrammesFromStream": call to method "addChannelConstraint" and instanciation of "_currentQuery". Modified: oipf/js/impl/model/MetadataSearch.js Modified: oipf/js/impl/model/MetadataSearch.js =================================================================== --- oipf/js/impl/model/MetadataSearch.js 2015-04-03 14:31:21 UTC (rev 1075) +++ oipf/js/impl/model/MetadataSearch.js 2015-04-03 14:39:12 UTC (rev 1076) @@ -167,9 +167,8 @@ */ findProgrammesFromStream: function(channel, startTime, count) { console.log("[INFO]: findProgrammesFromStream [IN]"); - var currentQuery = new Query(channel, startTime, count); - this.result = new SearchResults(currentQuery); - this.result._search = this; + this.addChannelConstraint(channel); + this._currentQuery = new Query("Programme.startTime", 0, startTime, count); console.log("[INFO]: findProgrammesFromStream [Out]"); },

1 0

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

03 Apr '15

Author: ygrego Date: 2015-04-03 14:31:21 +0000 (Fri, 03 Apr 2015) New Revision: 1075 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1075 Log: New methods: "createQuery". Modified: oipf/js/impl/model/MetadataSearch.js Modified: oipf/js/impl/model/MetadataSearch.js =================================================================== --- oipf/js/impl/model/MetadataSearch.js 2015-04-03 13:55:15 UTC (rev 1074) +++ oipf/js/impl/model/MetadataSearch.js 2015-04-03 14:31:21 UTC (rev 1075) @@ -260,6 +260,18 @@ */ addCurrentRatingConstraint: function() { + }, + + /* + * Description: + * Create a metadata query for a specific value in a specific + * field within the metadata. Simple queries MAY be combined to + * create more complex queries. Applications SHALL follow the + * JavaScript type conversion rules to convert non-string values + * into their string representation, if necessary. + */ + createQuery: function(field, comparison, value) { + return new Query(field, comparison, value); } }); \ No newline at end of file

1 0