diff --git a/scraper.js b/scraper.js index 9acf275..27c350d 100644 --- a/scraper.js +++ b/scraper.js @@ -48,10 +48,29 @@ async function insertRow(database, developmentApplication) { reject(error); } else { - if (this.changes > 0) + sqlStatement.finalize(); // releases any locks + if (this.changes > 0) { console.log(` Inserted: application \"${developmentApplication.applicationNumber}\" with address \"${developmentApplication.address}\", description \"${developmentApplication.description}\" and received date \"${developmentApplication.receivedDate}\" into the database.`); - else + resolve(true); // indicate row was inserted + } + else { console.log(` Skipped: application \"${developmentApplication.applicationNumber}\" with address \"${developmentApplication.address}\", description \"${developmentApplication.description}\" and received date \"${developmentApplication.receivedDate}\" because it was already present in the database.`); + resolve(false); // indicate row already existed so was not inserted + } + } + }); + }); +} +// Updates the inforation URL in a row in the database. +async function updateRow(database, developmentApplication) { + return new Promise((resolve, reject) => { + let sqlStatement = database.prepare("update [data] set [info_url] = ? where [info_url] like 'https://yorke.sa.gov.au/development/development-information/development-register/entry/%' and [council_reference] = ?"); + sqlStatement.run([developmentApplication.informationUrl, developmentApplication.applicationNumber], function (error, row) { + if (error) { + console.error(error); + reject(error); + } + else { sqlStatement.finalize(); // releases any locks resolve(row); } @@ -142,7 +161,7 @@ async function parse(dateFrom, dateTo, database) { // Ensure that at least an application number and address have been obtained. if (applicationNumber !== "" && applicationNumber !== undefined && address !== "" && address !== undefined) { let informationUrl = InformationUrl.replace(/\{0\}/g, encodeURIComponent(applicationNumber)); - await insertRow(database, { + let developmentApplication = { applicationNumber: applicationNumber, address: address, description: description, @@ -150,7 +169,10 @@ async function parse(dateFrom, dateTo, database) { commentUrl: CommentUrl, scrapeDate: moment().format("YYYY-MM-DD"), receivedDate: receivedDate.isValid ? receivedDate.format("YYYY-MM-DD") : "" - }); + }; + let hasInserted = await insertRow(database, developmentApplication); + if (!hasInserted) // if not inserted because already existed + await updateRow(database, developmentApplication); } } // If there is no "next page" link then assume this is the last page. @@ -187,4 +209,4 @@ async function main() { await parse(moment().subtract(randomMonth + 1, "months"), moment().subtract(randomMonth, "months"), database); } main().then(() => console.log("Complete.")).catch(error => console.error(error)); -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"scraper.js","sourceRoot":"","sources":["scraper.ts"],"names":[],"mappings":"AAAA,+FAA+F;AAC/F,iCAAiC;AACjC,EAAE;AACF,eAAe;AACf,qBAAqB;AAErB,YAAY,CAAC;;AAEb,yBAAyB;AACzB,mCAAmC;AACnC,kDAAkD;AAClD,mCAAmC;AACnC,iCAAiC;AACjC,0CAA0C;AAE1C,OAAO,CAAC,OAAO,EAAE,CAAC;AAElB,MAAM,0BAA0B,GAAG,yKAAyK,CAAC;AAC7M,MAAM,cAAc,GAAG,0JAA0J,CAAC;AAClL,MAAM,UAAU,GAAG,8BAA8B,CAAC;AAIlD,uBAAuB;AAEvB,IAAI,WAAW,GAAG,SAAS,CAAC;AAC5B,IAAI,YAAY,GAAG,SAAS,CAAC;AAE7B,8BAA8B;AAE9B,KAAK,UAAU,kBAAkB;IAC7B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,IAAI,QAAQ,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QACnD,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE;YACpB,QAAQ,CAAC,GAAG,CAAC,0OAA0O,CAAC,CAAC;YACzP,OAAO,CAAC,QAAQ,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED,mEAAmE;AAEnE,KAAK,UAAU,SAAS,CAAC,QAAQ,EAAE,sBAAsB;IACrD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,IAAI,YAAY,GAAG,QAAQ,CAAC,OAAO,CAAC,iEAAiE,CAAC,CAAC;QACvG,YAAY,CAAC,GAAG,CAAC;YACb,sBAAsB,CAAC,iBAAiB;YACxC,sBAAsB,CAAC,OAAO;YAC9B,sBAAsB,CAAC,WAAW;YAClC,sBAAsB,CAAC,cAAc;YACrC,sBAAsB,CAAC,UAAU;YACjC,sBAAsB,CAAC,UAAU;YACjC,sBAAsB,CAAC,YAAY;YACnC,IAAI;YACJ,IAAI;SACP,EAAE,UAAS,KAAK,EAAE,GAAG;YAClB,IAAI,KAAK,EAAE;gBACP,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACrB,MAAM,CAAC,KAAK,CAAC,CAAC;aACjB;iBAAM;gBACH,IAAI,IAAI,CAAC,OAAO,GAAG,CAAC;oBAChB,OAAO,CAAC,GAAG,CAAC,+BAA+B,sBAAsB,CAAC,iBAAiB,qBAAqB,sBAAsB,CAAC,OAAO,qBAAqB,sBAAsB,CAAC,WAAW,0BAA0B,sBAAsB,CAAC,YAAY,uBAAuB,CAAC,CAAC;;oBAEnR,OAAO,CAAC,GAAG,CAAC,8BAA8B,sBAAsB,CAAC,iBAAiB,qBAAqB,sBAAsB,CAAC,OAAO,qBAAqB,sBAAsB,CAAC,WAAW,0BAA0B,sBAAsB,CAAC,YAAY,oDAAoD,CAAC,CAAC;gBACnT,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAE,qBAAqB;gBAC/C,OAAO,CAAC,GAAG,CAAC,CAAC;aAChB;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED,oEAAoE;AAEpE,SAAS,SAAS,CAAC,OAAe,EAAE,OAAe;IAC/C,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACvG,CAAC;AAED,mDAAmD;AAEnD,SAAS,KAAK,CAAC,YAAoB;IAC/B,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;AACrE,CAAC;AAED,qFAAqF;AAErF,SAAS,aAAa,CAAC,OAAe;IAClC,4FAA4F;IAC5F,uFAAuF;IACvF,yFAAyF;IACzF,sFAAsF;IAEtF,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IACxH,IAAI,OAAO,KAAK,EAAE;QACd,OAAO,OAAO,CAAC;IAEnB,4FAA4F;IAC5F,mFAAmF;IAEnF,IAAI,gBAAgB,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAC7C,KAAK,IAAI,WAAW,IAAI,YAAY,EAAE;QAClC,IAAI,gBAAgB,CAAC,WAAW,EAAE,KAAK,KAAK,GAAG,WAAW,IAAI,gBAAgB,CAAC,QAAQ,CAAC,MAAM,GAAG,WAAW,CAAC,EAAE;YAC3G,OAAO,CAAC,GAAG,CAAC,2FAA2F,OAAO,EAAE,CAAC,CAAC;YAClH,OAAO,OAAO,CAAC;SAClB;KACJ;IAED,oFAAoF;IACpF,sFAAsF;IACtF,4DAA4D;IAE5D,IAAI,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEhC,IAAI,UAAU,GAAG,IAAI,CAAC;IACtB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE;QACrC,IAAI,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,qBAAqB,EAAE,aAAa,EAAE,eAAe,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACvN,IAAI,eAAe,KAAK,IAAI,EAAE;YAC1B,UAAU,GAAG,WAAW,CAAC,eAAe,CAAC,CAAC;YAC1C,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAE,uDAAuD;YACtF,MAAM;SACT;KACJ;IAED,IAAI,UAAU,KAAK,IAAI,EAAE,EAAG,4CAA4C;QACpE,OAAO,CAAC,GAAG,CAAC,oFAAoF,OAAO,EAAE,CAAC,CAAC;QAC3G,OAAO,OAAO,CAAC;KAClB;IAED,uEAAuE;IAEvE,IAAI,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IACzC,OAAO,CAAC,UAAU,GAAG,CAAC,CAAC,UAAU,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC,IAAI,EAAE,CAAC;AAChF,CAAC;AAED,mEAAmE;AAEnE,KAAK,UAAU,KAAK,CAAC,QAAuB,EAAE,MAAqB,EAAE,QAAQ;IACzE,OAAO,CAAC,GAAG,CAAC,4CAA4C,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAE5H,IAAI,YAAY,GAAG,kBAAkB,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;IACrE,IAAI,UAAU,GAAG,kBAAkB,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;IAEjE,sEAAsE;IAEtE,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,OAAO,UAAU,EAAE,GAAG,GAAG,EAAE,EAAG,oBAAoB;QAC9C,IAAI,0BAA0B,GAAG,0BAA0B,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QACnK,OAAO,CAAC,GAAG,CAAC,mBAAmB,UAAU,KAAK,0BAA0B,EAAE,CAAC,CAAC;QAE5E,IAAI,IAAI,GAAG,MAAM,OAAO,CAAC,EAAE,GAAG,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;QACzH,MAAM,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE3B,4BAA4B;QAE5B,KAAK,IAAI,SAAS,IAAI,CAAC,CAAC,wBAAwB,CAAC,CAAC,GAAG,EAAE,EAAE;YACrD,IAAI,yBAAyB,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACnF,IAAI,yBAAyB,KAAK,SAAS;gBACvC,SAAS;YAEb,8CAA8C;YAE9C,IAAI,SAAS,GAAG,MAAM,OAAO,CAAC,EAAE,GAAG,EAAE,yBAAyB,EAAE,kBAAkB,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;YAC7H,IAAI,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAExC,IAAI,OAAO,GAAG,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;YAC/E,IAAI,iBAAiB,GAAG,EAAE,CAAC;YAC3B,IAAI,YAAY,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;YACpC,IAAI,WAAW,GAAG,EAAE,CAAC;YAErB,KAAK,IAAI,SAAS,IAAI,SAAS,CAAC,gCAAgC,CAAC,CAAC,GAAG,EAAE,EAAE;gBACrE,IAAI,GAAG,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;gBAEtE,IAAI,GAAG,KAAK,WAAW;oBACnB,iBAAiB,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;qBACjE,IAAI,GAAG,KAAK,2BAA2B;oBACxC,YAAY,GAAG,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;qBACvF,IAAI,GAAG,KAAK,qBAAqB;oBAClC,WAAW,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;aAC3F;YAED,6EAA6E;YAE7E,IAAI,iBAAiB,KAAK,EAAE,IAAI,iBAAiB,KAAK,SAAS,IAAI,OAAO,KAAK,EAAE,IAAI,OAAO,KAAK,SAAS,EAAE;gBACxG,IAAI,cAAc,GAAG,cAAc,CAAC,OAAO,CAAC,QAAQ,EAAE,kBAAkB,CAAC,iBAAiB,CAAC,CAAC,CAAC;gBAC7F,MAAM,SAAS,CAAC,QAAQ,EAAE;oBACtB,iBAAiB,EAAE,iBAAiB;oBACpC,OAAO,EAAE,OAAO;oBAChB,WAAW,EAAE,WAAW;oBACxB,cAAc,EAAE,cAAc;oBAC9B,UAAU,EAAE,UAAU;oBACtB,UAAU,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC;oBACzC,YAAY,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE;iBAC9E,CAAC,CAAC;aACN;SACJ;QAED,qEAAqE;QAErE,IAAI,eAAe,GAAG,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,eAAe,EAAE;YAClB,OAAO,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;YAClE,OAAO;SACV;KACJ;IAED,OAAO,CAAC,GAAG,CAAC,2BAA2B,UAAU,SAAS,CAAC,CAAC;AAChE,CAAC;AAED,uCAAuC;AAEvC,KAAK,UAAU,IAAI;IACf,yBAAyB;IAEzB,WAAW,GAAG,EAAE,CAAC;IACjB,KAAK,IAAI,IAAI,IAAI,EAAE,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QAClG,IAAI,YAAY,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACjD,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;KAC5F;IAED,0BAA0B;IAE1B,YAAY,GAAG,EAAE,CAAC;IAClB,KAAK,IAAI,WAAW,IAAI,EAAE,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;QACxG,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAExD,mCAAmC;IAEnC,IAAI,QAAQ,GAAG,MAAM,kBAAkB,EAAE,CAAC;IAE1C,2DAA2D;IAE3D,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC,EAA0C,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,QAAQ,CAAC,CAAC;IACxG,MAAM,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;IAE5C,4FAA4F;IAC5F,yFAAyF;IACzF,kCAAkC;IAElC,IAAI,UAAU,GAAG,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAE,4DAA4D;IACzI,IAAI,WAAW,GAAG,SAAS,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,CAAC,CAAA;IAC9C,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,WAAW,GAAG,CAAC,EAA0C,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,QAAQ,CAAC,WAAW,EAA0C,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC;AAClM,CAAC;AAED,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"scraper.js","sourceRoot":"","sources":["scraper.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/scraper.ts b/scraper.ts index ba7e144..4ec48de 100644 --- a/scraper.ts +++ b/scraper.ts @@ -58,10 +58,30 @@ async function insertRow(database, developmentApplication) { console.error(error); reject(error); } else { - if (this.changes > 0) + sqlStatement.finalize(); // releases any locks + if (this.changes > 0) { console.log(` Inserted: application \"${developmentApplication.applicationNumber}\" with address \"${developmentApplication.address}\", description \"${developmentApplication.description}\" and received date \"${developmentApplication.receivedDate}\" into the database.`); - else + resolve(true); // indicate row was inserted + } else { console.log(` Skipped: application \"${developmentApplication.applicationNumber}\" with address \"${developmentApplication.address}\", description \"${developmentApplication.description}\" and received date \"${developmentApplication.receivedDate}\" because it was already present in the database.`); + resolve(false); // indicate row already existed so was not inserted + } + } + }); + }); +} + +// Updates the inforation URL in a row in the database. + +async function updateRow(database, developmentApplication) { + return new Promise((resolve, reject) => { + let sqlStatement = database.prepare("update [data] set [info_url] = ? where [info_url] like 'https://yorke.sa.gov.au/development/development-information/development-register/entry/%' and [council_reference] = ?"); + sqlStatement.run([ developmentApplication.informationUrl, developmentApplication.applicationNumber ], + function(error, row) { + if (error) { + console.error(error); + reject(error); + } else { sqlStatement.finalize(); // releases any locks resolve(row); } @@ -182,7 +202,7 @@ async function parse(dateFrom: moment.Moment, dateTo: moment.Moment, database) { if (applicationNumber !== "" && applicationNumber !== undefined && address !== "" && address !== undefined) { let informationUrl = InformationUrl.replace(/\{0\}/g, encodeURIComponent(applicationNumber)); - await insertRow(database, { + let developmentApplication = { applicationNumber: applicationNumber, address: address, description: description, @@ -190,7 +210,10 @@ async function parse(dateFrom: moment.Moment, dateTo: moment.Moment, database) { commentUrl: CommentUrl, scrapeDate: moment().format("YYYY-MM-DD"), receivedDate: receivedDate.isValid ? receivedDate.format("YYYY-MM-DD") : "" - }); + } + let hasInserted = await insertRow(database, developmentApplication); + if (!hasInserted) // if not inserted because already existed + await updateRow(database, developmentApplication); } }