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

r1514 - oipf/js
by ygrego＠users.nuiton.org 28 May '15

28 May '15

Author: ygrego Date: 2015-05-28 08:31:05 +0000 (Thu, 28 May 2015) New Revision: 1514 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1514 Log: Deletion of directories "js/init" and "js/configuration". Removed: oipf/js/configuration/ oipf/js/init/

1 0

r1513 - oipf/js/impl/model
by ygrego＠users.nuiton.org 28 May '15

28 May '15

Author: ygrego Date: 2015-05-28 08:28:31 +0000 (Thu, 28 May 2015) New Revision: 1513 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1513 Log: Addition of a new class "Application". Added: oipf/js/impl/model/Application.js Added: oipf/js/impl/model/Application.js =================================================================== --- oipf/js/impl/model/Application.js (rev 0) +++ oipf/js/impl/model/Application.js 2015-05-28 08:28:31 UTC (rev 1513) @@ -0,0 +1,66 @@ +/* + * The Application class is used to implement the characteristics of a + * DAE application. If the document of an application is modified + * (or even replaced entirely), the Application object SHALL be retained. + * This means that the permission set granted when the application is created + * applies to all “edits” of the document or other pages in the application, + * until the application is destroyed. + */ + +var Application = Class.extend({ + + /* + * Description: + * true if the application is visible, false otherwise. The value of + * this property is not affected by the application's Z-index or position + * relative to other applications. Only calls to the show() and hide() + * methods will affect its value. + * + * Visibility Type: readonly Boolean + */ + visible: null, + + /* + * Description: + * true if the application is in the list of currently active applications, + * false otherwise (as defined in section 4.3.8). + * + * Visibility Type: readonly Boolean + */ + active: null, + + /* + * Descrioption: + * StringCollection object containing the names of the permissions granted + * to this application. + * + * Visibilty Type: readonly StringCollection + */ + permissions: null, + + /* + * Description: + * true if the application receives cross application events before any + * other application, false otherwise. + * + * Visibility Type: readonly Boolean + */ + isPrimaryReceiver: null, + + /* + * Description: + * Access the current application’s private data object. + * If an application attempts to access the privateData property of an + * Application object for a different application, the OITF SHALL throw + * an error as defined in section 10.1.1. + * + * Visibility Type: readonly ApplicationPrivateData + */ + privateData: null, + + init: function() { + + } +}); + +

1 0

r1512 - oipf/js/test
by ygrego＠users.nuiton.org 28 May '15

28 May '15

Author: ygrego Date: 2015-05-28 08:27:38 +0000 (Thu, 28 May 2015) New Revision: 1512 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1512 Log: Addition of a test class about object "ApplicationManager". Modified: oipf/js/test/ApplicationManagerTest.js Modified: oipf/js/test/ApplicationManagerTest.js =================================================================== --- oipf/js/test/ApplicationManagerTest.js 2015-05-28 08:25:12 UTC (rev 1511) +++ oipf/js/test/ApplicationManagerTest.js 2015-05-28 08:27:38 UTC (rev 1512) @@ -8,16 +8,22 @@ init: function() { this.super.init(); + this.applicationManagerObject = oipfObjectFactory.createApplicationManagerObject(); + this.applicationManagerObject.onApplicationLoaded = this.onApplicationLoaded; }, beforeTest: function(resolve, reject) { - this.applicationManagerObject = oipfObjectFactory.createApplicationManagerObject(); + }, afterTest: function(resolve, reject) { }, + onApplicationLoaded: function(application) { + console.log(application); + }, + testGetOwnerApplicationOfDocumentOfGlobalPropertyWindow: function(resolve, reject) { var application = this.applicationManagerObject .getOwnerApplication(window.document);

1 0

r1511 - in oipf: . configuration
by ygrego＠users.nuiton.org 28 May '15

28 May '15

Author: ygrego Date: 2015-05-28 08:25:12 +0000 (Thu, 28 May 2015) New Revision: 1511 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1511 Log: The repository "js/configuration" has been moved to the root of project. ("oipf/configuration") Added: oipf/configuration/ oipf/configuration/CapabilitiesProperties.js oipf/configuration/ConfigDefaultProperties.js oipf/configuration/OipfConfiguration.js oipf/configuration/TestConfig.js Copied: oipf/configuration/CapabilitiesProperties.js (from rev 1419, oipf/js/configuration/CapabilitiesProperties.js) =================================================================== --- oipf/configuration/CapabilitiesProperties.js (rev 0) +++ oipf/configuration/CapabilitiesProperties.js 2015-05-28 08:25:12 UTC (rev 1511) @@ -0,0 +1,157 @@ +/* + * The OITF SHALL support following non-visual embedded object with + * the mime type application/oipfCapabilities. + */ +var CapabilitiesProperties = Class.extend({ + defaultConfig: { + extraSDVideoDecodes: null, + extraHDVideoDecodes: null + }, + + baseUIProfileName: [ + "OITF_SDEU_UIPROF", + "OITF_SD60_UIPROF", + "OITF_SDUS_UIPROF", + "OITF_HD_UIPROF", + "OITF_FULL_HD_UIPROF" + ], + + UIProfileNameFragment: [ + "+TRICKMODE", + "+AVCAD", + "+DL", + "+IPTV_SDS", + "+IPTV_URI", + "+ANA", + "+DVB_C", + "+DVB_T", + "+DVB_S", + "+DVB_C2", + "+DVB_T2", + "+DVB_S2", + "+META_BCG", + "+META_EIT", + "+META_SI", + "+ITV_KEYS", + "+CONTROLLED", + "+PVR", + "+DRM", + "+CommunicationServices", + "+SVG", + "+POINTER", + "+WIDGETS", + "+HTML5_MEDIA", + "+RCF", + "+TELEPHONY", + "+VIDEOTELEPHONY" + ], + + profileNameMapping: { + "+DVB_T": "DVB", + "+META_EIT": "META" + /*"+AVCAD": "DVB", + "+IPTV_SDS": "DVB", + "+IPTV_URI": "DVB", + "+ANA": "DVB", + "+DVB_C": "DVB", + "+DVB_S": "DVB", + "+DVB_C2": "DVB", + "+DVB_T2": "DVB", + "+DVB_S2": "DVB", + "+META_BCG": "META", + "+META_SI": "META"*/ + }, + + roots: "profilelist", + + defaultCapabilities: { + "DVB": { + video_broadcast: { + value: true, + attributes: { + type: "ID_DVB_T ID_DVB_SI_DIRECT", + transport: "", + nrstreams: 1, + scaling: "arbitrary", + minSize: 0, + postList: false, + networkTimeshift: false, + localTimeshift: false + } + } + }, + "OITF_SDEU_UIPROF": { + overlaylocaltuner: { + value: "per-pixel" + } + }, + "+PVR": { + recording: { + value: true, + attributes: { + ipBroadcast: false, + HAS: false, + DASH: false, + manageRecordings: "initiator", + postList: false + } + } + }, + META: { + clientMetadata: { + value: true, + attributes: { + type: "eit-pf" + } + } + }, + "+CONTROLLED": { + configurationChanges: { + value: true + } + } + }, + + rearrangeDefaultProperties: function() { + var defaultProperties = {}; + + var defaultCapabilitiesKeys = Object.keys(this.defaultCapabilities); + + for (var i = 0, l = defaultCapabilitiesKeys.length; i < l; i++) { + var currentKey = defaultCapabilitiesKeys[i]; + var currentCapability = this.defaultCapabilities[currentKey]; + var currentCapabilityKeysList = Object.keys(currentCapability); + + for (var j = 0, l1 = currentCapabilityKeysList.length; j < l1; j++) { + var currentCapabilityKeys = currentCapabilityKeysList[j]; + defaultProperties[currentCapabilityKeys] = + currentCapability[currentCapabilityKeys]; + } + } + return defaultProperties; + }, + + /* + * FIXME: + * Yannis - 13/05/2015 - Achieved a more detailed verification on capability + * but it's not an obligation + */ + hasCapablity: function(profileName) { + this.defaultCapabilities[profileName]; + this.profileNameMapping[profileName]; + + return this.defaultCapabilities[profileName] || + this.profileNameMapping[profileName]; + }, + + searchAnAttributeValue: function(attributeValue) { + + }, + searchATagName: function(tagName) { + + }, + searchAValue: function(value) { + + } +}); + Copied: oipf/configuration/ConfigDefaultProperties.js (from rev 1419, oipf/js/configuration/ConfigDefaultProperties.js) =================================================================== --- oipf/configuration/ConfigDefaultProperties.js (rev 0) +++ oipf/configuration/ConfigDefaultProperties.js 2015-05-28 08:25:12 UTC (rev 1511) @@ -0,0 +1,135 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ + +var ConfigDefaultProperties = Class.extend({ + + init: function() { + + this.restrictedPowerState = { + 0: true, // OFF + 6: true // FACTORY_RESET + }, + + this.tvStandardsSupported = { + 1: true, + 2: true, + 4: true, + 8: true, + 16: true + }, + + this.screenSize = { + "1280x720": true, //HD 720 + "1920x1080": true, //HD 1080 + "640x480": true //VGA + }, + + this.configuration = { + preferredAudioLanguage: "fra", + preferredSubtitleLanguage: "fra", + preferredUILanguage: "fra", + countryId: "FRA", + regionId: 0, + pvrPolicy: configurationConstants.pvrPolicy.WATCHED_RECORDINGS, + pvrSaveEpisodes: 5, + pvrSaveDays: 15, + pvrStartPadding: 0, //Measured in (s) + pvrEndPadding: 0, //Measured in (s) + preferredTimeShiftMode: videoBroadcastConstants.timeShiftMode.OFF + }; + + this.startupInformation = { + urlSource: null, + url: null + }; + + this.aVOutput = { + name: null, + type: null, + enabled: null, + subtitleEnabled: null, + videoMode: null, + digitalAudioMode: null, + audioRange: null, + hdVideoFormat: null, + tvAspectRatio: null, + supportedVideoModes: null, + supportedDigitalAudioModes: null, + supportedAudioRanges: null, + supportedHdVideoFormats: null, + supportedAspectRatios: null, + current3DMode: null + }; + + this.signalInfo = { + strength: null, + quality: null, + ber: null, + snr: null, + lock: null + }; + + this.lNBInfo = { + lnbType: null, + lnbLowFreq: null, + lnbHighFreq: null, + crossoverFrequency: null, + lnbStartFrequency: null, + lnbStopFrequency: null, + orbitalPosition: null + }; + + this.tuner = { + id: null, + enableTuner: true, + signalInfo: new SignalInfo(this.signalInfo), + lnbInfo: new LNBInfo(this.lNBInfo), + frontEndPosition: null, + powerOnExternal: null + }; + + var idTypes = new IntegerCollection(12, 11); + var tunerTNT = new Tuner("TNT", idTypes, this.tuner); + var tuners = new TunerCollection(tunerTNT); + + var masterAVOutput = + new AVOutput("master", "both", true, this.aVOutput); + + var networkInterface = + new NetworkInterface("192.168.99.191", "6D:FF:29:E1:AF:33", true, true); + + this.localSystem = { + deviceID: undefined, + systemReady: false, + vendorName: null, + modelName: null, + familyName: null, + softwareVersion: null, + hardwareVersion: null, + serialNumber: null, + releaseVersion: null, + majorVersion: null, + minorVersion: null, + oipfProfile: null, + pvrEnabled: true, //This property is deprecated. + ciplusEnabled: false, + powerState: 1, + previousPowerState: 0, + timeCurrentPowerState: new Date().getTime(), + volume: 0, + mute: false, + tuners: tuners, + outputs: new AVOutputCollection(masterAVOutput), + networkInterfaces: new NetworkInterfaceCollection(networkInterface), + tvStandardsSupported: null, //Represented by a bitfield + tvStandard: configurationConstants.tvStandard.SECAM, + pvrSupport: 1, + startupInformation: null + }; + + } +}); + Copied: oipf/configuration/OipfConfiguration.js (from rev 1474, oipf/js/configuration/OipfConfiguration.js) =================================================================== --- oipf/configuration/OipfConfiguration.js (rev 0) +++ oipf/configuration/OipfConfiguration.js 2015-05-28 08:25:12 UTC (rev 1511) @@ -0,0 +1,24 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ + +var OipfConfiguration = Class.extend({ + + init: function() { + + //Channels configuration + this.channelNumber = 13; + this.channelCountry = "France"; + this.channelList = "../../data/oipfChannels.xml"; + + //Programmes configuration + this.programmeType = "xmlTV"; + this.programmeCountry = "France"; + this.programmes = "../../data/xmlTVProgrammes.xml"; + + + } +}); + Copied: oipf/configuration/TestConfig.js (from rev 1419, oipf/js/configuration/TestConfig.js) =================================================================== --- oipf/configuration/TestConfig.js (rev 0) +++ oipf/configuration/TestConfig.js 2015-05-28 08:25:12 UTC (rev 1511) @@ -0,0 +1,226 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ + +if (!String.prototype.includes) { + String.prototype.includes = function() {'use strict'; + return String.prototype.indexOf.apply(this, arguments) !== -1; + }; +} + +var userAgent = navigator.userAgent; + +if (userAgent.includes("HbbTV") || userAgent.includes("SmartTv")) { + + console.log("OIPF TESTS ON TV PLATFORM"); + var hbbTv = ApplicationManager.getWindows[2]; + hbbTv && hbbTv.deactivate(); + var ui = ApplicationManager.getWindows()[0]; //or getWindowsByName + ui && ui.keySet.setValue(0x10, []); + !ui.visible && ui.show(); + ui.activate(); + + var VideoBroadcastManager = VideoBroadcastTest.extend({ + + init: function() { +// this.superBeforeTest = VideoBroadcastTest.prototype.super.beforeTest; + this.vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); + + this.superBeforeTest = this.super.beforeTest; + this.superOnChangeState = this.super.onChangeState; + }, + + onChangeState: function(resolve, reject, event) { + this.superOnChangeState.call(this, + resolve, reject, event.state, event.error); + }, + + beforeTest: function(resolve, reject) { + this.onPlayStateChange = this.onChangeState.bind(this, resolve, reject); + this.vidBroadObj.addEventListener("PlayStateChange", this.onPlayStateChange, false); + this.transitions = []; + this.previousState = this.vidBroadObj.playState; + this.currentIndex = 0; + this.channel = null; + this.timerManager = new TimerManager(); + this.timeout = this.timerManager.createTimer.bind(this.timerManager); + logTest("State: Pending"); + this.cancel = true; + }, + + unrealizedToConnecting: function(begin, end, callback) { + if (callback) { + throw ("Untestable Case."); + } + }, + + connectingToPresenting: function(begin, end, callback) { + /** + * Avoid that the future transition C->P be canceled. + * More extend super method beforeTest in order to reset + * 'startEndStates' property. + */ + if (this.cancel) { + callback && this.timeout().then(callback).then(console.log.bind(console, "TOTO")); + this.cancel = false; + } else { + this.pushTransition(begin, end, callback, null); + } + }, + + unrealizedToUnrealized: function(begin, end, callback) { + this.reject("Untestable Case."); + }, + + stopToStop: function(begin, end, callback) { + this.reject("Untestable Case."); + }, + + noStatesDefined: function(begin, end, callback) { + this.reject("Untestable Case."); + }, + + startEndStates: { + + "00": "unrealizedToUnrealized", + "01": "unrealizedToConnecting", + "12": "connectingToPresenting", + "33": "stopToStop", + "nullnull": "noStatesDefined" + }, + + pushTransition: function(begin, end, callback, error) { + this.transitions.push({ + begin: begin, + end: end, + error: error, + callback: callback + }); + }, + + pushTransitionWithError: function(begin, end, callback, error) { + var method = this.startEndStates[""+begin+end]; + if (method) { + this[method].call(this, begin, end, callback); + } else { + this.pushTransition(begin, end, callback, error); + } + }, + + addTransition: function(begin, end, callback) { + this.addTransitionWithError(begin, end, callback, null); + }, + + addTransitionWithError: function(begin, end, callback, error) { + this.pushTransitionWithError(begin, end, callback, error); + } + }); + + var VideoBroadcastTest = VideoBroadcastManager.extend({ + + init: function() { + this.super.init(); + } + + }); + + var SearchManagerTest = SearchManagerTest.extend({ + init: function() { + this.searchManagerObj = oipfObjectFactory.createSearchManagerObject(); + this.super.init(); + }, + + beforeTest: function(resolve, reject) { + this.super.beforeTest(resolve, reject); + this.cancel = true; + }, + + noStatesDefined: function(begin, end, callback) { + this.reject("Untestable Case."); + }, + + unrealizedToConnecting: function(begin, end, callback) { + if (callback) { + throw ("Untestable Case."); + } + }, + + connectingToPresenting: function(begin, end, callback) { + /** + * Avoid that the future transition C->P be canceled. + * More extend super method beforeTest in order to reset + * 'startEndStates' property. + */ + if (this.cancel) { + callback && this.timeout().then(callback).then(console.log.bind(console, "TOTO")); + this.cancel = false; + } else { + this.pushTransition(begin, end, callback, null); + } + }, + + startEndStates: { + + "00": "unrealizedToUnrealized", + "01": "unrealizedToConnecting", + "12": "connectingToPresenting", + "33": "stopToStop", + "nullnull": "noStatesDefined" + }, + + pushTransition: function(begin, end, callback, error) { + this.transitions.push({ + begin: begin, + end: end, + error: error, + callback: callback + }); + }, + + pushTransitionWithError: function(begin, end, callback, error) { + var method = this.startEndStates[""+begin+end]; + if (method) { + this[method].call(this, begin, end, callback); + } else { + this.pushTransition(begin, end, callback, error); + } + }, + + addTransition: function(begin, end, callback) { + this.addTransitionWithError(begin, end, callback, null); + }, + + addTransitionWithError: function(begin, end, callback, error) { + this.pushTransitionWithError(begin, end, callback, error); + } + }); + + var RecordingSchedulerTest = RecordingSchedulerTest.extend({ + + init: function() { + this.super.init(); + this.blocked = function() {}; + this.bindToCurrentChannel = this.blocked; + this.onChangeState = this.blocked; + this.createVideoBroadcast = function() { + if (!this.vidBroadObj) { + this.vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); + } + } + }, + + onPVREvent: function(resolve, reject, event) { + console.log("beforeTest"); + this.super.onPVREvent(resolve, reject, event.state, event.recording); + }, + + beforeTest: function(resolve, reject) { + console.log("beforeTest"); + this.super.beforeTest(resolve, reject); + } + + }); + +}

1 0

r1510 - oipf/view
by ygrego＠users.nuiton.org 28 May '15

28 May '15

Author: ygrego Date: 2015-05-28 08:23:05 +0000 (Thu, 28 May 2015) New Revision: 1510 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1510 Log: Modification of "init.js" script source. Modified: oipf/view/test.html Modified: oipf/view/test.html =================================================================== --- oipf/view/test.html 2015-05-28 08:20:31 UTC (rev 1509) +++ oipf/view/test.html 2015-05-28 08:23:05 UTC (rev 1510) @@ -78,7 +78,7 @@ <script src="../data/data.js" type="text/javascript"></script> <script src="../data/XmlTvData.js" type="text/javascript"></script> <script src="../js/impl/model/ModelFactory.js" type="text/javascript"></script> - <script src="../js/init/init.js" type="text/javascript"></script> + <script src="../init/init.js" type="text/javascript"></script> <script src="../js/test/TestCase.js" type="text/javascript"></script> <script src="../js/test/ApplicationManagerTest.js" type="text/javascript"></script>

1 0

r1509 - in oipf: . init
by ygrego＠users.nuiton.org 28 May '15

28 May '15

Author: ygrego Date: 2015-05-28 08:20:31 +0000 (Thu, 28 May 2015) New Revision: 1509 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1509 Log: The directory "js/init" has been moved to the root of project. ("oipf/init") Added: oipf/init/ oipf/init/init.js Copied: oipf/init/init.js (from rev 1507, oipf/js/init/init.js) =================================================================== --- oipf/init/init.js (rev 0) +++ oipf/init/init.js 2015-05-28 08:20:31 UTC (rev 1509) @@ -0,0 +1,66 @@ +// Used in the channelType property to indicate a TV channel. +CHANNEL_CONSTANT = {"TYPE_TV": 0}; + +var VideoBroadcastObject = document.registerElement('video-broadcast', { + prototype: VideoBroadcastObject.prototype, + extends: "object" +}); + +/* + * Description: + * Contain the identifier type of channel as key and a boolean as value to indicate if this type of channel + * can be created. + */ +var CHANNEL_CREATION = { + 0: true, //ID_ANALOG + 10: true, //ID_DVB_C + 11: true, //ID_DVB_S + 12: true, //ID_DVB_T + 13: true, //ID_DVB_SI_DIRECT + 14: true, //ID_DVB_C2 + 15: true, //ID_DVB_S2 + 16: true, //ID_DVB_T2 + 20: true, //ID_ISDB_C + 21: true, //ID_ISDB_S + 22: true, //ID_ISDB_T + 30: true, //ID_ATSC_T + 40: true, //ID_IPTV_SDS + 41: true //ID_IPTV_URI +}; +/* + * Description: + * Information necessary to channel creation of identifier type ID_DVB_*. + * Not a real data, just for simulation but the syntactic structure is based on + * DVB-SI [EN 300 468] section 6.2.13. + */ +var TERRESTIAL_DELIVERY_SYSTEM_DESCRIPTOR = [ + "0x5A", //descriptor_tag + "01010000", //descriptor_length + "0x00000001", //centre_frequency + "011", //bandwidth + "1", //priority + "1", //Time_Slicing_indicator + "1", //MPE-FEC_indicator + "N/A", //reserved_future_use + "00", //constellation + "000", //hierarchy_information + "001", //code_rate-HP_stream + "000", //code_rate-LP_stream + "00", //guard_interval + "00", //transmission_mode + "0", //other_frequency_flag + "N/A" //reserved_future_use +]; + +if (!oipfObjectFactory) { + var modelFactory = new ModelFactory(data); + var dateUtils = new DateUtils(); + var oipfObjectFactory = new OipfObjectFactory(modelFactory, dateUtils); +} + +if (!Date.now) { + Date.now = function now() { + return new Date().getTime(); + }; +} +

1 0

r1508 - oipf/view
by ygrego＠users.nuiton.org 28 May '15

28 May '15

Author: ygrego Date: 2015-05-28 08:13:11 +0000 (Thu, 28 May 2015) New Revision: 1508 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1508 Log: Modification of a script source referencing now the file "init/init.js". (Which was previously "initObj/init") Modified: oipf/view/test.html Modified: oipf/view/test.html =================================================================== --- oipf/view/test.html 2015-05-28 08:06:22 UTC (rev 1507) +++ oipf/view/test.html 2015-05-28 08:13:11 UTC (rev 1508) @@ -78,7 +78,7 @@ <script src="../data/data.js" type="text/javascript"></script> <script src="../data/XmlTvData.js" type="text/javascript"></script> <script src="../js/impl/model/ModelFactory.js" type="text/javascript"></script> - <script src="../js/initObj/init.js" type="text/javascript"></script> + <script src="../js/init/init.js" type="text/javascript"></script> <script src="../js/test/TestCase.js" type="text/javascript"></script> <script src="../js/test/ApplicationManagerTest.js" type="text/javascript"></script>

1 0

r1507 - oipf/js
by ygrego＠users.nuiton.org 28 May '15

28 May '15

Author: ygrego Date: 2015-05-28 08:06:22 +0000 (Thu, 28 May 2015) New Revision: 1507 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1507 Log: The directory "initObj" has been renamed in "init" Added: oipf/js/init/ Removed: oipf/js/initObj/

1 0

r1506 - oipf/js/utils
by ygrego＠users.nuiton.org 28 May '15

28 May '15

Author: ygrego Date: 2015-05-28 07:34:18 +0000 (Thu, 28 May 2015) New Revision: 1506 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1506 Log: Addition of a new class "XmlToJson". Added: oipf/js/utils/XmlToJson.js Added: oipf/js/utils/XmlToJson.js =================================================================== --- oipf/js/utils/XmlToJson.js (rev 0) +++ oipf/js/utils/XmlToJson.js 2015-05-28 07:34:18 UTC (rev 1506) @@ -0,0 +1,173 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ + +var XmlToJson = Class.extend({ + unwantedNodeName: { + "#text": true, + "#comment": true + }, + + mappingValue: { + "true": true, + "false": false + }, + + wantedNode: "channel", + + init: function(xmlDocument) { + xmlDocument && (this.xmlDocument = xmlDocument) && + (this.json = {}) && this.initJson(); + }, + + initJson: function() { + if (!this.xmlDocument) { + return null; + } + console.log(this.xmlDocument.firstChild); + this.rootsNode = this.xmlDocument.firstChild; + + //We already know that document contains at least one child. + var rootsName = this.rootsNode.nodeName; + this.rootsElementJson = this.json[rootsName] = {}; + + var rootsObject = this.json[rootsName]; + + this.convertAttributesToProperties(rootsObject, this.rootsNode); + }, + + convertAttributesToProperties: function(object, node) { + var attributesList = node.attributes; + + for (var i = 0, li = attributesList.length; i < li; i++) { + var currentAttributes = attributesList[i]; + var name = currentAttributes.name; + var value = currentAttributes.value; + object[name] = value; + } + return object; + }, + + getJson: function() { + if (!this.json) { + console.log("Your xml document is not valid or null."); + return null; + } + var data = this.rootsNode.childNodes; + var dataStoredByKind = {}; + + for (var i = 0, li = data.length; i < li; i++) { + var currentNode = data[i]; + this.setPropertiesFromDomNodeList(currentNode, this.rootsElementJson); + } + return this.json; + }, + + setPropertiesFromDomNodeList: function(currentNode, parentContainer) { + + if (this.unwantedNodeName[currentNode.nodeName]) { + console.log("This node are useless.", currentNode.nodeName); + return; + } + console.log(currentNode.nodeName); + var childNodes = currentNode.childNodes; + var childNodeName; + var currentChildNode; + var nodeDataMap = {}; + if (currentNode.hasAttributes()) { + nodeDataMap = + this.convertAttributesToProperties(nodeDataMap, currentNode); + } + + for (var i = 0, li = childNodes.length; i < li; i++) { + currentChildNode = childNodes[i]; + childNodeName = currentChildNode.nodeName; + console.log(childNodeName); + + if (!this.unwantedNodeName[childNodeName]) { + nodeDataMap = this.setPropertiesFromDomNodeList + (currentChildNode, nodeDataMap); + } + + if (/\w+/.exec(currentChildNode.nodeValue) && + (currentChildNode.childNodes.length == 0)) { + + console.log(currentChildNode.nodeValue); + + if (!this.isMapNotEmpty(nodeDataMap)) { + var currentNodeName = currentNode.nodeName; + var key = currentNodeName; + var value = currentChildNode.nodeValue; + this.addPropertiesToMap(parentContainer, key, value, + currentNode.parentNode); + } + + //This add concern only the nodes which have an atomic content + if (this.isMapNotEmpty(nodeDataMap) && !currentChildNode) { + var key = "#text"; + var value = currentChildNode.nodeValue; + this.addPropertiesToMap(nodeDataMap, key, value, + currentNode.parentNode); + } + } + } + + //Addition of node in parent container even if this one have not a value + if (!this.unwantedNodeName[currentNode.nodeName] && + !currentChildNode) { + + var currentNodeName = currentNode.nodeName; + var key = currentNodeName; + this.addPropertiesToMap(parentContainer, key, null, + currentNode.parentNode); + } + + var currentNodeName = currentNode.nodeName; + if (this.isMapNotEmpty(nodeDataMap)) { + var key = currentNodeName; +// parentContainer[key] = nodeDataMap; + this.addPropertiesToMap(parentContainer, key, nodeDataMap, + currentNode.parentNode); + } + + return parentContainer; + }, + + isMapNotEmpty: function(map) { + return Object.keys(map).length > 0; + }, + + /* + * + */ + addPropertiesToMap: function(map, key, value, parentNode) { +// map[key] = value; + + var childNodesWithSpecificName = parentNode.getElementsByTagName(key); + var specificNodesNumber = childNodesWithSpecificName.length; + + if ((specificNodesNumber > 1) && !map[key]) { + map[key] = []; + } + + var nodeValue = map[key]; + + var value = this.setValue(value); + + if (nodeValue && (nodeValue instanceof Array)) { + map[key].push(value); + } else { + map[key] = value; + } + }, + + setValue: function(value) { + var newValue = this.mappingValue[value]; + if ((typeof value) == "string" && newValue != undefined) { + return newValue; + } + return value; + } +});

1 0

r1505 - oipf/data
by ygrego＠users.nuiton.org 27 May '15

27 May '15

Author: ygrego Date: 2015-05-27 16:06:07 +0000 (Wed, 27 May 2015) New Revision: 1505 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1505 Log: Deletions of every reference to word "null". Modified: oipf/data/oipfChannels.xml Modified: oipf/data/oipfChannels.xml =================================================================== --- oipf/data/oipfChannels.xml 2015-05-27 16:03:00 UTC (rev 1504) +++ oipf/data/oipfChannels.xml 2015-05-27 16:06:07 UTC (rev 1505) @@ -31,7 +31,7 @@ <hidden>false</hidden> <is3D>false</is3D> <isHD>false</isHD> - <logoURL>null</logoURL> + <logoURL></logoURL> </channel> <channel> <name>D17</name> @@ -64,7 +64,7 @@ <hidden>false</hidden> <is3D>false</is3D> <isHD>false</isHD> - <logoURL>null</logoURL> + <logoURL></logoURL> </channel> <channel> <name>FRANCE_2</name> @@ -97,7 +97,7 @@ <hidden>false</hidden> <is3D>false</is3D> <isHD>false</isHD> - <logoURL>null</logoURL> + <logoURL></logoURL> </channel> <channel> <name>FRANCE_3</name> @@ -130,7 +130,7 @@ <hidden>false</hidden> <is3D>false</is3D> <isHD>false</isHD> - <logoURL>null</logoURL> + <logoURL></logoURL> </channel> <channel> <name>FRANCE_4</name> @@ -163,7 +163,7 @@ <hidden>false</hidden> <is3D>false</is3D> <isHD>false</isHD> - <logoURL>null</logoURL> + <logoURL></logoURL> </channel> <channel> <name>FRANCE_5</name> @@ -196,7 +196,7 @@ <hidden>false</hidden> <is3D>false</is3D> <isHD>false</isHD> - <logoURL>null</logoURL> + <logoURL></logoURL> </channel> <channel> <name>M6</name> @@ -229,7 +229,7 @@ <hidden>false</hidden> <is3D>false</is3D> <isHD>false</isHD> - <logoURL>null</logoURL> + <logoURL></logoURL> </channel> <channel> <name>NRJ_12</name> @@ -262,7 +262,7 @@ <hidden>false</hidden> <is3D>false</is3D> <isHD>false</isHD> - <logoURL>null</logoURL> + <logoURL></logoURL> </channel> <channel> <name>NT1</name> @@ -295,7 +295,7 @@ <hidden>false</hidden> <is3D>false</is3D> <isHD>false</isHD> - <logoURL>null</logoURL> + <logoURL></logoURL> </channel> <channel> <name>RTL9</name> @@ -328,7 +328,7 @@ <hidden>false</hidden> <is3D>false</is3D> <isHD>false</isHD> - <logoURL>null</logoURL> + <logoURL></logoURL> </channel> <channel> <name>TF1</name> @@ -361,7 +361,7 @@ <hidden>false</hidden> <is3D>false</is3D> <isHD>false</isHD> - <logoURL>null</logoURL> + <logoURL></logoURL> </channel> <channel> <name>TMC</name> @@ -394,7 +394,7 @@ <hidden>false</hidden> <is3D>false</is3D> <isHD>false</isHD> - <logoURL>null</logoURL> + <logoURL></logoURL> </channel> <channel> <name>W9</name> @@ -427,6 +427,6 @@ <hidden>false</hidden> <is3D>false</is3D> <isHD>false</isHD> - <logoURL>null</logoURL> + <logoURL></logoURL> </channel> </channelList> \ No newline at end of file

1 0