fixing some ref links

2016-01-11 12:28:13 -08:00 · 2016-01-11 12:28:13 -08:00 · bd967c7513
parent 9f1755374a
commit bd967c7513
16 changed files with 273 additions and 252 deletions
--- a/dao/socketServer.js
+++ b/dao/socketServer.js
@ -4,7 +4,7 @@ const net = require('net'),
    tls = require('tls'),
    fs = require('fs'),
    dgram = require('dgram'),
-    eventParser = require('../lib/eventParser.js'),
+    eventParser = require('./eventParser.js'),
    Pubsub = require('event-pubsub'),
    Message = require('js-message');

@ -244,9 +244,10 @@ function init(path,config,log,port){

                                    server.log('received event of : '.debug,message.type.data,message.data);

-                                    if(message.data.id)
+                                    if(message.data.id){
                                        sock.id=message.data.id;
-
+                                    }
+                                    
                                    server.trigger(
                                        message.type,
                                        message.data,
--- a/package.json
+++ b/package.json
@ -19,12 +19,14 @@
  "devDependencies": {
    "blanket": "^1.2.1",
    "codacy-coverage": "^1.1.3",
-    "jasmine": "^2.4.1"
+    "jasmine": "^2.4.1",
+    "istanbul": "^0.4.1",
+    "codacy-coverage": "^1.1.3"
  },
  "scripts": {
    "test": "istanbul cover -x **/spec/** -dir ./spec/coverage jasmine",
    "cover": "istanbul cover -x **/spec/** -dir ./spec/coverage jasmine",
-    "coverup": "cat ./spec/coverage/lcov.info | codacy-coverage"
+    "coverup": "istanbul cover -x **/spec/** -dir ./spec/coverage jasmine&&cat ./spec/coverage/lcov.info | codacy-coverage"
  },
  "keywords": [
    "IPC",
--- a/spec/coverage/coverage.json
+++ b/spec/coverage/coverage.json
--- a/spec/coverage/lcov-report/index.html
+++ b/spec/coverage/lcov-report/index.html
@ -116,7 +116,7 @@
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
  Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 20:57:31 GMT-0800 (PST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 21:12:33 GMT-0800 (PST)
 </div>
 </div>
 <script src="prettify.js"></script>
--- a/spec/coverage/lcov-report/node-ipc/dao/client.js.html
+++ b/spec/coverage/lcov-report/node-ipc/dao/client.js.html
@ -279,7 +279,9 @@
 234
 235
 236
-237</td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+237
+238
+239</td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@ -421,6 +423,8 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">13×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">13×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@ -587,7 +591,7 @@ function connect(){
        <span class="missing-if-branch" title="if path not taken" >I</span>if (process.platform ==='win32' &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >!client.path.startsWith('\\\\.\\pipe\\'))</span>{
 <span class="cstat-no" title="statement not covered" >            path = path.replace(/^\//, '');</span>
 <span class="cstat-no" title="statement not covered" >            path = path.replace(/\//g, '-');</span>
-<span class="cstat-no" title="statement not covered" >            path= '\\\\.\\pipe\\'+path;</span>
+<span class="cstat-no" title="statement not covered" >            path= `\\\\.\\pipe\\${path}`;</span>
        }
        client.socket = net.connect(
            {
@ -655,7 +659,9 @@ function connect(){
    client.socket.on(
        'close',
        function connectionClosed(){
-            client.log('connection closed'.notice ,client.id.variable , client.path.variable, client.retriesRemaining+' tries remaining of '+client.config.maxRetries);
+            client.log('connection closed'.notice ,client.id.variable , client.path.variable,
+            `${client.retriesRemaining} tries remaining of ${client.config.maxRetries}`
+        );
 &nbsp;
            if(
                client.config.stopRetrying || client.retriesRemaining&lt;1
@ -757,7 +763,7 @@ module.exports=init;
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
  Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 20:57:31 GMT-0800 (PST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 21:12:33 GMT-0800 (PST)
 </div>
 </div>
 <script src="../../prettify.js"></script>
--- a/spec/coverage/lcov-report/node-ipc/dao/eventParser.js.html
+++ b/spec/coverage/lcov-report/node-ipc/dao/eventParser.js.html
@ -130,7 +130,7 @@ module.exports=parser;
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
  Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 20:57:31 GMT-0800 (PST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 21:12:33 GMT-0800 (PST)
 </div>
 </div>
 <script src="../../prettify.js"></script>
--- a/spec/coverage/lcov-report/node-ipc/dao/index.html
+++ b/spec/coverage/lcov-report/node-ipc/dao/index.html
@ -103,7 +103,7 @@
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
  Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 20:57:31 GMT-0800 (PST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 21:12:33 GMT-0800 (PST)
 </div>
 </div>
 <script src="../../prettify.js"></script>
--- a/spec/coverage/lcov-report/node-ipc/dao/socketServer.js.html
+++ b/spec/coverage/lcov-report/node-ipc/dao/socketServer.js.html
@ -412,7 +412,10 @@
 367
 368
 369
-370</td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+370
+371
+372
+373</td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@ -508,6 +511,9 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">4×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">4×</span>
 <span class="cline-any cline-yes">2×</span>
 <span class="cline-any cline-yes">2×</span>
@ -875,7 +881,10 @@ function init(path,config,log,port){
            fs.unlink(
                this.path,
                function () {
-                    server.log('starting server on '.debug,server.path.variable,((server.port)?':'+server.port:'').variable);
+                    server.log(
+                        'starting server on '.debug,server.path.variable,
+                        ((server.port)?`:${server.port}`:'').variable
+                    );
 &nbsp;
                    if(!server.udp4 &amp;&amp; !server.udp6){
                        <span class="missing-if-branch" title="else path not taken" >E</span>if(!server.config.tls){
@ -887,12 +896,12 @@ function init(path,config,log,port){
 <span class="cstat-no" title="statement not covered" >                            if(server.config.tls.private){</span>
 <span class="cstat-no" title="statement not covered" >                                server.config.tls.key=fs.readFileSync(server.config.tls.private);</span>
                            }else{
-<span class="cstat-no" title="statement not covered" >                                server.config.tls.key=fs.readFileSync(__dirname+'/../local-node-ipc-certs/private/server.key');</span>
+<span class="cstat-no" title="statement not covered" >                                server.config.tls.key=fs.readFileSync(`${__dirname}/../local-node-ipc-certs/private/server.key`);</span>
                            }
 <span class="cstat-no" title="statement not covered" >                            if(server.config.tls.public){</span>
 <span class="cstat-no" title="statement not covered" >                                server.config.tls.cert=fs.readFileSync(server.config.tls.public);</span>
                            }else{
-<span class="cstat-no" title="statement not covered" >                                server.config.tls.cert=fs.readFileSync(__dirname+'/../local-node-ipc-certs/server.pub');</span>
+<span class="cstat-no" title="statement not covered" >                                server.config.tls.cert=fs.readFileSync(`${__dirname}/../local-node-ipc-certs/server.pub`);</span>
                            }
 <span class="cstat-no" title="statement not covered" >                            if(server.config.tls.dhparam){</span>
 <span class="cstat-no" title="statement not covered" >                                server.config.tls.dhparam=fs.readFileSync(server.config.tls.dhparam);</span>
@ -1072,10 +1081,10 @@ function init(path,config,log,port){
                    if(!port){
                        server.log('starting server as'.debug, 'Unix || Windows Socket'.variable);
                        <span class="missing-if-branch" title="if path not taken" >I</span>if (process.platform ==='win32'){
-<span class="cstat-no" title="statement not covered" >    						                                                server.path = server.path.replace(/^\//, '');</span>
-<span class="cstat-no" title="statement not covered" >    						                                                server.path = server.path.replace(/\//g, '-');</span>
-<span class="cstat-no" title="statement not covered" >    						                                                server.path= '\\\\.\\pipe\\'+server.path;</span>
-						                                                }
+<span class="cstat-no" title="statement not covered" >                            server.path = server.path.replace(/^\//, '');</span>
+<span class="cstat-no" title="statement not covered" >                            server.path = server.path.replace(/\//g, '-');</span>
+<span class="cstat-no" title="statement not covered" >                            server.path= `\\\\.\\pipe\\${server.path}`;</span>
+                        }
 &nbsp;
                        server.server.listen(
                            server.path,
@ -1131,7 +1140,7 @@ function init(path,config,log,port){
 <span class="cstat-no" title="statement not covered" >                    destroyedSocketId=socket.id;</span>
                }
 &nbsp;
-                server.log('socket disconnected'.notice,' '+destroyedSocketId.variable);
+                server.log('socket disconnected'.notice,destroyedSocketId.toString().variable);
 &nbsp;
                <span class="missing-if-branch" title="if path not taken" >I</span>if(socket &amp;&amp; socket.destroy){
 <span class="cstat-no" title="statement not covered" >                    socket.destroy();</span>
@ -1156,7 +1165,7 @@ module.exports=init;
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
  Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 20:57:31 GMT-0800 (PST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 21:12:33 GMT-0800 (PST)
 </div>
 </div>
 <script src="../../prettify.js"></script>
--- a/spec/coverage/lcov-report/node-ipc/entities/Defaults.js.html
+++ b/spec/coverage/lcov-report/node-ipc/entities/Defaults.js.html
@ -328,7 +328,7 @@ module.exports=Defaults;
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
  Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 20:57:31 GMT-0800 (PST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 21:12:33 GMT-0800 (PST)
 </div>
 </div>
 <script src="../../prettify.js"></script>
--- a/spec/coverage/lcov-report/node-ipc/entities/LogColors.js.html
+++ b/spec/coverage/lcov-report/node-ipc/entities/LogColors.js.html
@ -94,7 +94,7 @@ module.exports=LogColors;
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
  Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 20:57:31 GMT-0800 (PST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 21:12:33 GMT-0800 (PST)
 </div>
 </div>
 <script src="../../prettify.js"></script>
--- a/spec/coverage/lcov-report/node-ipc/entities/index.html
+++ b/spec/coverage/lcov-report/node-ipc/entities/index.html
@ -90,7 +90,7 @@
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
  Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 20:57:31 GMT-0800 (PST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 21:12:33 GMT-0800 (PST)
 </div>
 </div>
 <script src="../../prettify.js"></script>
--- a/spec/coverage/lcov-report/node-ipc/index.html
+++ b/spec/coverage/lcov-report/node-ipc/index.html
@ -77,7 +77,7 @@
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
  Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 20:57:31 GMT-0800 (PST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 21:12:33 GMT-0800 (PST)
 </div>
 </div>
 <script src="../prettify.js"></script>
--- a/spec/coverage/lcov-report/node-ipc/node-ipc.js.html
+++ b/spec/coverage/lcov-report/node-ipc/node-ipc.js.html
@ -68,7 +68,8 @@
 23
 24
 25
-26</td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+26
+27</td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@ -77,6 +78,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1×</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@ -102,6 +104,7 @@ const colors = require('colors'),
 class IPCModule extends IPC{
    constructor(){
        super();
+        //include IPC to make extensible
        Object.defineProperty(
            this,
            'IPC',
@ -124,7 +127,7 @@ module.exports=new IPCModule;
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
  Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 20:57:31 GMT-0800 (PST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 21:12:33 GMT-0800 (PST)
 </div>
 </div>
 <script src="../prettify.js"></script>
--- a/spec/coverage/lcov-report/node-ipc/services/IPC.js.html
+++ b/spec/coverage/lcov-report/node-ipc/services/IPC.js.html
@ -1033,7 +1033,7 @@ module.exports=IPC;
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
  Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 20:57:31 GMT-0800 (PST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 21:12:33 GMT-0800 (PST)
 </div>
 </div>
 <script src="../../prettify.js"></script>
--- a/spec/coverage/lcov-report/node-ipc/services/index.html
+++ b/spec/coverage/lcov-report/node-ipc/services/index.html
@ -77,7 +77,7 @@
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
  Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 20:57:31 GMT-0800 (PST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Jan 10 2016 21:12:33 GMT-0800 (PST)
 </div>
 </div>
 <script src="../../prettify.js"></script>
--- a/spec/coverage/lcov.info
+++ b/spec/coverage/lcov.info
@ -6,9 +6,9 @@ FNH:1
 FNDA:1,(anonymous_1)
 DA:3,1
 DA:9,1
-DA:10,1
-DA:23,1
-DA:25,1
+DA:11,1
+DA:24,1
+DA:26,1
 LF:5
 LH:5
 BRF:0
@ -287,9 +287,9 @@ FN:55,connect
 FN:122,(anonymous_5)
 FN:131,connectionMade
 FN:140,connectionClosed
-FN:164,retryTimeout
-FN:169,resetRetriesCheck
-FN:186,(anonymous_10)
+FN:166,retryTimeout
+FN:171,resetRetriesCheck
+FN:188,(anonymous_10)
 FNF:10
 FNH:10
 FNDA:7,init
@ -363,48 +363,48 @@ DA:133,3
 DA:134,3
 DA:138,13
 DA:141,13
-DA:143,13
-DA:147,7
-DA:148,7
-DA:154,7
-DA:155,7
+DA:145,13
+DA:149,7
+DA:150,7
 DA:156,7
+DA:157,7
 DA:158,7
-DA:161,6
+DA:160,7
 DA:163,6
 DA:165,6
-DA:166,6
 DA:167,6
 DA:168,6
+DA:169,6
 DA:170,6
-DA:171,2
-DA:180,6
-DA:184,13
-DA:187,7
-DA:188,7
-DA:189,0
-DA:193,0
-DA:194,0
-DA:197,0
-DA:198,0
-DA:201,7
-DA:202,7
-DA:205,7
+DA:172,6
+DA:173,2
+DA:182,6
+DA:186,13
+DA:189,7
+DA:190,7
+DA:191,0
+DA:195,0
+DA:196,0
+DA:199,0
+DA:200,0
+DA:203,7
+DA:204,7
 DA:207,7
-DA:208,0
-DA:209,0
-DA:212,7
+DA:209,7
+DA:210,0
+DA:211,0
 DA:214,7
-DA:215,7
 DA:216,7
 DA:217,7
 DA:218,7
+DA:219,7
 DA:220,7
-DA:221,7
-DA:227,7
-DA:228,0
-DA:231,7
-DA:236,1
+DA:222,7
+DA:223,7
+DA:229,7
+DA:230,0
+DA:233,7
+DA:238,1
 LF:103
 LH:75
 BRDA:19,1,0,7
@ -431,24 +431,24 @@ BRDA:97,11,0,0
 BRDA:97,11,1,0
 BRDA:98,12,0,0
 BRDA:98,12,1,0
-BRDA:143,13,0,7
-BRDA:143,13,1,6
-BRDA:144,14,0,13
-BRDA:144,14,1,8
-BRDA:170,15,0,2
-BRDA:170,15,1,4
-BRDA:188,16,0,0
-BRDA:188,16,1,7
-BRDA:193,17,0,0
-BRDA:193,17,1,0
-BRDA:201,18,0,7
-BRDA:201,18,1,0
-BRDA:207,19,0,0
-BRDA:207,19,1,7
-BRDA:207,20,0,7
-BRDA:207,20,1,7
-BRDA:227,21,0,0
-BRDA:227,21,1,7
+BRDA:145,13,0,7
+BRDA:145,13,1,6
+BRDA:146,14,0,13
+BRDA:146,14,1,8
+BRDA:172,15,0,2
+BRDA:172,15,1,4
+BRDA:190,16,0,0
+BRDA:190,16,1,7
+BRDA:195,17,0,0
+BRDA:195,17,1,0
+BRDA:203,18,0,7
+BRDA:203,18,1,0
+BRDA:209,19,0,0
+BRDA:209,19,1,7
+BRDA:209,20,0,7
+BRDA:209,20,1,7
+BRDA:229,21,0,0
+BRDA:229,21,1,7
 BRF:42
 BRH:22
 end_of_record
@ -491,18 +491,18 @@ FN:77,onStart
 FN:83,stop
 FN:86,start
 FN:94,(anonymous_7)
-FN:134,UDPWrite
-FN:142,(anonymous_9)
-FN:147,(anonymous_10)
-FN:162,(anonymous_11)
-FN:170,(anonymous_12)
-FN:182,serverCreated
-FN:192,(anonymous_14)
-FN:202,(anonymous_15)
-FN:211,(anonymous_16)
-FN:258,(anonymous_17)
-FN:285,started
-FN:336,(anonymous_19)
+FN:137,UDPWrite
+FN:145,(anonymous_9)
+FN:150,(anonymous_10)
+FN:165,(anonymous_11)
+FN:173,(anonymous_12)
+FN:185,serverCreated
+FN:195,(anonymous_14)
+FN:205,(anonymous_15)
+FN:214,(anonymous_16)
+FN:261,(anonymous_17)
+FN:288,started
+FN:339,(anonymous_19)
 FNF:19
 FNH:15
 FNDA:2,emit
@ -563,118 +563,118 @@ DA:88,0
 DA:89,0
 DA:92,4
 DA:95,4
-DA:97,4
-DA:98,2
-DA:99,2
-DA:103,0
-DA:104,0
-DA:105,0
+DA:100,4
+DA:101,2
+DA:102,2
+DA:106,0
 DA:107,0
-DA:109,0
+DA:108,0
 DA:110,0
 DA:112,0
-DA:114,0
+DA:113,0
 DA:115,0
 DA:117,0
 DA:118,0
-DA:119,0
+DA:120,0
 DA:121,0
 DA:122,0
-DA:123,0
-DA:128,0
-DA:134,1
-DA:135,2
-DA:136,2
-DA:143,2
-DA:144,0
-DA:145,0
+DA:124,0
+DA:125,0
+DA:126,0
+DA:131,0
+DA:137,1
+DA:138,2
+DA:139,2
+DA:146,2
+DA:147,0
 DA:148,0
-DA:156,2
+DA:151,0
 DA:159,2
-DA:160,2
+DA:162,2
 DA:163,2
-DA:168,4
-DA:171,0
-DA:173,0
-DA:180,4
-DA:182,1
+DA:166,2
+DA:171,4
+DA:174,0
+DA:176,0
 DA:183,4
-DA:185,4
-DA:186,2
-DA:189,4
-DA:190,4
-DA:193,2
-DA:200,4
-DA:203,0
-DA:205,0
-DA:209,4
-DA:212,2
-DA:213,2
-DA:214,0
-DA:215,0
-DA:220,0
-DA:223,2
-DA:224,2
+DA:185,1
+DA:186,4
+DA:188,4
+DA:189,2
+DA:192,4
+DA:193,4
+DA:196,2
+DA:203,4
+DA:206,0
+DA:208,0
+DA:212,4
+DA:215,2
+DA:216,2
+DA:217,0
+DA:218,0
+DA:223,0
+DA:226,2
 DA:227,2
-DA:229,2
-DA:230,0
-DA:231,0
-DA:234,2
-DA:236,2
-DA:238,2
+DA:230,2
+DA:232,2
+DA:233,0
+DA:234,0
+DA:237,2
 DA:239,2
-DA:240,2
+DA:241,2
 DA:242,2
-DA:244,2
+DA:243,2
 DA:245,2
 DA:247,2
-DA:256,4
-DA:259,2
-DA:260,0
-DA:263,2
-DA:264,2
+DA:248,2
+DA:250,2
+DA:259,4
+DA:262,2
+DA:263,0
 DA:266,2
-DA:267,0
+DA:267,2
 DA:269,2
-DA:271,2
-DA:275,4
-DA:280,4
-DA:281,0
-DA:285,1
-DA:286,4
+DA:270,0
+DA:272,2
+DA:274,2
+DA:278,4
+DA:283,4
+DA:284,0
+DA:288,1
 DA:289,4
-DA:290,1
-DA:291,1
-DA:292,0
-DA:293,0
-DA:294,0
-DA:297,1
-DA:302,1
-DA:305,3
-DA:306,1
-DA:307,1
-DA:312,1
-DA:315,2
-DA:316,2
-DA:321,2
-DA:332,4
-DA:334,4
-DA:337,2
-DA:338,2
-DA:339,2
+DA:292,4
+DA:293,1
+DA:294,1
+DA:295,0
+DA:296,0
+DA:297,0
+DA:300,1
+DA:305,1
+DA:308,3
+DA:309,1
+DA:310,1
+DA:315,1
+DA:318,2
+DA:319,2
+DA:324,2
+DA:335,4
+DA:337,4
+DA:340,2
 DA:341,2
 DA:342,2
-DA:343,0
-DA:347,2
-DA:348,0
-DA:351,2
-DA:353,2
-DA:354,0
-DA:357,2
-DA:359,2
-DA:361,2
-DA:366,4
-DA:369,1
+DA:344,2
+DA:345,2
+DA:346,0
+DA:350,2
+DA:351,0
+DA:354,2
+DA:356,2
+DA:357,0
+DA:360,2
+DA:362,2
+DA:364,2
+DA:369,4
+DA:372,1
 LF:151
 LH:95
 BRDA:18,1,0,0
@ -697,72 +697,72 @@ BRDA:54,9,0,0
 BRDA:54,9,1,0
 BRDA:87,10,0,0
 BRDA:87,10,1,4
-BRDA:95,11,0,3
-BRDA:95,11,1,1
-BRDA:97,12,0,2
-BRDA:97,12,1,2
-BRDA:97,13,0,4
-BRDA:97,13,1,3
-BRDA:98,14,0,2
-BRDA:98,14,1,0
-BRDA:104,15,0,0
-BRDA:104,15,1,0
-BRDA:109,16,0,0
-BRDA:109,16,1,0
-BRDA:114,17,0,0
-BRDA:114,17,1,0
-BRDA:117,18,0,0
-BRDA:117,18,1,0
-BRDA:118,19,0,0
-BRDA:118,19,1,0
-BRDA:143,20,0,0
-BRDA:143,20,1,2
-BRDA:157,21,0,1
-BRDA:157,21,1,1
-BRDA:185,22,0,2
-BRDA:185,22,1,2
-BRDA:212,23,0,2
-BRDA:212,23,1,0
-BRDA:212,24,0,2
-BRDA:212,24,1,1
-BRDA:213,25,0,0
-BRDA:213,25,1,2
-BRDA:223,26,0,2
-BRDA:223,26,1,0
-BRDA:229,27,0,0
-BRDA:229,27,1,2
-BRDA:229,28,0,2
-BRDA:229,28,1,2
-BRDA:244,29,0,2
-BRDA:244,29,1,0
-BRDA:259,30,0,0
-BRDA:259,30,1,2
-BRDA:266,31,0,0
-BRDA:266,31,1,2
-BRDA:280,32,0,0
-BRDA:280,32,1,4
-BRDA:289,33,0,1
-BRDA:289,33,1,3
-BRDA:291,34,0,0
-BRDA:291,34,1,1
-BRDA:305,35,0,1
-BRDA:305,35,1,2
-BRDA:305,36,0,3
-BRDA:305,36,1,2
-BRDA:306,37,0,0
-BRDA:306,37,1,1
-BRDA:315,38,0,1
-BRDA:315,38,1,1
-BRDA:341,39,0,2
-BRDA:341,39,1,0
-BRDA:342,40,0,0
-BRDA:342,40,1,2
-BRDA:347,41,0,0
-BRDA:347,41,1,2
-BRDA:353,42,0,0
-BRDA:353,42,1,2
-BRDA:353,43,0,2
-BRDA:353,43,1,2
+BRDA:97,11,0,3
+BRDA:97,11,1,1
+BRDA:100,12,0,2
+BRDA:100,12,1,2
+BRDA:100,13,0,4
+BRDA:100,13,1,3
+BRDA:101,14,0,2
+BRDA:101,14,1,0
+BRDA:107,15,0,0
+BRDA:107,15,1,0
+BRDA:112,16,0,0
+BRDA:112,16,1,0
+BRDA:117,17,0,0
+BRDA:117,17,1,0
+BRDA:120,18,0,0
+BRDA:120,18,1,0
+BRDA:121,19,0,0
+BRDA:121,19,1,0
+BRDA:146,20,0,0
+BRDA:146,20,1,2
+BRDA:160,21,0,1
+BRDA:160,21,1,1
+BRDA:188,22,0,2
+BRDA:188,22,1,2
+BRDA:215,23,0,2
+BRDA:215,23,1,0
+BRDA:215,24,0,2
+BRDA:215,24,1,1
+BRDA:216,25,0,0
+BRDA:216,25,1,2
+BRDA:226,26,0,2
+BRDA:226,26,1,0
+BRDA:232,27,0,0
+BRDA:232,27,1,2
+BRDA:232,28,0,2
+BRDA:232,28,1,2
+BRDA:247,29,0,2
+BRDA:247,29,1,0
+BRDA:262,30,0,0
+BRDA:262,30,1,2
+BRDA:269,31,0,0
+BRDA:269,31,1,2
+BRDA:283,32,0,0
+BRDA:283,32,1,4
+BRDA:292,33,0,1
+BRDA:292,33,1,3
+BRDA:294,34,0,0
+BRDA:294,34,1,1
+BRDA:308,35,0,1
+BRDA:308,35,1,2
+BRDA:308,36,0,3
+BRDA:308,36,1,2
+BRDA:309,37,0,0
+BRDA:309,37,1,1
+BRDA:318,38,0,1
+BRDA:318,38,1,1
+BRDA:344,39,0,2
+BRDA:344,39,1,0
+BRDA:345,40,0,0
+BRDA:345,40,1,2
+BRDA:350,41,0,0
+BRDA:350,41,1,2
+BRDA:356,42,0,0
+BRDA:356,42,1,2
+BRDA:356,43,0,2
+BRDA:356,43,1,2
 BRF:86
 BRH:48
 end_of_record