From 835384b7302ba1ca23f4fd9b7166855aec231b8b Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sat, 23 Sep 2023 13:45:21 +0200
Subject: [PATCH] Apply path conversion to QC definition files

---
 lib/www/server/lib/db/qc/definitions/get.js | 3 ++-
 lib/www/server/lib/qc/index.js              | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/www/server/lib/db/qc/definitions/get.js b/lib/www/server/lib/db/qc/definitions/get.js
index 2d1df79..4b41476 100644
--- a/lib/www/server/lib/db/qc/definitions/get.js
+++ b/lib/www/server/lib/db/qc/definitions/get.js
@@ -1,6 +1,7 @@
 const fs = require('fs');
 const YAML = require('yaml');
 const flattenQCDefinitions = require('../../../utils/flattenQCDefinitions');
+const { translatePath } = require('../../../utils/logicalPath');
 const project = require('../../project'); // lib/db/project
 
 
@@ -8,7 +9,7 @@ async function get (projectId, opts = {}) {
 	const qcConfig = (await project.configuration.get(projectId))?.qc;
 	if (qcConfig?.definitions) {
 		try {
-			const definitions = YAML.parse(fs.readFileSync(qcConfig.definitions).toString());
+			const definitions = YAML.parse(fs.readFileSync(translatePath(qcConfig.definitions)).toString());
 
 			return opts.flat ? flattenQCDefinitions(definitions) : definitions;
 		} catch (err) {
diff --git a/lib/www/server/lib/qc/index.js b/lib/www/server/lib/qc/index.js
index 6ec90c7..0470481 100755
--- a/lib/www/server/lib/qc/index.js
+++ b/lib/www/server/lib/qc/index.js
@@ -8,6 +8,7 @@ const { pool, setSurvey, transaction, fetchRow } = require('../db/connection')
 const { project, sequence, configuration, info } = require('../db')
 const flattenQCDefinitions = require('./flatten');
 const { projectHash, sequenceHash } = require('./last-modified');
+const { translatePath } = require('../utils/logicalPath');
 
 const { runShotsQC, saveShotsQC } = require('./shots');
 const { runSequenceQCs, saveSequenceQCs } = require('./sequences');
@@ -46,8 +47,8 @@ async function getProjectQCConfig (projectId) {
 	console.log("qcConfig", qcConfig);
 	if (qcConfig?.definitions && qcConfig?.parameters) {
 		const definitions =
-			flattenQCDefinitions(YAML.parse(fs.readFileSync(qcConfig.definitions).toString()));
-		const parameters = YAML.parse(fs.readFileSync(qcConfig.parameters).toString());
+			flattenQCDefinitions(YAML.parse(fs.readFileSync(translatePath(qcConfig.definitions)).toString()));
+		const parameters = YAML.parse(fs.readFileSync(translatePath(qcConfig.parameters)).toString());
 
 		return { definitions, parameters };
 	}