From 276471cc011ee74ef74f8fb7c38415283aa4ed2a Mon Sep 17 00:00:00 2001 From: Fernando Matzdorf Date: Mon, 5 Oct 2020 19:43:09 -0500 Subject: [PATCH 01/14] v1.1.0 Added record types for contracts and entities --- lib/record_types/contractRecord.js | 174 +++++++++++++++++++++++++++++ lib/record_types/entityRecord.js | 9 ++ package.json | 2 +- 3 files changed, 184 insertions(+), 1 deletion(-) create mode 100644 lib/record_types/contractRecord.js create mode 100644 lib/record_types/entityRecord.js diff --git a/lib/record_types/contractRecord.js b/lib/record_types/contractRecord.js new file mode 100644 index 0000000..a033dd4 --- /dev/null +++ b/lib/record_types/contractRecord.js @@ -0,0 +1,174 @@ +function recordDecompiler(ocid, record) { + return pieces = getContractsFromRecord(record.compiledRelease, record.releases); +} + +function getIDFieldName() { + return 'ocid'; +} + +function getCorrectContractDetails(releases, contract) { + let contract_id = contract.id; + let buyer_id = null; + let details = { + buyer_id: null, + source: [], + sourceRun: [] + } + + releases.map( (r) => { + let real_contract = r.contracts.filter( (c) => c.id == contract_id ); + if(real_contract.length > 0) { + r.parties.map( (p) => { + if(p.roles[0] == 'buyer') details.buyer_id = p.id + } ); + + let sourceFound = false; + r.source.map( (s) => { + details.source.map( (ds) => { + if(ds.id == s.id) sourceFound = true; + } ); + } ); + + if(!sourceFound) { + details.source.push(...r.source); + details.sourceRun.push(...r.sourceRun); + } + } + } ); + + return details; +} + +function getContractsFromRecord(record, releases) { + let contracts = []; + + record.contracts.map( (contract) => { + let details = getCorrectContractDetails(releases, contract); + let buyer_id = details.buyer_id; + let buyer_party = record.parties.filter( (party) => party.id == buyer_id )[0]; + + let award_id = contract.awardID; + let award = record.awards.filter( (award) => award.id == award_id )[0]; + + let supplier_ids = []; + award.suppliers.map( (supplier) => supplier_ids.push(supplier.id) ); + let supplier_parties = record.parties.filter( (party) => supplier_ids.indexOf(party.id) >= 0 ); + + let funder_party = null; + let funder_arr = record.parties.filter( (party) => party.roles[0] == "funder" ); + if(funder_arr.length > 0) funder_party = funder_arr[0]; + + let computed_contract = {}; + for( var x in record ) { + switch(x) { + case 'parties': + computed_contract.parties = []; + if(buyer_party) + computed_contract.parties.push(buyer_party); + if(supplier_parties.length > 0) + supplier_parties.map( (supplier) => { computed_contract.parties.push(supplier) } ); + if(funder_party) { + if(funder_party.name.indexOf(';')) { + let funder_names = funder_party.name.split(';'); + let funder_ids = funder_party.id.split(';'); + funder_names.map( (f, i) => { + let f_party = JSON.parse(JSON.stringify(funder_party)); + f_party.name = f; + f_party.id = funder_ids[i]; + computed_contract.parties.push(f_party); + } ); + } + else + computed_contract.parties.push(funder_party); + } + break; + case 'buyer': + computed_contract.buyer = { id:buyer_id, name: (buyer_party)? buyer_party.name : null } + break; + case 'awards': + computed_contract.awards = award; + break; + case 'contracts': + computed_contract.contracts = contract; + break; + case 'total_amount': + break; + case 'source': + computed_contract.source = details.source; + break; + case 'sourceRun': + computed_contract.sourceRun = details.sourceRun; + break; + default: + computed_contract[x] = record[x]; + break; + } + } + contracts.push(computed_contract); + } ); + + return contracts; +} + +function simplifyObject(obj) { + if(obj == null) return ''; + // - Si es un valor, copiarlo + // - Si es objeto, recursar + // - Si es array + // - Si solo tiene un elemento, volver objeto + // - Si tiene más de un elemento + // - Si son objetos, objeto indexado + // - Si son valores, dejarlo como array + let objType = getType(obj); + let tempObj = {}; + + switch(objType) { + case 'array': + if(obj.length == 1) { + return obj[0]; + } + else { + obj.map((item, index) => { + if(getType(item) == 'object') { + tempObj[index] = simplifyObject(item); + } + else { + tempObj[index] = item; + } + }); + return tempObj; + } + break; + case 'object': + Object.keys(obj).map((key) => { + tempObj[key] = simplifyObject(obj[key]); + }); + return tempObj + default: + return obj; + } +} + +// Returns if a value is a string +function isString (value) { + return typeof value === 'string' || value instanceof String; +} + +// Returns if a value is an array +function isArray (value) { + return value && typeof value === 'object' && value.constructor === Array; +} + +// Returns if a value is an object +function isObject (value) { + return value && typeof value === 'object' && value.constructor === Object; +} + +// Return the type of an object using above functions +function getType(obj) { + if( isArray(obj) ) return 'array'; + else if( isObject(obj) ) return 'object'; + else return isString(obj)? 'string' : typeof obj; +} + +module.exports = { recordDecompiler, getIDFieldName }; diff --git a/lib/record_types/entityRecord.js b/lib/record_types/entityRecord.js new file mode 100644 index 0000000..069ff7b --- /dev/null +++ b/lib/record_types/entityRecord.js @@ -0,0 +1,9 @@ +function recordDecompiler(ocid, record) { + return [record.compiledRelease]; +} + +function getIDFieldName() { + return 'id'; +} + +module.exports = { recordDecompiler, getIDFieldName }; diff --git a/package.json b/package.json index a770e72..8008310 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "record-decompiler", - "version": "1.0.0", + "version": "1.1.0", "description": "Decompiles records from OCDS into individual contracts.", "main": "index.js", "scripts": { From ee967e1f6accacc6b6c5d87f115a8f898fca969b Mon Sep 17 00:00:00 2001 From: Fernando Matzdorf Date: Wed, 14 Oct 2020 16:14:47 -0500 Subject: [PATCH 02/14] Added record type 'elastic' which provides a workable structure for Kibana searches. --- lib/record_types/elasticRecord.js | 157 ++++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 158 insertions(+), 1 deletion(-) create mode 100644 lib/record_types/elasticRecord.js diff --git a/lib/record_types/elasticRecord.js b/lib/record_types/elasticRecord.js new file mode 100644 index 0000000..001f471 --- /dev/null +++ b/lib/record_types/elasticRecord.js @@ -0,0 +1,157 @@ +function recordDecompiler(ocid, record) { + return pieces = getContractsFromRecord(record.compiledRelease); +} + +function getIDFieldName() { + return 'ocid'; +} + +function getContractsFromRecord(record) { + let contracts = []; + + record.contracts.map( (contract) => { + let buyer_id = record.buyer.id; + let buyer_party = record.parties.filter( (party) => party.id == buyer_id )[0]; + let award_id = contract.awardID; + let award = record.awards.filter( (award) => award.id == award_id )[0]; + let supplier_ids = []; + award.suppliers.map( (supplier) => supplier_ids.push(supplier.id) ); + let supplier_parties = record.parties.filter( (party) => supplier_ids.indexOf(party.id) >= 0 ); + let urls = []; + if(award.hasOwnProperty('documents') && award.documents.length > 0) { + award.documents.map( (doc) => urls.push(doc.url) ); + } + + let funder_party = null; + let funder_arr = record.parties.filter( (party) => party.roles[0] == "funder" ); + if(funder_arr.length > 0) funder_party = funder_arr[0]; + + let computed_contract = {}; + computed_contract.url = urls; + + for( var x in record ) { + switch(x) { + case 'parties': + computed_contract.parties = {}; + if(buyer_party) + computed_contract.parties['buyer'] = simplifyObject(buyer_party); + if(supplier_parties.length > 0) { + computed_contract.parties['supplier'] = []; + computed_contract.parties.supplier_names = []; + computed_contract.parties.supplier_ids = []; + supplier_parties.map( (supplier, index) => { + computed_contract.parties['supplier'].push(simplifyObject(supplier)); + computed_contract.parties['supplier_names'].push(supplier.name); + computed_contract.parties['supplier_ids'].push(supplier.id); + } ); + } + if(funder_party) { + computed_contract.parties.funder_names = []; + computed_contract.parties.funder_ids = []; + computed_contract.parties['funder'] = []; + if(funder_party.name.indexOf(';')) { + let funder_names = funder_party.name.split(';'); + let funder_ids = funder_party.id.split(';'); + funder_names.map( (f, i) => { + let f_party = JSON.parse(JSON.stringify(funder_party)); + f_party.name = f; + f_party.id = funder_ids[i]; + computed_contract.parties['funder'].push(simplifyObject(f_party)); + computed_contract.parties['funder_names'].push(f_party.name); + computed_contract.parties['funder_ids'].push(f_party.id); + } ); + } + else { + computed_contract.parties['funder'].push(simplifyObject(funder_party)); + computed_contract.parties['funder_names'].push(f_party.name); + computed_contract.parties['funder_ids'].push(f_party.id); + } + } + break; + case 'buyer': + let buyerObj = record['buyer']; + if(buyer_party.hasOwnProperty('memberOf')) + buyerObj['memberOf'] = computed_contract.parties['buyer'].memberOf; + computed_contract['buyer'] = buyerObj; + break; + case 'awards': + computed_contract.awards = simplifyObject(award); + break; + case 'contracts': + computed_contract.contracts = simplifyObject(contract); + break; + case 'total_amount': + break; + default: + computed_contract[x] = simplifyObject(record[x]); + break; + } + } + contracts.push(computed_contract); + } ); + + return contracts; +} + +function simplifyObject(obj) { + if(obj == null) return ''; + // - Si es un valor, copiarlo + // - Si es objeto, recursar + // - Si es array + // - Si solo tiene un elemento, volver objeto + // - Si tiene más de un elemento + // - Si son objetos, objeto indexado + // - Si son valores, dejarlo como array + let objType = getType(obj); + let tempObj = {}; + + switch(objType) { + case 'array': + if(obj.length == 1) { + return obj[0]; + } + else { + obj.map((item, index) => { + if(getType(item) == 'object') { + tempObj[index] = simplifyObject(item); + } + else { + tempObj[index] = item; + } + }); + return tempObj; + } + break; + case 'object': + Object.keys(obj).map((key) => { + tempObj[key] = simplifyObject(obj[key]); + }); + return tempObj + default: + return obj; + } +} + +// Returns if a value is a string +function isString (value) { + return typeof value === 'string' || value instanceof String; +} + +// Returns if a value is an array +function isArray (value) { + return value && typeof value === 'object' && value.constructor === Array; +} + +// Returns if a value is an object +function isObject (value) { + return value && typeof value === 'object' && value.constructor === Object; +} + +// Return the type of an object using above functions +function getType(obj) { + if( isArray(obj) ) return 'array'; + else if( isObject(obj) ) return 'object'; + else return isString(obj)? 'string' : typeof obj; +} + +module.exports = { recordDecompiler, getIDFieldName }; diff --git a/package.json b/package.json index 8008310..517e1fc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "record-decompiler", - "version": "1.1.0", + "version": "1.1.1", "description": "Decompiles records from OCDS into individual contracts.", "main": "index.js", "scripts": { From ee798bd0ce1b2a60394dcc682a834da887a78742 Mon Sep 17 00:00:00 2001 From: Fernando Matzdorf Date: Wed, 14 Oct 2020 16:52:39 -0500 Subject: [PATCH 03/14] Modified elastic record structure: added classification and area, modified parties.suppliers and awards.documents. --- lib/record_types/elasticRecord.js | 34 +- package-lock.json | 543 +++++++++++++++++++++++++++++- package.json | 1 + 3 files changed, 568 insertions(+), 10 deletions(-) diff --git a/lib/record_types/elasticRecord.js b/lib/record_types/elasticRecord.js index 001f471..0f78250 100644 --- a/lib/record_types/elasticRecord.js +++ b/lib/record_types/elasticRecord.js @@ -1,3 +1,5 @@ +const laundry = require('company-laundry'); + function recordDecompiler(ocid, record) { return pieces = getContractsFromRecord(record.compiledRelease); } @@ -27,7 +29,14 @@ function getContractsFromRecord(record) { if(funder_arr.length > 0) funder_party = funder_arr[0]; let computed_contract = {}; - computed_contract.url = urls; + computed_contract['classification'] = 'contract'; + if(buyer_party.hasOwnProperty('address') && buyer_party.address.hasOwnProperty('countryName')) { + let countryCode = laundry.cleanCountry(buyer_party.address.countryName); + computed_contract['area'] = { + id: laundry.simpleName(countryCode), + name: countryCode + } + } for( var x in record ) { switch(x) { @@ -36,13 +45,14 @@ function getContractsFromRecord(record) { if(buyer_party) computed_contract.parties['buyer'] = simplifyObject(buyer_party); if(supplier_parties.length > 0) { - computed_contract.parties['supplier'] = []; - computed_contract.parties.supplier_names = []; - computed_contract.parties.supplier_ids = []; + computed_contract.parties['suppliers'] = {}; + computed_contract.parties['suppliers']['names'] = []; + computed_contract.parties['suppliers']['ids'] = []; + computed_contract.parties['suppliers']['list'] = []; supplier_parties.map( (supplier, index) => { - computed_contract.parties['supplier'].push(simplifyObject(supplier)); - computed_contract.parties['supplier_names'].push(supplier.name); - computed_contract.parties['supplier_ids'].push(supplier.id); + computed_contract.parties['suppliers']['list'].push(simplifyObject(supplier)); + computed_contract.parties['suppliers']['names'].push(supplier.name); + computed_contract.parties['suppliers']['ids'].push(supplier.id); } ); } if(funder_party) { @@ -75,7 +85,13 @@ function getContractsFromRecord(record) { computed_contract['buyer'] = buyerObj; break; case 'awards': - computed_contract.awards = simplifyObject(award); + let awardObj = award; + let documents = award.documents; + awardObj.documents = { + list: documents, + urls: urls + } + computed_contract.awards = award; break; case 'contracts': computed_contract.contracts = simplifyObject(contract); @@ -83,7 +99,7 @@ function getContractsFromRecord(record) { case 'total_amount': break; default: - computed_contract[x] = simplifyObject(record[x]); + computed_contract[x] = record[x]; break; } } diff --git a/package-lock.json b/package-lock.json index 81f9bd8..5d7dc3d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "record-decompiler", - "version": "1.0.0", + "version": "1.1.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -13,16 +13,94 @@ "through": ">=2.2.7 <3" } }, + "abab": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz", + "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=" + }, + "acorn": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz", + "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=" + }, + "acorn-globals": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz", + "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=", + "requires": { + "acorn": "^2.1.0" + } + }, + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, "array-back": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz", "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==" }, + "asn1": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "requires": { + "safer-buffer": "~2.1.0" + } + }, + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, + "aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" + }, + "aws4": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz", + "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==" + }, + "bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "requires": { + "tweetnacl": "^0.14.3" + } + }, "bson": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.1.tgz", "integrity": "sha512-jCGVYLoYMHDkOsbwJZBCqwMHyH4c+wzgI9hG7Z6SZJRXWr+x58pdIbm2i9a/jFGCkRJqRUr8eoI7lDWa0hTkxg==" }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "requires": { + "delayed-stream": "~1.0.0" + } + }, "command-line-args": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.1.tgz", @@ -34,6 +112,42 @@ "typical": "^4.0.0" } }, + "company-laundry": { + "version": "git+http://git@gitlab.rindecuentas.org/equipo-qqw/company-laundry.git#09c3f5a1fa1ce7bdcea2750f7915b3eb1e0e59f8", + "from": "git+http://git@gitlab.rindecuentas.org/equipo-qqw/company-laundry.git", + "requires": { + "diacritics": "^1.3.0", + "i18n-iso-countries": "^5.1.0", + "lodash": "^4.17.20", + "normalize-space": "^1.0.2" + } + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==" + }, + "cssstyle": { + "version": "0.2.37", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz", + "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=", + "requires": { + "cssom": "0.3.x" + } + }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "requires": { + "assert-plus": "^1.0.0" + } + }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -42,11 +156,62 @@ "ms": "^2.1.1" } }, + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + }, + "diacritics": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/diacritics/-/diacritics-1.3.0.tgz", + "integrity": "sha1-PvqHMj67hj5mls67AILUj/PW96E=" + }, "duplexer": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=" }, + "ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "requires": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, + "escodegen": { + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", + "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", + "requires": { + "esprima": "^4.0.1", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" + } + }, + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" + }, + "estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" + }, + "esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" + }, "event-stream": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-4.0.1.tgz", @@ -61,6 +226,31 @@ "through": "^2.3.8" } }, + "extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + }, + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" + }, + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" + }, "find-replace": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz", @@ -69,16 +259,148 @@ "array-back": "^3.0.1" } }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" + }, + "form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + } + }, "from": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=" }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "requires": { + "assert-plus": "^1.0.0" + } + }, + "har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" + }, + "har-validator": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", + "requires": { + "ajv": "^6.12.3", + "har-schema": "^2.0.0" + } + }, + "http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "requires": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + } + }, + "i18n-iso-countries": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/i18n-iso-countries/-/i18n-iso-countries-5.5.0.tgz", + "integrity": "sha512-S5lPQ3NYmi9n0PFX1L3qv0BQE/EvEVKPFQTLZubQxDQBNwS3Yf6WHk3Aw1wg0bpS8amn7gI5nk5n9JOcnUHvhA==", + "requires": { + "diacritics": "1.3.0" + } + }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" + }, + "jsdom": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz", + "integrity": "sha1-QLQCdwwr2iNGkJa+6Rq2deOx/G4=", + "requires": { + "abab": "^1.0.0", + "acorn": "^2.4.0", + "acorn-globals": "^1.0.4", + "cssom": ">= 0.3.0 < 0.4.0", + "cssstyle": ">= 0.2.29 < 0.3.0", + "escodegen": "^1.6.1", + "nwmatcher": ">= 1.3.7 < 2.0.0", + "parse5": "^1.5.1", + "request": "^2.55.0", + "sax": "^1.1.4", + "symbol-tree": ">= 3.1.0 < 4.0.0", + "tough-cookie": "^2.2.0", + "webidl-conversions": "^2.0.0", + "whatwg-url-compat": "~0.6.5", + "xml-name-validator": ">= 2.0.1 < 3.0.0" + } + }, + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + }, "jsonparse": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=" }, + "jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } + }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "requires": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + } + }, + "lodash": { + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" + }, "lodash.camelcase": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", @@ -89,6 +411,19 @@ "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz", "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=" }, + "mime-db": { + "version": "1.44.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", + "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==" + }, + "mime-types": { + "version": "2.1.27", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz", + "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==", + "requires": { + "mime-db": "1.44.0" + } + }, "mongodb": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.3.2.tgz", @@ -150,11 +485,47 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, + "normalize-space": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/normalize-space/-/normalize-space-1.0.2.tgz", + "integrity": "sha1-93R6tM3Eia+TAisn/eXs3eOMX+Q=", + "requires": { + "jsdom": "^7.1.0" + } + }, + "nwmatcher": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.4.tgz", + "integrity": "sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==" + }, + "oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" + }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, + "optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "requires": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + } + }, + "parse5": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz", + "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=" + }, "pause-stream": { "version": "0.0.11", "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", @@ -163,6 +534,58 @@ "through": "~2.3" } }, + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" + }, + "psl": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" + }, + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + }, + "qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" + }, + "request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "requires": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + } + }, "require_optional": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz", @@ -182,11 +605,27 @@ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==" }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + }, "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "optional": true + }, "split": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", @@ -195,6 +634,22 @@ "through": "2" } }, + "sshpk": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "requires": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + } + }, "stream-combiner": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz", @@ -204,15 +659,101 @@ "through": "~2.3.4" } }, + "symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" + }, "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" }, + "tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + }, + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" + }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "requires": { + "safe-buffer": "^5.0.1" + } + }, + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + }, + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "requires": { + "prelude-ls": "~1.1.2" + } + }, "typical": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz", "integrity": "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==" + }, + "uri-js": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz", + "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==", + "requires": { + "punycode": "^2.1.0" + } + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" + }, + "verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "requires": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, + "webidl-conversions": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-2.0.1.tgz", + "integrity": "sha1-O/glj30xjHRDw28uFpQCoaZwNQY=" + }, + "whatwg-url-compat": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/whatwg-url-compat/-/whatwg-url-compat-0.6.5.tgz", + "integrity": "sha1-AImBEa9om7CXVBzVpFymyHmERb8=", + "requires": { + "tr46": "~0.0.1" + } + }, + "word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==" + }, + "xml-name-validator": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz", + "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=" } } } diff --git a/package.json b/package.json index 517e1fc..8ab9853 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "dependencies": { "JSONStream": "^1.3.5", "command-line-args": "^5.1.1", + "company-laundry": "git+http://git@gitlab.rindecuentas.org/equipo-qqw/company-laundry.git", "event-stream": "^4.0.1", "monk": "^7.0.0" } From 440078634bbece03d9f5b29677a16f345c9e9dff Mon Sep 17 00:00:00 2001 From: Fernando Matzdorf Date: Thu, 15 Oct 2020 12:57:43 -0500 Subject: [PATCH 04/14] Fixed structure for funder parties and added check for existence of buyer party. --- lib/record_types/elasticRecord.js | 19 +++++++++++-------- package.json | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lib/record_types/elasticRecord.js b/lib/record_types/elasticRecord.js index 0f78250..8d327f4 100644 --- a/lib/record_types/elasticRecord.js +++ b/lib/record_types/elasticRecord.js @@ -13,7 +13,7 @@ function getContractsFromRecord(record) { record.contracts.map( (contract) => { let buyer_id = record.buyer.id; - let buyer_party = record.parties.filter( (party) => party.id == buyer_id )[0]; + let buyer_party = record.parties.filter( (party) => party.id == buyer_id )[0] || {}; let award_id = contract.awardID; let award = record.awards.filter( (award) => award.id == award_id )[0]; let supplier_ids = []; @@ -58,7 +58,10 @@ function getContractsFromRecord(record) { if(funder_party) { computed_contract.parties.funder_names = []; computed_contract.parties.funder_ids = []; - computed_contract.parties['funder'] = []; + computed_contract.parties['funders'] = {}; + computed_contract.parties['funders']['names'] = []; + computed_contract.parties['funders']['ids'] = []; + computed_contract.parties['funders']['list'] = []; if(funder_party.name.indexOf(';')) { let funder_names = funder_party.name.split(';'); let funder_ids = funder_party.id.split(';'); @@ -66,15 +69,15 @@ function getContractsFromRecord(record) { let f_party = JSON.parse(JSON.stringify(funder_party)); f_party.name = f; f_party.id = funder_ids[i]; - computed_contract.parties['funder'].push(simplifyObject(f_party)); - computed_contract.parties['funder_names'].push(f_party.name); - computed_contract.parties['funder_ids'].push(f_party.id); + computed_contract.parties['funders']['list'].push(simplifyObject(f_party)); + computed_contract.parties['funders']['names'].push(f_party.name); + computed_contract.parties['funders']['ids'].push(f_party.id); } ); } else { - computed_contract.parties['funder'].push(simplifyObject(funder_party)); - computed_contract.parties['funder_names'].push(f_party.name); - computed_contract.parties['funder_ids'].push(f_party.id); + computed_contract.parties['funders']['list'].push(simplifyObject(funder_party)); + computed_contract.parties['funders']['names'].push(f_party.name); + computed_contract.parties['funders']['ids'].push(f_party.id); } } break; diff --git a/package.json b/package.json index 8ab9853..a34040f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "record-decompiler", - "version": "1.1.1", + "version": "1.1.2", "description": "Decompiles records from OCDS into individual contracts.", "main": "index.js", "scripts": { From a111fa62ddc8dc0947c94489fa721f6c7932d4dc Mon Sep 17 00:00:00 2001 From: Fernando Matzdorf Date: Sat, 27 Feb 2021 16:01:14 -0600 Subject: [PATCH 05/14] Fixed contract identifier: adding contracts.id as a suffix for uniqueness. --- lib/record_types/elasticRecord.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/record_types/elasticRecord.js b/lib/record_types/elasticRecord.js index 8d327f4..d4c6636 100644 --- a/lib/record_types/elasticRecord.js +++ b/lib/record_types/elasticRecord.js @@ -106,12 +106,24 @@ function getContractsFromRecord(record) { break; } } + computed_contract['id'] = buildContractID(computed_contract); contracts.push(computed_contract); } ); return contracts; } +function buildContractID(doc) { + if(doc.hasOwnProperty('contracts')) { + if(doc.contracts.hasOwnProperty('id')) { + if(doc.contracts.id != '') { + return doc.id + '-' + doc.contracts.id; + } + } + } + return doc.id; +} + function simplifyObject(obj) { if(obj == null) return ''; // - Si es un valor, copiarlo From b4f06f633ad4fe8aa2b003f64096c42c0be35bd5 Mon Sep 17 00:00:00 2001 From: Fernando Matzdorf Date: Mon, 1 Mar 2021 19:58:09 -0600 Subject: [PATCH 06/14] Detect null or empty dates and delete field to avoid mapping error in Elastic. --- lib/record_types/elasticRecord.js | 46 +++++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/lib/record_types/elasticRecord.js b/lib/record_types/elasticRecord.js index d4c6636..141dc4b 100644 --- a/lib/record_types/elasticRecord.js +++ b/lib/record_types/elasticRecord.js @@ -107,12 +107,58 @@ function getContractsFromRecord(record) { } } computed_contract['id'] = buildContractID(computed_contract); + fixDates(computed_contract); contracts.push(computed_contract); } ); return contracts; } +function fixDates(contract) { + if(contract.hasOwnProperty('awards')) { + // awards.date + if(contract.awards.hasOwnProperty('date')) { + if(contract.awards.date == '') delete contact.awards.date; + } + // documents.datePublished + if(contract.awards.hasOwnProperty('documents') && contract.awards.documents.hasOwnProperty('list')) { + contract.awards.documents.list.map( (doc) => { + if(doc.datePublished == '') delete doc.datePublished; + } ) + } + } + if(contract.hasOwnProperty('contracts')) { + // contracts.dateSigned + if(contract.contracts.hasOwnProperty('dateSigned')) { + if(contract.contracts.dateSigned == '') delete contract.contracts.dateSigned; + } + if(contract.contracts.hasOwnProperty('period')) { + // contracts.period.startDate + if(contract.contracts.period.hasOwnProperty('startDate')) { + if(contract.contracts.period.startDate == '') delete contract.contracts.period.startDate; + } + // contracts.period.endDate + if(contract.contracts.period.hasOwnProperty('endDate')) { + if(contract.contracts.period.endDate == '') delete contract.contracts.period.endDate; + } + } + } + // date + if(contract.hasOwnProperty('date')) { + if(contract.date == '') delete contract.date; + } + if(contract.hasOwnProperty('tender') && contract.tender.hasOwnProperty('tenderPeriod')) { + // tender.tenderPeriod.startDate + if(contract.tender.tenderPeriod.hasOwnProperty('startDate')) { + if(contract.tender.tenderPeriod.startDate == '') delete contract.tender.tenderPeriod.startDate; + } + // tender.tenderPeriod.endDate + if(contract.tender.tenderPeriod.hasOwnProperty('endDate')) { + if(contract.tender.tenderPeriod.endDate == '') delete contract.tender.tenderPeriod.endDate; + } + } +} + function buildContractID(doc) { if(doc.hasOwnProperty('contracts')) { if(doc.contracts.hasOwnProperty('id')) { diff --git a/package.json b/package.json index a34040f..9d54a92 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "record-decompiler", - "version": "1.1.2", + "version": "1.1.3", "description": "Decompiles records from OCDS into individual contracts.", "main": "index.js", "scripts": { From b5897d89273b16fae772f6800788b7730bba7060 Mon Sep 17 00:00:00 2001 From: Fernando Matzdorf Date: Wed, 21 Apr 2021 18:45:22 -0500 Subject: [PATCH 07/14] Classify records from specific sources as purchases instead of contracts. --- lib/record_types/elasticRecord.js | 13 ++++++++++++- package.json | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/record_types/elasticRecord.js b/lib/record_types/elasticRecord.js index 141dc4b..0448710 100644 --- a/lib/record_types/elasticRecord.js +++ b/lib/record_types/elasticRecord.js @@ -8,6 +8,16 @@ function getIDFieldName() { return 'ocid'; } +function getClassification(record) { + let classification = 'contract'; + if(record.hasOwnProperty('source')) { + record.source.map( s => { + if(s.id == 'comprasimss') classification = 'purchase'; + } ) + } + return classification; +} + function getContractsFromRecord(record) { let contracts = []; @@ -29,7 +39,8 @@ function getContractsFromRecord(record) { if(funder_arr.length > 0) funder_party = funder_arr[0]; let computed_contract = {}; - computed_contract['classification'] = 'contract'; + // computed_contract['classification'] = 'contract'; + computed_contract['classification'] = getClassification(record); if(buyer_party.hasOwnProperty('address') && buyer_party.address.hasOwnProperty('countryName')) { let countryCode = laundry.cleanCountry(buyer_party.address.countryName); computed_contract['area'] = { diff --git a/package.json b/package.json index 9d54a92..eebc72c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "record-decompiler", - "version": "1.1.3", + "version": "1.1.4", "description": "Decompiles records from OCDS into individual contracts.", "main": "index.js", "scripts": { From 89bc9d841f816495cfcb452fce85b47b0bc107eb Mon Sep 17 00:00:00 2001 From: Fernando Matzdorf Date: Thu, 29 Apr 2021 16:21:18 -0500 Subject: [PATCH 08/14] Fixed tender item decompilation to filter items correctly. --- lib/record_types/elasticRecord.js | 10 +++++++++- package.json | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/record_types/elasticRecord.js b/lib/record_types/elasticRecord.js index 0448710..c6ae8ba 100644 --- a/lib/record_types/elasticRecord.js +++ b/lib/record_types/elasticRecord.js @@ -21,7 +21,7 @@ function getClassification(record) { function getContractsFromRecord(record) { let contracts = []; - record.contracts.map( (contract) => { + record.contracts.map( (contract, n) => { let buyer_id = record.buyer.id; let buyer_party = record.parties.filter( (party) => party.id == buyer_id )[0] || {}; let award_id = contract.awardID; @@ -107,6 +107,14 @@ function getContractsFromRecord(record) { } computed_contract.awards = award; break; + case 'tender': + let tenderObj = JSON.parse(JSON.stringify(record.tender)); + if(record.tender.hasOwnProperty('items') && record.tender.items.length > 0) { + let tenderItem = record.tender.items.filter( (t_item) => t_item.id == award.items[0].id ); + tenderObj.items = tenderItem; + } + computed_contract.tender = tenderObj; + break; case 'contracts': computed_contract.contracts = simplifyObject(contract); break; diff --git a/package.json b/package.json index eebc72c..1e3b57d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "record-decompiler", - "version": "1.1.4", + "version": "1.1.5", "description": "Decompiles records from OCDS into individual contracts.", "main": "index.js", "scripts": { From d53e87470308800f51b1d519166110fce1acde6b Mon Sep 17 00:00:00 2001 From: Fernando Matzdorf Date: Mon, 3 May 2021 16:27:52 -0500 Subject: [PATCH 09/14] Fix tender item filtering when award has no items to filter. --- lib/record_types/elasticRecord.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/record_types/elasticRecord.js b/lib/record_types/elasticRecord.js index c6ae8ba..893c165 100644 --- a/lib/record_types/elasticRecord.js +++ b/lib/record_types/elasticRecord.js @@ -109,7 +109,7 @@ function getContractsFromRecord(record) { break; case 'tender': let tenderObj = JSON.parse(JSON.stringify(record.tender)); - if(record.tender.hasOwnProperty('items') && record.tender.items.length > 0) { + if(record.tender.hasOwnProperty('items') && record.tender.items.length > 0 && award.hasOwnProperty('items') && award.items.length > 0) { let tenderItem = record.tender.items.filter( (t_item) => t_item.id == award.items[0].id ); tenderObj.items = tenderItem; } diff --git a/package.json b/package.json index 1e3b57d..7a4cd93 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "record-decompiler", - "version": "1.1.5", + "version": "1.1.6", "description": "Decompiles records from OCDS into individual contracts.", "main": "index.js", "scripts": { From c6046ebb6495db23b46024033a37c7268e8815b4 Mon Sep 17 00:00:00 2001 From: Fernando Matzdorf Date: Tue, 4 May 2021 12:29:39 -0500 Subject: [PATCH 10/14] Removed items from award and tender. Removed planning object. --- lib/record_types/elasticRecord.js | 10 ++++------ package.json | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/record_types/elasticRecord.js b/lib/record_types/elasticRecord.js index 893c165..d983972 100644 --- a/lib/record_types/elasticRecord.js +++ b/lib/record_types/elasticRecord.js @@ -33,13 +33,13 @@ function getContractsFromRecord(record) { if(award.hasOwnProperty('documents') && award.documents.length > 0) { award.documents.map( (doc) => urls.push(doc.url) ); } + if(award.hasOwnProperty('items')) delete award.items; let funder_party = null; let funder_arr = record.parties.filter( (party) => party.roles[0] == "funder" ); if(funder_arr.length > 0) funder_party = funder_arr[0]; let computed_contract = {}; - // computed_contract['classification'] = 'contract'; computed_contract['classification'] = getClassification(record); if(buyer_party.hasOwnProperty('address') && buyer_party.address.hasOwnProperty('countryName')) { let countryCode = laundry.cleanCountry(buyer_party.address.countryName); @@ -62,7 +62,7 @@ function getContractsFromRecord(record) { computed_contract.parties['suppliers']['list'] = []; supplier_parties.map( (supplier, index) => { computed_contract.parties['suppliers']['list'].push(simplifyObject(supplier)); - computed_contract.parties['suppliers']['names'].push(supplier.name); + computed_contract.parties['suppliers']['names'].push(supplier.name.toString()); computed_contract.parties['suppliers']['ids'].push(supplier.id); } ); } @@ -109,15 +109,13 @@ function getContractsFromRecord(record) { break; case 'tender': let tenderObj = JSON.parse(JSON.stringify(record.tender)); - if(record.tender.hasOwnProperty('items') && record.tender.items.length > 0 && award.hasOwnProperty('items') && award.items.length > 0) { - let tenderItem = record.tender.items.filter( (t_item) => t_item.id == award.items[0].id ); - tenderObj.items = tenderItem; - } + if(record.tender.hasOwnProperty('items')) delete tenderObj.items; computed_contract.tender = tenderObj; break; case 'contracts': computed_contract.contracts = simplifyObject(contract); break; + case 'planning': case 'total_amount': break; default: diff --git a/package.json b/package.json index 7a4cd93..e4362c6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "record-decompiler", - "version": "1.1.6", + "version": "1.1.7", "description": "Decompiles records from OCDS into individual contracts.", "main": "index.js", "scripts": { From 6b1b4efb3b72778aa59d719a32c599f9f047cadf Mon Sep 17 00:00:00 2001 From: Fernando Matzdorf Date: Tue, 4 May 2021 12:47:37 -0500 Subject: [PATCH 11/14] Restore planning object. --- lib/record_types/elasticRecord.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/record_types/elasticRecord.js b/lib/record_types/elasticRecord.js index d983972..44ca6c7 100644 --- a/lib/record_types/elasticRecord.js +++ b/lib/record_types/elasticRecord.js @@ -115,7 +115,6 @@ function getContractsFromRecord(record) { case 'contracts': computed_contract.contracts = simplifyObject(contract); break; - case 'planning': case 'total_amount': break; default: From a5f979dee69335dd2ad86f99bcb980b438cd6837 Mon Sep 17 00:00:00 2001 From: Fernando Matzdorf Date: Wed, 29 Sep 2021 15:40:52 -0500 Subject: [PATCH 12/14] Changed area object to array in contract record type. --- lib/record_types/elasticRecord.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/record_types/elasticRecord.js b/lib/record_types/elasticRecord.js index 44ca6c7..409c16a 100644 --- a/lib/record_types/elasticRecord.js +++ b/lib/record_types/elasticRecord.js @@ -43,10 +43,10 @@ function getContractsFromRecord(record) { computed_contract['classification'] = getClassification(record); if(buyer_party.hasOwnProperty('address') && buyer_party.address.hasOwnProperty('countryName')) { let countryCode = laundry.cleanCountry(buyer_party.address.countryName); - computed_contract['area'] = { + computed_contract['area'] = [{ id: laundry.simpleName(countryCode), name: countryCode - } + }] } for( var x in record ) { From c07a08137d154bf7948a50e008831b34b214d63c Mon Sep 17 00:00:00 2001 From: Fernando Matzdorf Date: Mon, 11 Oct 2021 13:22:40 -0500 Subject: [PATCH 13/14] Add classification to contract area object. --- lib/record_types/elasticRecord.js | 3 ++- package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/record_types/elasticRecord.js b/lib/record_types/elasticRecord.js index 409c16a..2ce6d0d 100644 --- a/lib/record_types/elasticRecord.js +++ b/lib/record_types/elasticRecord.js @@ -45,7 +45,8 @@ function getContractsFromRecord(record) { let countryCode = laundry.cleanCountry(buyer_party.address.countryName); computed_contract['area'] = [{ id: laundry.simpleName(countryCode), - name: countryCode + name: countryCode, + classification: 'country' }] } diff --git a/package.json b/package.json index e4362c6..30c5d9f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "record-decompiler", - "version": "1.1.7", + "version": "1.1.8", "description": "Decompiles records from OCDS into individual contracts.", "main": "index.js", "scripts": { From 1ac0471eacf9f634050354f0edfb45765529cf35 Mon Sep 17 00:00:00 2001 From: Fernando Matzdorf Date: Tue, 14 Dec 2021 12:25:57 -0600 Subject: [PATCH 14/14] Add README and LICENSE --- LICENSE | 1275 +++++++++++++++++++++++++------------------------- README.md | 2 +- package.json | 4 +- 3 files changed, 649 insertions(+), 632 deletions(-) diff --git a/LICENSE b/LICENSE index c3f5b52..948e9c1 100644 --- a/LICENSE +++ b/LICENSE @@ -1,674 +1,691 @@ +Copyright © 2021 Fernando Matzdorf + GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - -Copyright (C) 2007 Free Software Foundation, Inc. -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. - - Preamble - -The GNU General Public License is a free, copyleft license for -software and other kinds of works. - -The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - -To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if + +Version 3, 29 June 2007 + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + +Preamble + +The GNU General Public +License is a free, copyleft license for software and other kinds of works. + +The +licenses for most software and other practical works are designed to take away +your freedom to share and change the works. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change all versions of +a program--to make sure it remains free software for all its users. We, the Free +Software Foundation, use the GNU General Public License for most of our software; +it applies also to any other work released this way by its authors. You can apply +it to your programs, too. + +When we speak of free software, we are referring to +freedom, not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge for them +if you wish), that you receive source code or can get it if you want it, that you +can change the software or use pieces of it in new free programs, and that you +know you can do these things. + +To protect your rights, we need to prevent others +from denying you these rights or asking you to surrender the rights. Therefore, +you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. -For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. +For example, +if you distribute copies of such a program, whether gratis or for a fee, you must +pass on to the recipients the same freedoms that you received. You must make sure +that they, too, receive or can get the source code. And you must show them these +terms so they know their rights. -Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. +Developers that use the GNU GPL protect your +rights with two steps: (1) assert copyright on the software, and (2) offer you +this License giving you legal permission to copy, distribute and/or modify +it. -For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. +For the developers' and authors' protection, the GPL clearly explains that +there is no warranty for this free software. For both users' and authors' sake, +the GPL requires that modified versions be marked as changed, so that their +problems will not be attributed erroneously to authors of previous +versions. Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - -Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - -The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - -0. Definitions. - -"This License" refers to version 3 of the GNU General Public License. - -"Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - -"The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - -To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - -A "covered work" means either the unmodified Program or a work based -on the Program. - -To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the +modified versions of the software inside them, although the manufacturer can do +so. This is fundamentally incompatible with the aim of protecting users' freedom +to change the software. The systematic pattern of such abuse occurs in the area +of products for individuals to use, which is precisely where it is most +unacceptable. Therefore, we have designed this version of the GPL to prohibit the +practice for those products. If such problems arise substantially in other +domains, we stand ready to extend this provision to those domains in future +versions of the GPL, as needed to protect the freedom of users. + +Finally, every +program is threatened constantly by software patents. States should not allow +patents to restrict development and use of software on general-purpose computers, +but in those that do, we wish to avoid the special danger that patents applied to +a free program could make it effectively proprietary. To prevent this, the GPL +assures that patents cannot be used to render the program non-free. + +The precise +terms and conditions for copying, distribution and modification follow. + +TERMS +AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the +GNU General Public License. + + "Copyright" also means copyright-like laws that +apply to other kinds of works, such as semiconductor masks. + + "The Program" +refers to any copyrightable work licensed under this License. Each licensee is +addressed as "you". "Licensees" and "recipients" may be individuals or +organizations. + + To "modify" a work means to copy from or adapt all or part of +the work in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the earlier work +or a work "based on" the earlier work. + + A "covered work" means either the +unmodified Program or a work based on the Program. + + To "propagate" a work +means to do anything with it that, without permission, would make you directly or +secondarily liable for infringement under applicable copyright law, except +executing it on a computer or modifying a private copy. Propagation includes +copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. -To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - -1. Source Code. - -The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - -A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - -The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - -The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - -The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - -The Corresponding Source for a work in source code form is that -same work. - -2. Basic Permissions. - -All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your + To "convey" a work +means any kind of propagation that enables other parties to make or receive +copies. Mere interaction with a user through a computer network, with no transfer +of a copy, is not conveying. + + An interactive user interface displays +"Appropriate Legal Notices" to the extent that it includes a convenient and +prominently visible feature that (1) displays an appropriate copyright notice, +and (2) tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the work under +this License, and how to view a copy of this License. If the interface presents a +list of user commands or options, such as a menu, a prominent item in the list +meets this criterion. + + 1. Source Code. + + The "source code" for a work means +the preferred form of the work for making modifications to it. "Object code" +means any non-source form of a work. + + A "Standard Interface" means an +interface that either is an official standard defined by a recognized standards +body, or, in the case of interfaces specified for a particular programming +language, one that is widely used among developers working in that language. + + +The "System Libraries" of an executable work include anything, other than the +work as a whole, that (a) is included in the normal form of packaging a Major +Component, but which is not part of that Major Component, and (b) serves only to +enable use of the work with that Major Component, or to implement a Standard +Interface for which an implementation is available to the public in source code +form. A "Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system (if any) on +which the executable work runs, or a compiler used to produce the work, or an +object code interpreter used to run it. + + The "Corresponding Source" for a work +in object code form means all the source code needed to generate, install, and +(for an executable work) run the object code and to modify the work, including +scripts to control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free programs +which are used unmodified in performing those activities but which are not part +of the work. For example, Corresponding Source includes interface definition +files associated with source files for the work, and the source code for shared +libraries and dynamically linked subprograms that the work is specifically +designed to require, such as by intimate data communication or control flow +between those subprograms and other parts of the work. + + The Corresponding +Source need not include anything that users can regenerate automatically from +other parts of the Corresponding Source. + + The Corresponding Source for a work +in source code form is that same work. + + 2. Basic Permissions. + + All rights +granted under this License are granted for the term of copyright on the Program, +and are irrevocable provided the stated conditions are met. This License +explicitly affirms your unlimited permission to run the unmodified Program. The +output from running a covered work is covered by this License only if the output, +given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. -You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - -3. Protecting Users' Legal Rights From Anti-Circumvention Law. - -No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - -When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - -4. Conveying Verbatim Copies. - -You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all + You may +make, run and propagate covered works that you do not convey, without conditions +so long as your license otherwise remains in force. You may convey covered works +to others for the sole purpose of having them make modifications exclusively for +you, or provide you with facilities for running those works, provided that you +comply with the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works for you +must do so exclusively on your behalf, under your direction and control, on terms +that prohibit them from making any copies of your copyrighted material outside +their relationship with you. + + Conveying under any other circumstances is +permitted solely under the conditions stated below. Sublicensing is not allowed; +section 10 makes it unnecessary. + + 3. Protecting Users' Legal Rights From +Anti-Circumvention Law. + + No covered work shall be deemed part of an effective +technological measure under any applicable law fulfilling obligations under +article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar +laws prohibiting or restricting circumvention of such measures. + + When you +convey a covered work, you waive any legal power to forbid circumvention of +technological measures to the extent such circumvention is effected by exercising +rights under this License with respect to the covered work, and you disclaim any +intention to limit operation or modification of the work as a means of enforcing, +against the work's users, your or third parties' legal rights to forbid +circumvention of technological measures. + + 4. Conveying Verbatim Copies. + + +You may convey verbatim copies of the Program's source code as you receive it, in +any medium, provided that you conspicuously and appropriately publish on each +copy an appropriate copyright notice; keep intact all notices stating that this +License and any non-permissive terms added in accord with section 7 apply to the +code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. -You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. + You may charge any +price or no price for each copy that you convey, and you may offer support or +warranty protection for a fee. + + 5. Conveying Modified Source Versions. -5. Conveying Modified Source Versions. + You +may convey a work based on the Program, or the modifications to produce it from +the Program, in the form of source code under the terms of section 4, provided +that you also meet all of these conditions: -You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: + a) The work must carry +prominent notices stating that you modified it, and giving a relevant date. -a) The work must carry prominent notices stating that you modified -it, and giving a relevant date. -b) The work must carry prominent notices stating that it is -released under this License and any conditions added under section -7. This requirement modifies the requirement in section 4 to -"keep intact all notices". +b) The work must carry prominent notices stating that it is released under this +License and any conditions added under section 7. This requirement modifies the +requirement in section 4 to "keep intact all notices". -c) You must license the entire work, as a whole, under this -License to anyone who comes into possession of a copy. This -License will therefore apply, along with any applicable section 7 -additional terms, to the whole of the work, and all its parts, -regardless of how they are packaged. This License gives no -permission to license the work in any other way, but it does not -invalidate such permission if you have separately received it. + c) You must license +the entire work, as a whole, under this License to anyone who comes into +possession of a copy. This License will therefore apply, along with any +applicable section 7 additional terms, to the whole of the work, and all its +parts, regardless of how they are packaged. This License gives no permission to +license the work in any other way, but it does not invalidate such permission if +you have separately received it. -d) If the work has interactive user interfaces, each must display -Appropriate Legal Notices; however, if the Program has interactive -interfaces that do not display Appropriate Legal Notices, your + d) If the work has interactive user +interfaces, each must display Appropriate Legal Notices; however, if the Program +has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. -A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - -6. Conveying Non-Source Forms. - -You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - -a) Convey the object code in, or embodied in, a physical product -(including a physical distribution medium), accompanied by the -Corresponding Source fixed on a durable physical medium -customarily used for software interchange. - -b) Convey the object code in, or embodied in, a physical product -(including a physical distribution medium), accompanied by a -written offer, valid for at least three years and valid for as -long as you offer spare parts or customer support for that product -model, to give anyone who possesses the object code either (1) a -copy of the Corresponding Source for all the software in the -product that is covered by this License, on a durable physical -medium customarily used for software interchange, for a price no -more than your reasonable cost of physically performing this -conveying of source, or (2) access to copy the -Corresponding Source from a network server at no charge. - -c) Convey individual copies of the object code with a copy of the -written offer to provide the Corresponding Source. This -alternative is allowed only occasionally and noncommercially, and -only if you received the object code with such an offer, in accord -with subsection 6b. - -d) Convey the object code by offering access from a designated -place (gratis or for a charge), and offer equivalent access to the -Corresponding Source in the same way through the same place at no -further charge. You need not require recipients to copy the -Corresponding Source along with the object code. If the place to -copy the object code is a network server, the Corresponding Source -may be on a different server (operated by you or a third party) -that supports equivalent copying facilities, provided you maintain -clear directions next to the object code saying where to find the -Corresponding Source. Regardless of what server hosts the -Corresponding Source, you remain obligated to ensure that it is -available for as long as needed to satisfy these requirements. - -e) Convey the object code using peer-to-peer transmission, provided -you inform other peers where the object code and Corresponding -Source of the work are being offered to the general public at no -charge under subsection 6d. - -A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - -A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - -"Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - -If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). + A compilation of a covered work with other +separate and independent works, which are not by their nature extensions of the +covered work, and which are not combined with it such as to form a larger +program, in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not used to limit +the access or legal rights of the compilation's users beyond what the individual +works permit. Inclusion of a covered work in an aggregate does not cause this +License to apply to the other parts of the aggregate. + + 6. Conveying Non-Source +Forms. + + You may convey a covered work in object code form under the terms of +sections 4 and 5, provided that you also convey the machine-readable +Corresponding Source under the terms of this License, in one of these ways: + + +a) Convey the object code in, or embodied in, a physical product (including a +physical distribution medium), accompanied by the Corresponding Source fixed on a +durable physical medium customarily used for software interchange. + + b) +Convey the object code in, or embodied in, a physical product (including a +physical distribution medium), accompanied by a written offer, valid for at least +three years and valid for as long as you offer spare parts or customer support +for that product model, to give anyone who possesses the object code either (1) a +copy of the Corresponding Source for all the software in the product that is +covered by this License, on a durable physical medium customarily used for +software interchange, for a price no more than your reasonable cost of physically +performing this conveying of source, or (2) access to copy the Corresponding +Source from a network server at no charge. + + c) Convey individual copies of +the object code with a copy of the written offer to provide the Corresponding +Source. This alternative is allowed only occasionally and noncommercially, and +only if you received the object code with such an offer, in accord with +subsection 6b. + + d) Convey the object code by offering access from a +designated place (gratis or for a charge), and offer equivalent access to the +Corresponding Source in the same way through the same place at no further charge. +You need not require recipients to copy the Corresponding Source along with the +object code. If the place to copy the object code is a network server, the +Corresponding Source may be on a different server (operated by you or a third +party) that supports equivalent copying facilities, provided you maintain clear +directions next to the object code saying where to find the Corresponding Source. +Regardless of what server hosts the Corresponding Source, you remain obligated to +ensure that it is available for as long as needed to satisfy these +requirements. + + e) Convey the object code using peer-to-peer transmission, +provided you inform other peers where the object code and Corresponding Source of +the work are being offered to the general public at no charge under subsection +6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be included in +conveying the object code work. + + A "User Product" is either (1) a "consumer +product", which means any tangible personal property which is normally used for +personal, family, or household purposes, or (2) anything designed or sold for +incorporation into a dwelling. In determining whether a product is a consumer +product, doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a typical or +common use of that class of product, regardless of the status of the particular +user or of the way in which the particular user actually uses, or expects or is +expected to use, the product. A product is a consumer product regardless of +whether the product has substantial commercial, industrial or non-consumer uses, +unless such uses represent the only significant mode of use of the product. + + +"Installation Information" for a User Product means any methods, procedures, +authorization keys, or other information required to install and execute modified +versions of a covered work in that User Product from a modified version of its +Corresponding Source. The information must suffice to ensure that the continued +functioning of the modified object code is in no case prevented or interfered +with solely because modification has been made. + + If you convey an object code +work under this section in, or with, or specifically for use in, a User Product, +and the conveying occurs as part of a transaction in which the right of +possession and use of the User Product is transferred to the recipient in +perpetuity or for a fixed term (regardless of how the transaction is +characterized), the Corresponding Source conveyed under this section must be +accompanied by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install modified object +code on the User Product (for example, the work has been installed in ROM). + The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - -7. Additional Terms. - -"Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - -When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - -a) Disclaiming warranty or limiting liability differently from the +requirement to continue to provide support service, warranty, or updates for a +work that has been modified or installed by the recipient, or for the User +Product in which it has been modified or installed. Access to a network may be +denied when the modification itself materially and adversely affects the +operation of the network or violates the rules and protocols for communication +across the network. + + Corresponding Source conveyed, and Installation +Information provided, in accord with this section must be in a format that is +publicly documented (and with an implementation available to the public in source +code form), and must require no special password or key for unpacking, reading or +copying. + + 7. Additional Terms. + + "Additional permissions" are terms that +supplement the terms of this License by making exceptions from one or more of its +conditions. Additional permissions that are applicable to the entire Program +shall be treated as though they were included in this License, to the extent that +they are valid under applicable law. If additional permissions apply only to part +of the Program, that part may be used separately under those permissions, but the +entire Program remains governed by this License without regard to the additional +permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of it. +(Additional permissions may be written to require their own removal in certain +cases when you modify the work.) You may place additional permissions on +material, added by you to a covered work, for which you have or can give +appropriate copyright permission. + + Notwithstanding any other provision of this +License, for material you add to a covered work, you may (if authorized by the +copyright holders of that material) supplement the terms of this License with +terms: + + a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or -b) Requiring preservation of specified reasonable legal notices or -author attributions in that material or in the Appropriate Legal -Notices displayed by works containing it; or - -c) Prohibiting misrepresentation of the origin of that material, or -requiring that modified versions of such material be marked in -reasonable ways as different from the original version; or - -d) Limiting the use for publicity purposes of names of licensors or -authors of the material; or - -e) Declining to grant rights under trademark law for use of some -trade names, trademarks, or service marks; or - -f) Requiring indemnification of licensors and authors of that -material by anyone who conveys the material (or modified versions of -it) with contractual assumptions of liability to the recipient, for -any liability that these contractual assumptions directly impose on -those licensors and authors. - -All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - -8. Termination. - -You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - -However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - -Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - -9. Acceptance Not Required for Having Copies. - -You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - -10. Automatic Licensing of Downstream Recipients. - -Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - -An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - -11. Patents. - -A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - -A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of + b) Requiring preservation +of specified reasonable legal notices or author attributions in that material or +in the Appropriate Legal Notices displayed by works containing it; or + + c) +Prohibiting misrepresentation of the origin of that material, or requiring that +modified versions of such material be marked in reasonable ways as different from +the original version; or + + d) Limiting the use for publicity purposes of +names of licensors or authors of the material; or + + e) Declining to grant +rights under trademark law for use of some trade names, trademarks, or service +marks; or + + f) Requiring indemnification of licensors and authors of that +material by anyone who conveys the material (or modified versions of it) with +contractual assumptions of liability to the recipient, for any liability that +these contractual assumptions directly impose on those licensors and authors. + + +All other non-permissive additional terms are considered "further restrictions" +within the meaning of section 10. If the Program as you received it, or any part +of it, contains a notice stating that it is governed by this License along with a +term that is a further restriction, you may remove that term. If a license +document contains a further restriction but permits relicensing or conveying +under this License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does not survive +such relicensing or conveying. + + If you add terms to a covered work in accord +with this section, you must place, in the relevant source files, a statement of +the additional terms that apply to those files, or a notice indicating where to +find the applicable terms. + + Additional terms, permissive or non-permissive, +may be stated in the form of a separately written license, or stated as +exceptions; the above requirements apply either way. + + 8. Termination. + + You +may not propagate or modify a covered work except as expressly provided under +this License. Any attempt otherwise to propagate or modify it is void, and will +automatically terminate your rights under this License (including any patent +licenses granted under the third paragraph of section 11). + + However, if you +cease all violation of this License, then your license from a particular +copyright holder is reinstated (a) provisionally, unless and until the copyright +holder explicitly and finally terminates your license, and (b) permanently, if +the copyright holder fails to notify you of the violation by some reasonable +means prior to 60 days after the cessation. + + Moreover, your license from a +particular copyright holder is reinstated permanently if the copyright holder +notifies you of the violation by some reasonable means, this is the first time +you have received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after your receipt +of the notice. + + Termination of your rights under this section does not +terminate the licenses of parties who have received copies or rights from you +under this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same material +under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are +not required to accept this License in order to receive or run a copy of the +Program. Ancillary propagation of a covered work occurring solely as a +consequence of using peer-to-peer transmission to receive a copy likewise does +not require acceptance. However, nothing other than this License grants you +permission to propagate or modify any covered work. These actions infringe +copyright if you do not accept this License. Therefore, by modifying or +propagating a covered work, you indicate your acceptance of this License to do +so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you +convey a covered work, the recipient automatically receives a license from the +original licensors, to run, modify and propagate that work, subject to this +License. You are not responsible for enforcing compliance by third parties with this License. -Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - -In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - -If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - -A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - -12. No Surrender of Others' Freedom. - -If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this + An "entity transaction" is a transaction transferring control +of an organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered work results +from an entity transaction, each party to that transaction who receives a copy of +the work also receives whatever licenses to the work the party's predecessor in +interest had or could give under the previous paragraph, plus a right to +possession of the Corresponding Source of the work from the predecessor in +interest, if the predecessor has it or can get it with reasonable efforts. + + +You may not impose any further restrictions on the exercise of the rights granted +or affirmed under this License. For example, you may not impose a license fee, +royalty, or other charge for exercise of rights granted under this License, and +you may not initiate litigation (including a cross-claim or counterclaim in a +lawsuit) alleging that any patent claim is infringed by making, using, selling, +offering for sale, or importing the Program or any portion of it. + + 11. +Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The work thus +licensed is called the contributor's "contributor version". + + A contributor's +"essential patent claims" are all patent claims owned or controlled by the +contributor, whether already acquired or hereafter acquired, that would be +infringed by some manner, permitted by this License, of making, using, or selling +its contributor version, but do not include claims that would be infringed only +as a consequence of further modification of the contributor version. For purposes +of this definition, "control" includes the right to grant patent sublicenses in a +manner consistent with the requirements of this License. + + Each contributor +grants you a non-exclusive, worldwide, royalty-free patent license under the +contributor's essential patent claims, to make, use, sell, offer for sale, import +and otherwise run, modify and propagate the contents of its contributor +version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent (such as an +express permission to practice a patent or covenant not to sue for patent +infringement). To "grant" such a patent license to a party means to make such an +agreement or commitment not to enforce a patent against the party. + + If you +convey a covered work, knowingly relying on a patent license, and the +Corresponding Source of the work is not available for anyone to copy, free of +charge and under the terms of this License, through a publicly available network +server or other readily accessible means, then you must either (1) cause the +Corresponding Source to be so available, or (2) arrange to deprive yourself of +the benefit of the patent license for this particular work, or (3) arrange, in a +manner consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have actual +knowledge that, but for the patent license, your conveying the covered work in a +country, or your recipient's use of the covered work in a country, would infringe +one or more identifiable patents in that country that you have reason to believe +are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a covered work, +and grant a patent license to some of the parties receiving the covered work +authorizing them to use, propagate, modify or convey a specific copy of the +covered work, then the patent license you grant is automatically extended to all +recipients of the covered work and works based on it. + + A patent license is +"discriminatory" if it does not include within the scope of its coverage, +prohibits the exercise of, or is conditioned on the non-exercise of one or more +of the rights that are specifically granted under this License. You may not +convey a covered work if you are a party to an arrangement with a third party +that is in the business of distributing software, under which you make payment to +the third party based on the extent of your activity of conveying the work, and +under which the third party grants, to any of the parties who would receive the +covered work from you, a discriminatory patent license (a) in connection with +copies of the covered work conveyed by you (or copies made from those copies), or +(b) primarily for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, or that +patent license was granted, prior to 28 March 2007. + + Nothing in this License +shall be construed as excluding or limiting any implied license or other defenses +to infringement that may otherwise be available to you under applicable patent +law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on +you (whether by court order, agreement or otherwise) that contradict the +conditions of this License, they do not excuse you from the conditions of this +License. If you cannot convey a covered work so as to satisfy simultaneously your +obligations under this License and any other pertinent obligations, then as a +consequence you may not convey it at all. For example, if you agree to terms that +obligate you to collect a royalty for further conveying from those to whom you +convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. -13. Use with the GNU Affero General Public License. - -Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - -14. Revised Versions of this License. - -The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - -Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - -15. Disclaimer of Warranty. - -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -16. Limitation of Liability. - -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - -17. Interpretation of Sections 15 and 16. - -If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS + 13. Use with +the GNU Affero General Public License. + + Notwithstanding any other provision of +this License, you have permission to link or combine any covered work with a work +licensed under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this License will +continue to apply to the part which is the covered work, but the special +requirements of the GNU Affero General Public License, section 13, concerning +interaction through a network will apply to the combination as such. + + 14. +Revised Versions of this License. + + The Free Software Foundation may publish +revised and/or new versions of the GNU General Public License from time to time. +Such new versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a +distinguishing version number. If the Program specifies that a certain numbered +version of the GNU General Public License "or any later version" applies to it, +you have the option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software Foundation. If the +Program does not specify a version number of the GNU General Public License, you +may choose any version ever published by the Free Software Foundation. + + If the +Program specifies that a proxy can decide which future versions of the GNU +General Public License can be used, that proxy's public statement of acceptance +of a version permanently authorizes you to choose that version for the Program. + + +Later license versions may give you additional or different permissions. However, +no additional obligations are imposed on any author or copyright holder as a +result of your choosing to follow a later version. + + 15. Disclaimer of +Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS +AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, +EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE +RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR +OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED +BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER +PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO +YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL +DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT +LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY +OF SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the +disclaimer of warranty and limitation of liability provided above cannot be given +local legal effect according to their terms, reviewing courts shall apply local +law that most closely approximates an absolute waiver of all civil liability in +connection with the Program, unless a warranty or assumption of liability +accompanies a copy of the Program in return for a fee. END OF TERMS AND +CONDITIONS How to Apply These Terms to Your New Programs -If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. +If you develop a new +program, and you want it to be of the greatest possible use to the public, the +best way to achieve this is to make it free software which everyone can +redistribute and change under these terms. + +To do so, attach the following +notices to the program. It is safest to attach them to the start of each source +file to most effectively state the exclusion of warranty; and each file should +have at least the "copyright" line and a pointer to where the full notice is +found. -To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. + - -Copyright (C) +Copyright (C) 2020 -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +This program is free software: you +can redistribute it and/or modify it under the terms of the GNU General Public +License as published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +This program is distributed in +the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the +implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program. If not, see . +You should have received a copy of +the GNU General Public License along with this program. If not, see +. + +Also add information on how to contact you by +electronic and paper mail. + +If the program does terminal interaction, make it +output a short notice like this when it starts in an interactive mode: -Also add information on how to contact you by electronic and paper mail. +Record Decompiler (record-decompiler) +Copyright (C) 2021 Fernando Matzdorf -If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: +This program comes with ABSOLUTELY NO +WARRANTY; for details type `show w'. - Copyright (C) -This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. -This is free software, and you are welcome to redistribute it -under certain conditions; type `show c' for details. +This is free software, and you are welcome +to redistribute it under certain conditions; type `show c' for details. -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". +The +hypothetical commands `show w' and `show c' should show the appropriate parts of +the General Public License. Of course, your program's commands might be +different; for a GUI interface, you would use an "about box". -You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see +You should also +get your employer (if you work as a programmer) or school, if any, to sign a +"copyright disclaimer" for the program, if necessary. For more information on +this, and how to apply and follow the GNU GPL, see . -The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. +The GNU General Public License does not permit +incorporating your program into proprietary programs. If your program is a +subroutine library, you may consider it more useful to permit linking proprietary +applications with the library. If this is what you want to do, use the GNU Lesser +General Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md index e567ced..53bf725 100644 --- a/README.md +++ b/README.md @@ -44,4 +44,4 @@ The implementation of the recordDecompiler function is up to you. In general, th ## Streaming the output -Use a tool such as http://gitlab.rindecuentas.org/equipo-qqw/stream2db/ to stream the decompiled values back into Mongo, or [Logstash](https://www.elastic.co/products/logstash) to stream into ElasticSearch. +Use a tool such as [stream2db](http://gitlab.rindecuentas.org/equipo-qqw/stream2db/) to stream the decompiled values into Mongo or ElasticSearch. diff --git a/package.json b/package.json index 30c5d9f..1bc4586 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, - "author": "PODER", - "license": "ISC", + "author": "Fernando Matzdorf", + "license": "GPL-3.0-or-later", "dependencies": { "JSONStream": "^1.3.5", "command-line-args": "^5.1.1",