fix delete-run, minor cleanups

Author: atheurer

queries/cdmq/cdm.js

@@ -1304,6 +1304,7 @@ findYearDotMonthFromRun = async function (instance, runId) {
     return matches[1];
   }
 };
+exports.findYearDotMonthFromRun = findYearDotMonthFromRun;
 
 findInstanceFromRun = async function (instances, runId) {
   var foundInstance;
@@ -1325,6 +1326,7 @@ findInstanceFromRun = async function (instances, runId) {
   debuglog('findInstanceFromRun(): about to return');
   return foundInstance;
 };
+exports.findInstanceFromRun = findInstanceFromRun;
 
 findInstanceFromPeriod = async function (instances, periId) {
   var foundInstance;
@@ -1341,6 +1343,7 @@ findInstanceFromPeriod = async function (instances, periId) {
   }
   return foundInstance;
 };
+exports.findInstanceFromPeriod = findInstanceFromPeriod;
 
 mgetParams = async function (instance, iterIds, yearDotMonth) {
   return await mSearch(instance, 'param', yearDotMonth, ['iteration.iteration-uuid'], [iterIds], 'param', null, 1000);

queries/cdmq/delete-run.js

@@ -62,7 +62,7 @@ async function main() {
     // to delete just any copy of this run.
     //
     // In order to delete, we must first find out which year and date the run comes from
-    const yearDotMonth = cdm.getYearDotMonth(program.run);
+    const yearDotMonth = cdm.findYearDotMonthFromRun(instances[instances.length - 1], program.run);
     cdm.deleteDocs(instances[instances.length - 1], allDocTypes, q);
     var numDocTypes = await cdm.waitForDeletedDocs(instances[instances.length - 1], program.run, allDocTypes);
     if (numDocTypes > 0) {

queries/cdmq/get-result-summary.js

@@ -88,7 +88,6 @@ async function main() {
 
   getInstancesInfo(instances);
   cdm.debuglog(JSON.stringify(instances, null, 2));
-  console.log(JSON.stringify(instances, null, 2));
 
   // Since this query is looking for run ids (and may not inlcude run-uuid as a search term), we
   // need to check all instances.