Author: ygrego Date: 2015-02-04 10:29:19 +0000 (Wed, 04 Feb 2015) New Revision: 769 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/769 Log: Setting a current channel into 'init.js', uncomment instanciation of 'SearchManagerOject' and 'ChannelConfig'. Modified: oipf/js/impl/OipfObjectFactory.js oipf/js/initObj/init.js oipf/js/test/test.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-02-04 10:19:16 UTC (rev 768) +++ oipf/js/impl/OipfObjectFactory.js 2015-02-04 10:29:19 UTC (rev 769) @@ -29,13 +29,13 @@ //this.applicationManagerObject = new ApplicationManagerObject(); //this.capabilitiesObject = new CapabilitiesObject(); //this.codManagerObject = new CodManagerObject(); - //this.channelConfig = new ChannelConfig(); + this.channelConfig = new ChannelConfig(null, currentchannel); //this.imsObject = new IMSObecjet(); //this.mdtfObject = new MDTFObject(); //this.notifSocketObject = new NotifSocket(); //this.parentalControlManagerObject = new ParentalControlManagerObject(); //this.recordingSchedulerObject = new RecordingSchedulerObject(); - //this.searchManagerObject = new SearchManagerObject(); + this.searchManagerObject = new SearchManagerObject(); //this.configurationObject = new ConfigurationObject(); //this.downloadManagerObject= new DownloadManagerObject(); //this.downloadTriggerObject= new DownloadTriggerObject(); Modified: oipf/js/initObj/init.js =================================================================== --- oipf/js/initObj/init.js 2015-02-04 10:19:16 UTC (rev 768) +++ oipf/js/initObj/init.js 2015-02-04 10:29:19 UTC (rev 769) @@ -378,5 +378,8 @@ }); +var currentChannelType = "TYPE_TV"; +var currentChannelName = "ARTE"; +var currentchannel = new Channel(currentChannelName, currentChannelType); var oipfObjectFactory = new OipfObjectFactory(); -var metadata = data; \ No newline at end of file +var metadata = data; Modified: oipf/js/test/test.js =================================================================== --- oipf/js/test/test.js 2015-02-04 10:19:16 UTC (rev 768) +++ oipf/js/test/test.js 2015-02-04 10:29:19 UTC (rev 769) @@ -75,8 +75,7 @@ searchManagerObject = oipfObjectFactory.createSearchManagerObject(); channelConfig = oipfObjectFactory.createChannelConfig(); - metaDataSearch= channel.createSearch(searchTarget); + metaDataSearch= searchManagerObject.createSearch(searchTarget); metaDataSearch.findProgrammesFromStream(channelConfig.currentChannel, null); metaDataSearch.result.getResults(offset,count); - } \ No newline at end of file