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

r784 - oipf/js/impl/model
by ygrego＠users.nuiton.org Feb. 10, 2015

Feb. 10, 2015

Author: ygrego Date: 2015-02-10 10:58:18 +0000 (Tue, 10 Feb 2015) New Revision: 784 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/784 Log: Loop modifying into method 'getChannel'. Modified: oipf/js/impl/model/ChannelList.js Modified: oipf/js/impl/model/ChannelList.js =================================================================== --- oipf/js/impl/model/ChannelList.js 2015-02-10 10:46:56 UTC (rev 783) +++ oipf/js/impl/model/ChannelList.js 2015-02-10 10:58:18 UTC (rev 784) @@ -25,9 +25,9 @@ * Return: Channel */ getChannel: function(channelID) { - for(var key = Object.keys(this)){ - var channel = this.[key] - if( channel && (channel.channelID == channelID)){ + for (var i = 0; i < this.length; i++) { + var channel = this.[i]; + if (channel && (channel.channelID == channelID)) { return channel; } }

1 0

r783 - in oipf: js/initObj view
by ygrego＠users.nuiton.org Feb. 10, 2015

Feb. 10, 2015

Author: ygrego Date: 2015-02-10 10:46:56 +0000 (Tue, 10 Feb 2015) New Revision: 783 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/783 Log: Renaming of 'channel' in 'channel1' in affection of current channel into 'initChannel', addition of file 'ChanelList' into 'welcome.js'. Modified: oipf/js/initObj/init.js oipf/view/welcome.html Modified: oipf/js/initObj/init.js =================================================================== --- oipf/js/initObj/init.js 2015-02-10 10:41:11 UTC (rev 782) +++ oipf/js/initObj/init.js 2015-02-10 10:46:56 UTC (rev 783) @@ -16,7 +16,7 @@ channelName = "FRANCE_5"; var channel2 = new Channel(channelName, channelType); - channelConfig.currentChannel = channel; + channelConfig.currentChannel = channel1; channelConfig.channelList = new ChannelList([channel1, channel2]); } Modified: oipf/view/welcome.html =================================================================== --- oipf/view/welcome.html 2015-02-10 10:41:11 UTC (rev 782) +++ oipf/view/welcome.html 2015-02-10 10:46:56 UTC (rev 783) @@ -7,6 +7,7 @@ <script src="../data/data.js" type="text/javascript"></script> <script src="../js/impl/model/Query.js" type="text/javascript"></script> <script src="../js/impl/model/Channel.js" type="text/javascript"></script> + <script src="../js/impl/model/ChannelList.js" type="text/javascript"></script> <script src="../js/impl/model/MetadataSearch.js" type="text/javascript"></script> <script src="../js/impl/model/SearchResults.js" type="text/javascript"></script> <script src="../js/impl/OipfObjectFactory.js" type="text/javascript"></script>

1 0

r782 - oipf/js/initObj
by ygrego＠users.nuiton.org Feb. 10, 2015

Feb. 10, 2015

Author: ygrego Date: 2015-02-10 10:41:11 +0000 (Tue, 10 Feb 2015) New Revision: 782 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/782 Log: Addition of parameter in call of 'initChannel'. Modified: oipf/js/initObj/init.js Modified: oipf/js/initObj/init.js =================================================================== --- oipf/js/initObj/init.js 2015-02-10 10:40:18 UTC (rev 781) +++ oipf/js/initObj/init.js 2015-02-10 10:41:11 UTC (rev 782) @@ -21,7 +21,7 @@ } var oipfObjectFactory = new OipfObjectFactory(); -initChannel(); +initChannel(oipfObjectFactory); var metadata = data;

1 0

r781 - oipf/js/initObj
by ygrego＠users.nuiton.org Feb. 10, 2015

Feb. 10, 2015

Author: ygrego Date: 2015-02-10 10:40:18 +0000 (Tue, 10 Feb 2015) New Revision: 781 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/781 Log: Creating instance of channel list object and using of parameter into method 'initChannel'. Modified: oipf/js/initObj/init.js Modified: oipf/js/initObj/init.js =================================================================== --- oipf/js/initObj/init.js 2015-02-10 10:32:57 UTC (rev 780) +++ oipf/js/initObj/init.js 2015-02-10 10:40:18 UTC (rev 781) @@ -7,7 +7,7 @@ }); function initChannel(oipfObjFact){ - var channelConfig = oipfObjectFactory.createChannelConfig(); + var channelConfig = oipfObjFact.createChannelConfig(); var channelType = "TYPE_TV"; var channelName = "ARTE"; @@ -17,7 +17,7 @@ var channel2 = new Channel(channelName, channelType); channelConfig.currentChannel = channel; - channelConfig.channelList = [channel1, channel2]; + channelConfig.channelList = new ChannelList([channel1, channel2]); } var oipfObjectFactory = new OipfObjectFactory();

1 0

r780 - oipf/js/impl
by ygrego＠users.nuiton.org Feb. 10, 2015

Feb. 10, 2015

Author: ygrego Date: 2015-02-10 10:32:57 +0000 (Tue, 10 Feb 2015) New Revision: 780 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/780 Log: Simple constructor for 'channelConfig' because channel list and current channel will be added in method 'initChannel' from 'init.js'. Modified: oipf/js/impl/ChannelConfig.js Modified: oipf/js/impl/ChannelConfig.js =================================================================== --- oipf/js/impl/ChannelConfig.js 2015-02-10 10:29:07 UTC (rev 779) +++ oipf/js/impl/ChannelConfig.js 2015-02-10 10:32:57 UTC (rev 780) @@ -92,9 +92,7 @@ }, - init: function(channelList, currentChannel) { - this.channelList = channelList; - this.currentChannel = currentChannel; + init: function() { }, /*

1 0

r779 - in oipf/js: impl initObj
by ygrego＠users.nuiton.org Feb. 10, 2015

Feb. 10, 2015

Author: ygrego Date: 2015-02-10 10:29:07 +0000 (Tue, 10 Feb 2015) New Revision: 779 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/779 Log: Creation of method 'initChannel' into 'init.js', deletion of current channel creation into oipfObjectFactory constructor and this one disappeared from channel config object instanciation. Modified: oipf/js/impl/OipfObjectFactory.js oipf/js/initObj/init.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-02-10 09:54:42 UTC (rev 778) +++ oipf/js/impl/OipfObjectFactory.js 2015-02-10 10:29:07 UTC (rev 779) @@ -29,10 +29,7 @@ //this.applicationManagerObject = new ApplicationManagerObject(); //this.capabilitiesObject = new CapabilitiesObject(); //this.codManagerObject = new CodManagerObject(); - var currentChannelType = "TYPE_TV"; - var currentChannelName = "ARTE"; - var currentChannel = new Channel(currentChannelName, currentChannelType); - this.channelConfig = new ChannelConfig(null, currentChannel); + this.channelConfig = new ChannelConfig(); //this.imsObject = new IMSObecjet(); //this.mdtfObject = new MDTFObject(); //this.notifSocketObject = new NotifSocket(); Modified: oipf/js/initObj/init.js =================================================================== --- oipf/js/initObj/init.js 2015-02-10 09:54:42 UTC (rev 778) +++ oipf/js/initObj/init.js 2015-02-10 10:29:07 UTC (rev 779) @@ -6,5 +6,22 @@ extends: "object" }); +function initChannel(oipfObjFact){ + var channelConfig = oipfObjectFactory.createChannelConfig(); + + var channelType = "TYPE_TV"; + var channelName = "ARTE"; + var channel1 = new Channel(channelName, channelType); + + channelName = "FRANCE_5"; + var channel2 = new Channel(channelName, channelType); + + channelConfig.currentChannel = channel; + channelConfig.channelList = [channel1, channel2]; +} + var oipfObjectFactory = new OipfObjectFactory(); +initChannel(); + var metadata = data; +

1 0

r778 - oipf/js/impl/model
by ygrego＠users.nuiton.org Feb. 10, 2015

Feb. 10, 2015

Author: ygrego Date: 2015-02-10 09:54:42 +0000 (Tue, 10 Feb 2015) New Revision: 778 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/778 Log: Addition of new class 'ChannelList' for add new channel for future tests on 'VideoBroadcastObject'. Added: oipf/js/impl/model/ChannelList.js Added: oipf/js/impl/model/ChannelList.js =================================================================== --- oipf/js/impl/model/ChannelList.js (rev 0) +++ oipf/js/impl/model/ChannelList.js 2015-02-10 09:54:42 UTC (rev 778) @@ -0,0 +1,79 @@ +/* +* Description: +* A ChannelList represents a collection of Channel objects. See Annex K for the definition of the collection template. +* In addition to the methods and properties defined for generic collections, the ChannelList class supports the additional +* properties and methods defined below. +* +*/ +var ChannelList = Collection.extend({ + + init: function(elements) { + + this.super.init(elements); + }, + + /* + * Description: + * Return the first channel in the list with the specified channel identifier. Returns null if no + * corresponding channel can be found. + * + * Arguments: + * - channelID: (Type: String)The channel identifier of the channel to be retrieved, which is a value as + * defined for the ccid and ipBroadcastID properties of the Channel object + * as defined in section 7.13.11. + * + * Return: Channel + */ + getChannel: function(channelID) { + for(var key = Object.keys(this)){ + var channel = this.[key] + if( channel && (channel.channelID == channelID)){ + return channel; + } + } + }, + + /* + * Description: + * Return the first (IPTV or non-IPTV) channel in the list that matches the specified DVB or + * ISDB triplet (original network ID, transport stream ID, service ID). + * Where no channels of type ID_ISDB_* or ID_DVB_* are available, or no channel identified + * by this triplet are found, this method SHALL return null. + * + * Arguments: + * - onid: (Type: Integer) The original network ID of the channel to be retrieved. + * + * - tsid: (Type: Integer) The transport stream ID of the channel to be retrieved. If set to null the client + * SHALL retrieve the channel defined by the combination of onid and sid. This + * makes it possible to retrieve the correct channel also in case a remultiplexing + * took place which led to a changed tsid. + * + * - sid: (Type: Integer) The service ID of the channel to be retrieved. + * + * - nid: (Type: Integer) An optional argument, indicating the network id to be used select the channel + * when the channel list contains more than one entry with the same onid , tsid + * and sid. + * + * Return: Channel + */ + getChannelByTriplet: function(onid, tsid, sid, nid) { + + }, + + /* + * Description: + + * Return the first (IPTV or non-IPTV) channel in the list with the specified ATSC source ID. + * Where no channels of type ID_ATSC_* are available, or no channel with the specified + * source ID is found in the channel list, this method SHALL return null . + * + * Arguments: + * - sourceID: (Type: Integer) The ATSC source_ID of the channel to be returned. + * + * Return: Channel + */ + getChannelBySourceID: function(sourceID) { + + } + +}); \ No newline at end of file

1 0

r777 - oipf/js/impl/model
by ygrego＠users.nuiton.org Feb. 10, 2015

Feb. 10, 2015

Author: ygrego Date: 2015-02-10 09:52:03 +0000 (Tue, 10 Feb 2015) New Revision: 777 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/777 Log: Addition of new class 'Programme' for return programs information confrom to oifp norm when a search is performing. Added: oipf/js/impl/model/Programme.js Added: oipf/js/impl/model/Programme.js =================================================================== --- oipf/js/impl/model/Programme.js (rev 0) +++ oipf/js/impl/model/Programme.js 2015-02-10 09:52:03 UTC (rev 777) @@ -0,0 +1,386 @@ +/* +* Description: +* +* The Programme class represents an entry in a programme schedule. +* Note: as described in the record( Programme programme ) method of the +* application/oipfRecordingScheduler object, only the programmeID property of the programme object is +* used to determine the programme or series that will be recorded. The other properties are solely used for annotation of +* the (scheduled) recording with programme metadata. The use of these metadata properties is optional. If such programme +* metadata is provided, it is retained in the ScheduledRecording object that is returned if the recording of the +* programme was scheduled successfully. +* +* Metadata extensions to Programme: +* The OITF SHALL extend the Programme class defined in section 7.16.2 with the properties and methods described +* below. +* This subsection SHALL apply for OITFs that have indicated <clientMetadata> with value “ true ” and a “ type ” +* attribute with values “ bcg ”, “ eit-pf ” or “ dvb-si ” as defined in section 9.3.7 in their capability profile. +* +* DVB-SI extensions to Programme: +* The following method SHALL be added to the Programme object, if the OITF has indicated support for accessing +* DVB-SI information, by giving the value “ true ” to element <clientMetadata> and the value “ dvb-si ” or +* “ eit-pf ” to the “ type ” attribute of that element as defined in section 9.3.7 in their capability profile. +* StringCollection getSIDescriptors( Integer descriptorTag, Integer descriptorTagExtension, Integer privateDataSpecifier) +* +* Recording extensions to Programme: +* The OITF SHALL support the following extensions to the Programme class. +* Clients supporting the recording management APIs defined in this section SHALL indicate this by adding the attribute +* " manageRecordings " to the <recording> element with a value unequal to ‘ none ’ in the client capability +* description as defined in section 9.3.3. +* +*/ + +var Programme = Class.extend({ + + /* + * Description: + * The short name of the programme, e.g. 'Star Trek: DS9'. + */ + name: null, + + /* + * Description: + * The long name of the programme, e.g. 'Star Trek: Deep Space Nine'. If the long name is not available, this property will be undefined. + */ + longName: null, + + /* + * Description: + * The description of the programme, e.g. an episode synopsis. If no description is available, this property will be undefined. + */ + description: null, + + /* + * Description: + * The long description of the programme. If no description is available, this property will be undefined . + */ + longDescription: null, + + /* + * Description: + * The long description of the programme. If no description is available, this property will be undefined . + */ + startTime: null, + + /* + * Description: + * The duration of the programme (in seconds). + */ + duration: null, + + /* + * Description: + * The identifier of the channel from which the broadcasted content is to be recorded. Specifies either a ccid or + * ipBroadcastID (as defined by the Channel object in section 7.13.11) + */ + channelID: null, + + /* + * Description: + * The episode number for the programme if it is part of a series. This property is undefined when the + * programme is not part of a series or the information is not available. + */ + episode: null, + + /* + * Description: + * If the programme is part of a series, the total number of episodes in the series. This property is undefined + * when the programme is not part of a series or the information is not available. + */ + totalEpisodes: null, + + /* + * Description: + * Flag indicating whether the programme has 3D video. + * + * Visibility Type: readonly Boolean + */ + is3D: null, + + /* + * Description: + * The unique identifier of the programme or series, e.g., a TV-Anytime CRID (Content Reference Identifier). + */ + programmeID: null, + + /* + * Description: + * The type of identification used to reference the programme, as indicated by one of the ID_* constants + * defined above. + */ + programmeIDType: null, + + /* + * Description: + * The TV-Anytime Instance Metadata ID for this programme. + * + * Visibility Type: readonly String + */ + IMI: null, + + /* + * Description: + * A collection of parental rating values for the programme for zero or more parental rating schemes supported + * by the OITF. For instances of the Programme class created by the createProgramme() method defined in + * section 7.10.1.1, the initial value of this property (upon creation of the Programme object) is an instance of + * the ParentalRatingCollection object (as defined in section 7.9.5) with length 0. Parental rating values + * can be added to this empty readonly parental rating collection by using the addParentalRating() method + * of the ParentalRatingCollection object. The ParentalRatingCollection is defined in section 7.9.5. + * The related ParentalRating and ParentalRatingScheme objects are defined in section 7.9.4 and 7.9.2 + * respectively. + * For instances of the Programme class returned through the metadata APIs defined in section 7.12 or through + * the programmes property of the video/broadcast object defined in section 7.13.3, the initial value of this + * property SHALL include the parental rating value(s) carried in the metadata or DVB-SI entry describing the + * programme, if this information is included. + * Note that if the service provider specifies a certain parental rating (e.g. PG-13) through this property and the + * actual parental rating extracted from the stream says that the content is rated PG-16, then the conflict + * resolution is implementation dependent. + * + * Visibility Type: readonly ParentalRatingCollection + */ + parentalRatings: null, + + /* + * Description: + * The group CRIDs associated with this programme. + * + * Visibility Type: readonly StringCollection + */ + groupCRIDs: null, + + + + + /* + * Description: + * Reference to the broadcast channel where the programme is available. + * The value of this field is derived from the serviceIDref attribute of the Schedule element that refers to this + * programme. + * + * Visibility Type: readonly Channel + */ + channel: null, + + /* + * Description: + * Reference to the broadcast channel where the programme is available. + * The value of this field is derived from the serviceIDref attribute of the Schedule element that refers to this + * programme. + * Flag indicating whether the programme is blocked due to parental control settings or conditional access + * restrictions. + * The blocked and locked properties work together to provide a tri-state flag describing the status of a + * programme. This can best be described by the following table: + * ------------------------------------------------------------------------------------------------------- + * Description | blocked | locked + * ------------------------------------------------------------------------------ ----------- ------------ + * No parental control applies. | false | false + * ------------------------------------------------------------------------------ ----------- ------------ + * Item is above the parental rating threshold (or manually blocked); no PIN has | true | true + * been entered to view it and so the item cannot currently be viewed. | | + * ------------------------------------------------------------------------------ ----------- ------------ + * Item is above the parental rating threshold (or manually blocked); the PIN has| true | false + * been entered and so the item can be viewed. | | + * ------------------------------------------------------------------------------ ----------- ------------ + * Invalid combination – OITFs SHALL NOT support this combination | false | true + * ------------------------------------------------------------------------------------------------------- + * + * Visibility Type: readonly Boolean + */ + blocked: null, + + /* + * Description: + * Flag indicating the type of show (live, first run, rerun, etc,). + * The value of this property is determined by the child elements of the programme’s BroadcastEvent or + * ScheduleEvent element from the Program Location Table. Values are determined as follows: + * programme. + * Flag indicating whether the programme is blocked due to parental control settings or conditional access + * restrictions. + * The blocked and locked properties work together to provide a tri-state flag describing the status of a + * programme. This can best be described by the following table: + * ---------------------------------------------------------------------------------- + * Value | Description + * ---------------------------------------------------------------------------------- + * 1 | The programme is live; indicated by the presence of a Live element with + * | a value attribute set to true. + * ---------------------------------------------------------------------------------- + * 2 | The programme is a first-run show; indicated by the presence of a + * | FirstShowing element with a value attribute set to true. + * ---------------------------------------------------------------------------------- + * 3 | The programme is a rerun; indicated by the presence of a Repeat + * | element with a value attribute set to true. + * ---------------------------------------------------------------------------------- + * + * If none of the above conditions are met, the default value of this field SHALL be 2. + * + * Visibility Type: readonly Boolean + */ + showType: null, + + /* + * Description: + * Flag indicating whether subtitles or closed-caption information is available. + * This flag SHALL be true if one or more BCG CaptionLanguage elements are present in this programme’s + * description, false otherwise. + * + * Type: Boolean + */ + subtitles: null, + + /* + * Description: + * Flag indicating whether the programme has high-definition video. + * This flag SHALL be true if a VerticalSize element is present in the programme’s description and has a + * value greater than 576, false otherwise. + * + * Type: Boolean + */ + isHD: null, + + /* + * Description: + * Bitfield indicating the type of audio that is available for the programme. + * The value of this field is determined by the NumOfChannels elements in a programme’s A/V attributes. + * Values are determined as follows: + * + * ------------------------------------------------------------------------------------------------------- + * Value | Description + * ------------------------------------------------------------------------------------------------------- + * 1 | A mono audio stream is available (at least one AvAttributes.AudioAttributes element is present + * | which has a child NumOfChannels element whose value is 1). + * ------------------------------------------------------------------------------------------------------- + * 2 | A mono audio stream is available (at least one AvAttributes.AudioAttributes element is present + * | which has a child NumOfChannels element whose value is 2). + * ------------------------------------------------------------------------------------------------------- + * 4 | A mono audio stream is available (at least one AvAttributes.AudioAttributes element is present + * | which has a child NumOfChannels element whose value is 4). + * ------------------------------------------------------------------------------------------------------- + * For programmes with multiple audio streams, these values may be ORed together. + */ + audio: null, + + /* + * Description: + * Flag indicating whether more than one audio language is available for the programme. + * This flag SHALL be true if more than one BCG Language element is present in the programme’s + * description, false otherwise. + * + * Visibility Type: Boolean + */ + isMultilingual: null, + + /* + * Description: + * A collection of genres that describe this programme. + * The value of this field is the concatenation of the values of any Name elements that are children of Genre + * elements in the programme’s description. + * + * Type: StringCollection + */ + genre: null, + + /* + * Description: + * Flag indicating whether the Programme has a recording associated with it (either scheduled, in progress, or + * completed). + * + * Type: readonly Boolean + */ + hasRecording: null, + + /* + * Description: + * Supported audio languages, indicated by their ISO.639-2 language codes as defined in [ISO 639-2]. + * + * Type: StringCollection + */ + audioLanguages: null, + + /* + * Description: + * Supported subtitle languages, indicated by their ISO.639-2 language codes as defined in [ISO 639-2]. + * + * Visibility Type: readonly StringCollection + */ + subtitleLanguages: null, + + /* + * Description: + * Flag indicating whether the current state of the parental control system prevents the programme from being + * viewed (e.g. a correct parental control PIN has not been entered to allow the programme to be viewed). + * + * Visibility Type: readonly Boolean + */ + locked: null, + + /* + * Description: + * If available, this property represents the recording associated with this programme (either scheduled, in- + * progress or completed). Has value undefined if this programme has no scheduled recording associated with + * it. + * + * Visibility Type: readonly ScheduledRecording + */ + recording: null, + + init: function() { + + }, + + /* + * Description: + * Get the value of the field referred to by fieldId that is contained in the metadata for this + * programme. If the field does not exist, this method SHALL return undefined . + * + * Arguments: + * - fieldId: The name of the field whose value SHALL be retrieved. + * + * Return: String + */ + getField: function(fieldId) { + + }, + + /* + * Description: + * Get the contents of the descriptor specified by descriptorTag from the DVB SI EIT + * programme's descriptor loop. If more than one descriptor with the specified tag is available for + * the given programme, the contents of all matching descriptors SHALL be returned in the + * order the descriptors are found in the stream. + * The descriptor content bytes SHALL be encoded in a string whose characters shall be + * restricted to the ISO Latin-1 character set. Each character in the string represents a byte of a + * DVB-SI descriptor, such that a byte at position " i " in the descriptor is equal the Latin-1 + * character code of the character at position " i " in the string. + * Described in the syntax of JavaScript: let desc[ ] be the byte array of a descriptor, in which + * desc[0] is the descriptor_tag, then, the returned string (retval in the example below) is its + * equivalent string, if : + * desc.length==retval.length and + * for each integer i : 0<=i<desc.length holds + * desc[i] == retval.charCodeAt(i) . + * If the descriptor specified by descriptorTag and (optionally) descriptorTagExtension + * and privateDataSpecifier does not exist, or if the metadata for this programme was + * retrieved from a source other than DVB-SI, this method SHALL return null . + * If metadata for this programme has not yet been retrieved, this method SHALL return + * undefined . If the OITF supports the application/oipfSearchManager object as defined + * in section 7.12.1, the OITF SHALL notify applications of the availability of additional metadata + * via MetadataSearch events targeted at the application/oipfSearchManager object + * used to retrieve the programme metadata. + * + * Arguments: + * - descriptorTag: The descriptor tag as specified by [EN 300 468]. + * + * - descriptorTag: An optional argument giving the descriptor tag extension as + * specified by [EN 300 468]. This argument is mandatory when + * descriptorTag is 0x7f and ignored in all other cases. + * + * - privateDataSpecifier: An optional argument giving the private_data_specifier as + * specified by [EN 300 468]. If this argument is present, only + * descriptors related to the identified specifier will be returned. + * + * Return: StringCollection + */ + getSIDescriptors: function(descriptorTag, descriptorTagExtension, privateDataSpecifier) { + + + } + +}); \ No newline at end of file

1 0

r776 - oipf/js/impl
by ygrego＠users.nuiton.org Feb. 10, 2015

Feb. 10, 2015

Author: ygrego Date: 2015-02-10 08:38:54 +0000 (Tue, 10 Feb 2015) New Revision: 776 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/776 Log: Deletion of commented lines into method 'VideoBroadcastObject.createdCallback()'. Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-02-09 13:37:22 UTC (rev 775) +++ oipf/js/impl/VideoBroadcastObject.js 2015-02-10 08:38:54 UTC (rev 776) @@ -115,12 +115,6 @@ createdCallback: function() { console.log("[INFO] createdCallback called."); - //this.width= "128"; - //this.height= "128"; - //this.align = "middle"; - - //this.data = "../view/img/video-broadcast.jpg"; - }, init: function() {

1 0

r775 - in oipf: js/impl/model js/test view
by ygrego＠users.nuiton.org Feb. 9, 2015

Feb. 9, 2015

Author: ygrego Date: 2015-02-09 13:37:22 +0000 (Mon, 09 Feb 2015) New Revision: 775 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/775 Log: New approach defined(into class 'SearchResults') for a search based on call of javascript method 'Date.getTime()', addition of new javascript sources in file 'welcome.html', insertion of a console display in method 'onMetadataSearch()' when parameter 'state' takes value '3' or '4'. Modified: oipf/js/impl/model/SearchResults.js oipf/js/test/test.js oipf/view/welcome.html Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-02-06 16:17:45 UTC (rev 774) +++ oipf/js/impl/model/SearchResults.js 2015-02-09 13:37:22 UTC (rev 775) @@ -77,34 +77,12 @@ currentChannelId = undefined, channels = metadata.tv.channel, displayName, - item, - index, programs = metadata.tv.programme, - startTime, - tmpSSTime, - currentTime = new Date(), - currentStopTime, - currentStartTime, - /* - * Usefull to retrieve severals programs when user want more than one programs information. - */ - currentProgramIndex, - - /* - * Used to found the current program : the smaller difference between current time and stop time of a program, - * means that the program stopping a this stop time is the current program. - */ - smallerDiff, - - /* - * The difference calculated during the loop of current program searching. - */ - currentDiff, pattern = /(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})\s\+(\d{2})/; - var i; + //Found the associated id of current channel in metadata because channel is referenced by id in program information - for (i = 0; i<channels.length; i++) { + for (var i = 0; i<channels.length; i++) { item = channels[i]; displayName = item[displayNameStr]; @@ -120,63 +98,71 @@ return; } console.log("[INFO] Current channel id found."); - - //Another loop will run, just a reinitialization. - startTime = this._currentQuery.startTime; - var hStart, hStop, - mStart, mStop, - sStart, sStop; - - /* - * 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) { + + var startTime = this._currentQuery.startTime; - //Found programs of current channel only - for (i = 0; i< programs.length; i++) { - item = programs[i] + //Found programs of current channel only + for (var i = 0; i< programs.length; i++) { + var item = programs[i]; + + if (item[channelStr] == currentChannelId) { // && date + + var tmpSSTime = item[startStr]; + tmpSSTime = pattern.exec(tmpSSTime); + console.log(tmpSSTime); + var dateTmp = new Date(); - if (item[channelStr] == currentChannelId) { - - tmpSSTime = item[startStr]; - tmpSSTime = pattern.exec(tmpSSTime); - - console.log(tmpSSTime); - - hStart = parseInt(tmpSSTime[4])*3600; - mStart = parseInt(tmpSSTime[5])*60; - var startTInNbSec = hStart+mStart; - console.log(hStart,mStart,startTInNbSec); - - tmpSSTime = item[stopStr]; - tmpSSTime = pattern.exec(tmpSSTime); - console.log(tmpSSTime); - - hStop = parseInt(tmpSSTime[4])*3600; - mStop = parseInt(tmpSSTime[5])*60; - var stopTInNbSec = hStop+mStop; - console.log(hStop,mStop,stopTInNbSec); - - var currentTimeInNbSec = (currentTime.getUTCHours()+1)*3600 + (currentTime.getUTCMinutes()*60) - console.log(currentTimeInNbSec); - - if ( (currentTimeInNbSec >= startTInNbSec) && (currentTimeInNbSec <= stopTInNbSec) ) { - console.log("[INFO] Program found."); - index = i; - break; - } else { - console.log("[INFO] Program not yet found."); + /*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); + + year = dateTmp.getFullYear(); + month = dateTmp.getUTCMonth(); + day = dateTmp.getUTCDate(); + 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; } - } - } - - } else { //The search use the start time like a filter to retrieve the required program information. - - + console.log("[INFO] Program not yet found."); + } } + // document.dispatchEvent(new Event('MetadataSearch', { // 'search': metaDataSearch, // 'state': 0 @@ -186,11 +172,16 @@ setTimeout(function() { console.log("<<<<<<<<<<<<<<", new Date(), ">>>>>>>>>>>>>>>>"); //When user want more than one result into his search. - for (var i = 0; i < count; i++) { - self.push(programs[index]); - index++; + if (currentProgramIndex) { + for (var i = 0; i < count; i++) { + self.push(programs[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); + }, 0); return false; Modified: oipf/js/test/test.js =================================================================== --- oipf/js/test/test.js 2015-02-06 16:17:45 UTC (rev 774) +++ oipf/js/test/test.js 2015-02-09 13:37:22 UTC (rev 775) @@ -88,18 +88,18 @@ case 3: - var message = " MetadataSearch in Idle state because of either search abort or parameters have been modified \ - (query, constraints or search target)"; + 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; case 4: - message = " The search cannot be complete because of lack of ressources or any other reason.\ - (memory insufficient to cache all of the requested results.)"; + message = "[INFO] The search cannot be complete because of lack of ressources or any other reason."; + console.log(message); break; default: - console.log("Unknow state :("); + console.log("Unknow state"); } } Modified: oipf/view/welcome.html =================================================================== --- oipf/view/welcome.html 2015-02-06 16:17:45 UTC (rev 774) +++ oipf/view/welcome.html 2015-02-09 13:37:22 UTC (rev 775) @@ -5,6 +5,10 @@ <script src="../js/lib/Class.js" type="text/javascript"></script> <script src="../js/lib/Collection.js" type="text/javascript"></script> <script src="../data/data.js" type="text/javascript"></script> + <script src="../js/impl/model/Query.js" type="text/javascript"></script> + <script src="../js/impl/model/Channel.js" type="text/javascript"></script> + <script src="../js/impl/model/MetadataSearch.js" type="text/javascript"></script> + <script src="../js/impl/model/SearchResults.js" type="text/javascript"></script> <script src="../js/impl/OipfObjectFactory.js" type="text/javascript"></script> <script src="../js/impl/ChannelConfig.js" type="text/javascript"></script> <script src="../js/impl/VideoBroadcastObject.js" type="text/javascript"></script>

1 0