testilo 6.1.4 → 6.1.6

package/digest.js

@@ -30,24 +30,23 @@ const replaceHolders = (content, query) => content
 .replace(/__([a-zA-Z]+)__/g, (ph, qp) => query[qp]);
 // Creates digests.
 exports.digest = async (digesterID, reportIDStart) => {
-  const reportDirScoredAbs = `${__dirname}/${reportDirScored}`;
-  let reportFileNames = await fs.readdir(reportDirScoredAbs);
+  let reportFileNames = await fs.readdir(reportDirScored);
   reportFileNames = reportFileNames.filter(fileName => fileName.endsWith('.json'));
   if (reportIDStart) {
     reportFileNames = reportFileNames
     .filter(fileName => fileName.startsWith(reportIDStart));
   }
-  const {makeQuery} = require(`${__dirname}/procs/digest/${digesterID}/index.js`);
+  const {makeQuery} = require(`${digestProcDir}/${digesterID}/index.js`);
   for (const fileName of reportFileNames) {
-    const reportJSON = await fs.readFile(`${reportDirScoredAbs}/${fileName}`, 'utf8');
+    const reportJSON = await fs.readFile(`${reportDirScored}/${fileName}`, 'utf8');
     const report = JSON.parse(reportJSON);
     const query = {};
     makeQuery(report, query);
     const template = await fs
-    .readFile(`${__dirname}/procs/digest/${digesterID}/index.html`, 'utf8');
+    .readFile(`${digestProcDir}/${digesterID}/index.html`, 'utf8');
     const digest = replaceHolders(template, query);
     const fileNameBase = fileName.slice(0, -5);
-    await fs.writeFile(`${digestProcDir}/${fileNameBase}.html`, digest);
+    await fs.writeFile(`${reportDirDigested}/${fileNameBase}.html`, digest);
     console.log(`Report ${fileNameBase} digested and saved`);
   };
   return reportFileNames.length;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testilo",
-  "version": "6.1.4",
+  "version": "6.1.6",
   "description": "Client that scores and digests Testaro reports",
   "main": "aim.js",
   "scripts": {

package/procs/digest/dp19a/index.js

@@ -12,11 +12,9 @@ const htmlEscape = textOrNumber => textOrNumber
 .toString()
 .replace(/&/g, '&')
 .replace(/</g, '&lt;');
-// Gets a row of the score-summary table.
-const getScoreRow = (component, score) => `<tr><th>${component}</th><td>${score}</td></tr>`;
 // Adds parameters to a query for a digest.
 exports.makeQuery = (report, query) => {
-  // Add an HTML-safe copy of the host report to the query to be appended to the digest.
+  // Add an HTML-safe copy of the report to the query to be appended to the digest.
   const {script, host, score} = report;
   const reportJSON = JSON.stringify(report, null, 2);
   const reportJSONSafe = htmlEscape(reportJSON);
@@ -25,7 +23,7 @@ exports.makeQuery = (report, query) => {
   query.sp = 'sp19a';
   query.dp = 'dp19a';
   // Add the job data to the query.
-  query.dateISO = report.endTime.slice(0, 10);
+  query.dateISO = report.jobData.endTime.slice(0, 10);
   query.dateSlash = query.dateISO.replace(/-/g, '/');
   if (host && host.what && host.which) {
     query.org = host.what;