Produced by Araxis Merge on 10/4/2017 9:15:13 AM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | vista-js.zip\vista-js\src | command-line.js | Tue Dec 15 21:45:19 2015 UTC |
| 2 | vista-js.zip\vista-js\src | command-line.js | Wed Oct 4 13:40:41 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 184 |
| Changed | 1 | 8 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | 'use stric t'; | |
| 2 | ||
| 3 | var util = require(' util'); | |
| 4 | var _ = re quire('und erscore'); | |
| 5 | ||
| 6 | var inspec t = _.part ial(util.i nspect, _, { | |
| 7 | depth: null | |
| 8 | }); | |
| 9 | ||
| 10 | var argv = require(' yargs') | |
| 11 | .usage ('Usage: $ 0 --host < host> --po rt <port> --credenti als [acces sCode;veri fyCode] -- context [c ontext] -- rpc <rpc> --params [ params] -- paramType [type] --p aramDelimi ter [char] --connect Timeout [m illis] --s endTimeout [millis] --logLevel [level]') | |
| 12 | .deman d(['host', 'port', ' rpc']) | |
| 13 | .argv; | |
| 14 | ||
| 15 | var bunyan = require ('bunyan') ; | |
| 16 | var RpcCli ent = requ ire('./Rpc Client').R pcClient; | |
| 17 | var RpcPar ameter = r equire('./ RpcParamet er').RpcPa rameter; | |
| 18 | ||
| 19 | var defaul tConfig = { | |
| 20 | // host: ' IP ', | |
| 21 | // port: PORT , | |
| 22 | accessCode : ' USER ', | |
| 23 | verifyCode : ' PW ', | |
| 24 | contex t: 'VPR UI CONTEXT', | |
| 25 | localI P: '127.0. 0.1', | |
| 26 | localA ddress: 'l ocalhost', | |
| 27 | connec tTimeout: 3000, | |
| 28 | sendTi meout: 100 00 | |
| 29 | }; | |
| 30 | ||
| 31 | var config = { | |
| 32 | host: argv.host, | |
| 33 | port: argv.port | |
| 34 | }; | |
| 35 | ||
| 36 | var paramD elimiter = argv.para mDelimiter || ','; | |
| 37 | ||
| 38 | var argLis t = []; | |
| 39 | if (argv.p arams) { | |
| 40 | argLis t = argv.p arams.spli t(paramDel imiter); | |
| 41 | if (ar gv.paramTy pe === 'li st') { | |
| 42 | ar gList = [R pcParamete r.list(JSO N.parse(ar gv.params) )]; | |
| 43 | } | |
| 44 | } | |
| 45 | ||
| 46 | if (argv.c redentials ) { | |
| 47 | config .accessCod e = argv.c redentials .split(';' )[0]; | |
| 48 | config .verifyCod e = argv.c redentials .split(';' )[1]; | |
| 49 | } | |
| 50 | ||
| 51 | if (argv.c ontext) { | |
| 52 | config .context = argv.cont ext; | |
| 53 | } | |
| 54 | ||
| 55 | if (argv.c onnectTime out) { | |
| 56 | config .connectTi meout = ar gv.connect Timeout; | |
| 57 | } | |
| 58 | ||
| 59 | if (argv.s endTimeout ) { | |
| 60 | config .sendTimeo ut = argv. sendTimeou t; | |
| 61 | } | |
| 62 | ||
| 63 | config = _ .defaults( config, de faultConfi g); | |
| 64 | ||
| 65 | var log = bunyan.cre ateLogger( { | |
| 66 | name: 'rpc', | |
| 67 | level: argv.logL evel || 'e rror' | |
| 68 | }); | |
| 69 | ||
| 70 | log.debug( config); | |
| 71 | ||
| 72 | console.lo g('RUNNING RPC: "%s" ', argv.rp c); | |
| 73 | if (argLis t.length > 0) { | |
| 74 | consol e.log('\tw ith "%s"', util.insp ect(argLis t)); | |
| 75 | } | |
| 76 | // RpcClie nt.callRpc (log, conf ig, 'VPR G ET PATIENT DATA JSON ', '1', '2 ', functio n(error, r esult) { | |
| 77 | RpcClient. callRpc(lo g, config, argv.rpc, argList, function(e rror, resu lt) { | |
| 78 | if (er ror) { | |
| 79 | co nsole.log( ); | |
| 80 | co nsole.erro r('Unable to run RPC "%s"', ar gv.rpc); | |
| 81 | co nsole.erro r(error); | |
| 82 | pr ocess.exit (1); | |
| 83 | re turn; | |
| 84 | } | |
| 85 | ||
| 86 | consol e.log(); | |
| 87 | try { | |
| 88 | re sult = JSO N.parse(re sult); | |
| 89 | } catc h (e) { | |
| 90 | // do nothin g | |
| 91 | } | |
| 92 | consol e.log('RES ULT:'); | |
| 93 | consol e.log(insp ect(result )); | |
| 94 | consol e.log(); | |
| 95 | proces s.exit(0); | |
| 96 | }); |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.