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

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

03 Apr '15

Author: ygrego Date: 2015-04-03 13:25:54 +0000 (Fri, 03 Apr 2015) New Revision: 1073 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1073 Log: An essential verification is done in "addChannelConstraint". Modified: oipf/js/impl/model/MetadataSearch.js Modified: oipf/js/impl/model/MetadataSearch.js =================================================================== --- oipf/js/impl/model/MetadataSearch.js 2015-04-03 13:10:50 UTC (rev 1072) +++ oipf/js/impl/model/MetadataSearch.js 2015-04-03 13:25:54 UTC (rev 1073) @@ -205,15 +205,21 @@ * */ addChannelConstraint: function(channels) { - if (channels.length) { - for (var i = 0, l = channels.length; i <= l; i + 1) { + if (channels) { + if (channels.length) { + for (var i = 0, l = channels.length; i <= l; i + 1) { + this._constraints.channels && + this._constraints.channels.push(channels[i]); + } + } else { this._constraints.channels && - this._constraints.channels.push(channels[i]); + this._constraints.channels.push(channels); } - } else { - this._constraints.channels && - this._constraints.channels.push(channels); + + } else if (this._constraints.channels) { + this._constraints.channels = []; } + } }); \ No newline at end of file

1 0

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

03 Apr '15

Author: ygrego Date: 2015-04-03 13:10:50 +0000 (Fri, 03 Apr 2015) New Revision: 1072 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1072 Log: Two arrays are added to "_constraints" and a new method "addChannelConstraint" has been added. Modified: oipf/js/impl/model/MetadataSearch.js Modified: oipf/js/impl/model/MetadataSearch.js =================================================================== --- oipf/js/impl/model/MetadataSearch.js 2015-04-03 12:32:15 UTC (rev 1071) +++ oipf/js/impl/model/MetadataSearch.js 2015-04-03 13:10:50 UTC (rev 1072) @@ -132,7 +132,10 @@ init: function(searchTarget, searchManager) { this.searchTarget = searchTarget; this._searchManager = searchManager; - this._constraints = {}; + this._constraints = { + channels: [], + ratings: [] + }; }, /* @@ -184,6 +187,33 @@ */ setQuery: function(query){ this._currentQuery = query; + }, + + /* + * Description: + * Constrain the search to only include results from + * the specified channel(s). + * If a channelconstraint has already been set, subsequent calls to + * addChannelConstraint() SHALL add the specified channel(s) to the list of + * channels from which results should be returned. + * For CoD searches, adding a channel constraint SHALL have no effect. + * + * Arguments: + * -channels: The channel(s) from which results SHALL be returned. + * If the value of this argument is null, any existing channel + * constraint SHALL be removed. + * + */ + addChannelConstraint: function(channels) { + if (channels.length) { + for (var i = 0, l = channels.length; i <= l; i + 1) { + this._constraints.channels && + this._constraints.channels.push(channels[i]); + } + } else { + this._constraints.channels && + this._constraints.channels.push(channels); + } } }); \ No newline at end of file

1 0

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

03 Apr '15

Author: ygrego Date: 2015-04-03 12:32:15 +0000 (Fri, 03 Apr 2015) New Revision: 1071 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1071 Log: The property "_constraints" will be instanciate when constructor will be call. Modified: oipf/js/impl/model/MetadataSearch.js Modified: oipf/js/impl/model/MetadataSearch.js =================================================================== --- oipf/js/impl/model/MetadataSearch.js 2015-04-03 12:11:23 UTC (rev 1070) +++ oipf/js/impl/model/MetadataSearch.js 2015-04-03 12:32:15 UTC (rev 1071) @@ -132,6 +132,7 @@ init: function(searchTarget, searchManager) { this.searchTarget = searchTarget; this._searchManager = searchManager; + this._constraints = {}; }, /*

1 0

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

03 Apr '15

Author: ygrego Date: 2015-04-03 12:11:23 +0000 (Fri, 03 Apr 2015) New Revision: 1070 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1070 Log: New properties: "_constriants" and "_ordering". Modified: oipf/js/impl/model/MetadataSearch.js Modified: oipf/js/impl/model/MetadataSearch.js =================================================================== --- oipf/js/impl/model/MetadataSearch.js 2015-04-03 12:02:21 UTC (rev 1069) +++ oipf/js/impl/model/MetadataSearch.js 2015-04-03 12:11:23 UTC (rev 1070) @@ -99,6 +99,11 @@ _searchManager: null, _currentQuery: null, + + _constraints: null, + + _ordering: null, + /* * Description: * The subset of search results that has been requested by the application.

1 0

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

03 Apr '15

Author: ygrego Date: 2015-04-03 12:02:21 +0000 (Fri, 03 Apr 2015) New Revision: 1069 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1069 Log: Addition of method "setQuery". Modified: oipf/js/impl/model/MetadataSearch.js Modified: oipf/js/impl/model/MetadataSearch.js =================================================================== --- oipf/js/impl/model/MetadataSearch.js 2015-04-03 12:01:27 UTC (rev 1068) +++ oipf/js/impl/model/MetadataSearch.js 2015-04-03 12:02:21 UTC (rev 1069) @@ -97,6 +97,8 @@ var MetadataSearch = Class.extend({ _searchManager: null, + + _currentQuery: null, /* * Description: * The subset of search results that has been requested by the application. @@ -160,6 +162,22 @@ this.result = new SearchResults(currentQuery); this.result._search = this; console.log("[INFO]: findProgrammesFromStream [Out]"); + }, + + /* + * Description: + * Set the query terms to be used for this search, + * discarding any previously-set query terms. + * Setting the search parameters using this method will implicitly remove + * any existing constraints, ordering or queries created + * by prior calls to methods on this object. + * + * Arguments: + * -query: The query terms to be used. + * + */ + setQuery: function(query){ + this._currentQuery = query; } }); \ No newline at end of file

1 0

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

03 Apr '15

Author: ygrego Date: 2015-04-03 12:01:27 +0000 (Fri, 03 Apr 2015) New Revision: 1068 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1068 Log: Addition of comment block for this class. Modified: oipf/js/impl/model/Query.js Modified: oipf/js/impl/model/Query.js =================================================================== --- oipf/js/impl/model/Query.js 2015-04-03 11:35:27 UTC (rev 1067) +++ oipf/js/impl/model/Query.js 2015-04-03 12:01:27 UTC (rev 1068) @@ -1,3 +1,10 @@ +/* + * The Query class represents a metadata query that the user wants to carry out. + * This may be a simple search, or a complex search involving Boolean logic. + * Queries are immutable; an operation on a query SHALL return + * a new Query object, allowing applications to continue referring to + * the original query. + */ var Query = Class.extend({ _field: null,

1 0

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

03 Apr '15

Author: ygrego Date: 2015-04-03 11:35:27 +0000 (Fri, 03 Apr 2015) New Revision: 1067 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1067 Log: Complete refactoring of class definition. Modified: oipf/js/impl/model/Query.js Modified: oipf/js/impl/model/Query.js =================================================================== --- oipf/js/impl/model/Query.js 2015-04-03 09:48:31 UTC (rev 1066) +++ oipf/js/impl/model/Query.js 2015-04-03 11:35:27 UTC (rev 1067) @@ -1,15 +1,18 @@ var Query = Class.extend({ - channel: null, + _field: null, - startTime: null, + _comparison: null, - count: null, + _value: null, - init: function(channel, startTime, count) { - this.channel= channel; - this.startTime= startTime; - this.count= count; + init: function(field, comparison, value, count) { + this._field = field; + this._comparison = comparison; + this._value = value; + if (count) { + this._count = count; + } } }); \ No newline at end of file

1 0

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

03 Apr '15

Author: ygrego Date: 2015-04-03 09:48:31 +0000 (Fri, 03 Apr 2015) New Revision: 1066 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1066 Log: Refactoring of method "getResults". Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-03 08:55:49 UTC (rev 1065) +++ oipf/js/impl/model/SearchResults.js 2015-04-03 09:48:31 UTC (rev 1066) @@ -70,103 +70,46 @@ */ getResults: function(offset, count) { this.offset = offset; - var idStr = "-id", - displayNameStr = "display-name", - channelStr = "-channel", - stopStr = "-stop", - startStr = "-start", - currentChannelId = undefined, - channels = metadata.tv.channel, - displayName, - programs = metadata.tv.programme, - pattern = /(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})\s\+(\d{2})/; + var programmes = this._search._searchManager._metadata; - //Found the associated id of current channel in metadata because channel is referenced by id in program information - for (var i = 0; i<channels.length; i++) { - - item = channels[i]; - displayName = item[displayNameStr]; - - if (displayName === this._currentQuery.channel.name) { - currentChannelId = item[idStr]; - break; - } - } - - if (!currentChannelId) { - console.log("[INFO] This channel don't have id, this search have to abort."); - return; - } - console.log("[INFO] Current channel id found."); - var startTime = this._currentQuery.startTime; - //Found programs of current channel only - for (var i = 0; i< programs.length; i++) { - var item = programs[i]; + 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; + } + } - if (item[channelStr] === currentChannelId) { // && date + } else { //The search use the start time like a filter to retrieve the required program information. - var tmpSSTime = item[startStr]; - tmpSSTime = pattern.exec(tmpSSTime); - console.log(tmpSSTime); - var dateTmp = new Date(); - - /*year = parseInt(tmpSSTime[1]); - month = parseInt(tmpSSTime[2]); - day = parseInt(tmpSSTime[3]);*/ - var year = dateTmp.getFullYear(); - var month = dateTmp.getUTCMonth(); - var day = dateTmp.getUTCDate(); - var hs = parseInt(tmpSSTime[4]); - var mins = parseInt(tmpSSTime[5]); - var secs = parseInt(tmpSSTime[6]); - - var startDate = new Date(year, month, day, hs, mins, secs); - - tmpSSTime = item[stopStr]; - tmpSSTime = pattern.exec(tmpSSTime); - console.log(tmpSSTime); - - hs = parseInt(tmpSSTime[4]); - mins = parseInt(tmpSSTime[5]); - secs = parseInt(tmpSSTime[6]); - - var stopDate = new Date(year, month, day, hs, mins, secs); - - 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 ( (currentDate.getTime() >= startDate.getTime()) && (currentDate.getTime() <= stopDate.getTime()) ) { - console.log("[INFO] Program found."); - var currentProgramIndex = i; // Usefull to retrieve severals programs when user want more than one programs information. - break; - } - - } else { //The search use the start time like a filter to retrieve the required program information. - - if (this._currentQuery.starTime == startDate.getTime()) { - var currentProgramIndex = i; // Usefull to retrieve severals programs when user want more than one programs information. - 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) { + if (currentProgramIndex != undefined) { for (var i = 0; i < count; i++) { - self.push(programs[currentProgramIndex]); + self.push(programmes[currentProgramIndex]); currentProgramIndex++; } self._search._searchManager.onMetadataSearch && self._search._searchManager.onMetadataSearch(self._search, 0);

1 0

r1065 - oipf/data
by ygrego＠users.nuiton.org 03 Apr '15

03 Apr '15

Author: ygrego Date: 2015-04-03 08:55:49 +0000 (Fri, 03 Apr 2015) New Revision: 1065 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1065 Log: New method "minutesToSeconds" has been added. Modified: oipf/data/XmlTvData.js Modified: oipf/data/XmlTvData.js =================================================================== --- oipf/data/XmlTvData.js 2015-04-03 08:40:37 UTC (rev 1064) +++ oipf/data/XmlTvData.js 2015-04-03 08:55:49 UTC (rev 1065) @@ -110,8 +110,11 @@ transformInSecondSince01011970: function(wrongDateFormat) { return this.transformToActualDate(wrongDateFormat).getTime(); + }, + + minutesToSeconds: function(minutes){ + return minutes*60; } - });

1 0

r1064 - oipf/data
by ygrego＠users.nuiton.org 03 Apr '15

03 Apr '15

Author: ygrego Date: 2015-04-03 08:40:37 +0000 (Fri, 03 Apr 2015) New Revision: 1064 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1064 Log: New methods added and addition of a block "if" in method "initProgrammes". Modified: oipf/data/XmlTvData.js Modified: oipf/data/XmlTvData.js =================================================================== --- oipf/data/XmlTvData.js 2015-04-03 07:53:41 UTC (rev 1063) +++ oipf/data/XmlTvData.js 2015-04-03 08:40:37 UTC (rev 1064) @@ -56,6 +56,9 @@ if (element instanceof Object) { createProgramme(element, programme, key); } else { + if (key == "-start") { + element = this.transformInSecondSince01011970(element); + } if (key == "-channel") { channelName = self.channelNameMap[element]; console.log(channelName); @@ -81,6 +84,32 @@ initChannel: function(name){ return this.channelService.getADvbTChannel(name); + }, + + transformToActualDate: function(wrongDateFormat) { + pattern = /(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})\s\+(\d{2})/; + + var tmpDate = wrongDateFormat; + tmpDate = pattern.exec(tmpDate); + console.log(tmpDate); + var dateTmp = new Date(); + + /*year = parseInt(tmpSSTime[1]); + month = parseInt(tmpSSTime[2]); + day = parseInt(tmpSSTime[3]);*/ + var year = dateTmp.getFullYear(); + var month = dateTmp.getUTCMonth(); + var day = dateTmp.getUTCDate(); + var hs = parseInt(tmpDate[4]); + var mins = parseInt(tmpDate[5]); + var secs = parseInt(tmpDate[6]); + + var actualDate = new Date(year, month, day, hs, mins, secs); + return actualDate; + }, + + transformInSecondSince01011970: function(wrongDateFormat) { + return this.transformToActualDate(wrongDateFormat).getTime(); }

1 0