Accept RunFiles URL parameter as mixed source for SearchDB compatibility
This commit is contained in:
1 parent
e0602ea2c5
commit
f7d7a0f1ef
1 file changed
+36
-41
+36
-41
@@ -13835,8 +13835,10 @@ function applyWebURLParameters(search) {
|
||||
|
||||
let hasRunNumbers = params.has("RunNumbers");
|
||||
let hasMixedFiles = params.has("MixedFiles") || params.has("mixedFiles");
|
||||
if (hasRunNumbers && hasMixedFiles) {
|
||||
result.errors.push("Provide either RunNumbers or MixedFiles, not both.");
|
||||
let hasRunFiles = params.has("RunFiles") || params.has("runFiles");
|
||||
let runSourceCount = (hasRunNumbers ? 1 : 0) + (hasMixedFiles ? 1 : 0) + (hasRunFiles ? 1 : 0);
|
||||
if (runSourceCount > 1) {
|
||||
result.errors.push("Provide only one of RunNumbers, MixedFiles, or RunFiles.");
|
||||
}
|
||||
|
||||
// Apply the instrument first because it determines the minimum valid year and
|
||||
@@ -13881,48 +13883,41 @@ function applyWebURLParameters(search) {
|
||||
}
|
||||
}
|
||||
|
||||
if (hasMixedFiles && !hasRunNumbers) {
|
||||
let requestedMixed = String(params.get("MixedFiles") || params.get("mixedFiles") || "").trim();
|
||||
let parsedMixed = typeof parseMixedFiles === "function" ? parseMixedFiles(requestedMixed) : null;
|
||||
if (requestedMixed !== "" && Array.isArray(parsedMixed) && parsedMixed.length > 0) {
|
||||
if (typeof setRunSourceMode === "function") setRunSourceMode("mixed");
|
||||
if (mixedInput) mixedInput.value = requestedMixed;
|
||||
if (typeof All !== "undefined") All.mixedFiles = requestedMixed;
|
||||
result.applied.MixedFiles = requestedMixed;
|
||||
} else {
|
||||
result.errors.push("Invalid MixedFiles: " + (requestedMixed || "(empty)"));
|
||||
}
|
||||
} else if (hasRunNumbers && !hasMixedFiles) {
|
||||
let requestedRuns = String(params.get("RunNumbers") || "").trim();
|
||||
let expandedRuns = (typeof arrayRunNumbers === "function")
|
||||
? arrayRunNumbers(requestedRuns) : [];
|
||||
if (requestedRuns !== "" && expandedRuns.length > 0) {
|
||||
let beamLineMissing = !params.has("BeamLine")
|
||||
|| String(params.get("BeamLine") || "").trim() === ""
|
||||
|| String(params.get("BeamLine") || "").trim() === "0";
|
||||
let yearMissing = !params.has("YEAR")
|
||||
|| String(params.get("YEAR") || "").trim() === ""
|
||||
|| String(params.get("YEAR") || "").trim() === "0";
|
||||
|
||||
if (runSourceCount <= 1 && (hasMixedFiles || hasRunFiles || hasRunNumbers)) {
|
||||
let sourceParam = hasMixedFiles ? (params.has("MixedFiles") ? "MixedFiles" : "mixedFiles")
|
||||
: hasRunFiles ? (params.has("RunFiles") ? "RunFiles" : "runFiles")
|
||||
: "RunNumbers";
|
||||
let requestedValue = String(params.get(sourceParam) || "").trim();
|
||||
let expandedRuns = (hasRunNumbers && typeof arrayRunNumbers === "function")
|
||||
? arrayRunNumbers(requestedValue) : [];
|
||||
let parsedMixed = (typeof parseMixedFiles === "function")
|
||||
? parseMixedFiles(requestedValue) : null;
|
||||
|
||||
if (hasRunNumbers && requestedValue !== "" && expandedRuns.length > 0
|
||||
&& !(Array.isArray(parsedMixed) && parsedMixed.length > 0 && (beamLineMissing || yearMissing))) {
|
||||
// Preserve the compact text exactly as supplied so bookmarked links keep
|
||||
// ranges such as 520-525 instead of expanding them into a long list.
|
||||
if (typeof setRunSourceMode === "function") setRunSourceMode("numbers");
|
||||
runInput.value = requestedRuns;
|
||||
result.applied.RunNumbers = requestedRuns;
|
||||
runInput.value = requestedValue;
|
||||
result.applied.RunNumbers = requestedValue;
|
||||
} else if (requestedValue !== "" && Array.isArray(parsedMixed) && parsedMixed.length > 0) {
|
||||
// SearchDB/musrfit compatibility: heterogeneous selections may arrive as
|
||||
// RunFiles (full paths) or RunNumbers with ambiguous/missing year/beamline.
|
||||
if (typeof setRunSourceMode === "function") setRunSourceMode("mixed");
|
||||
if (mixedInput) mixedInput.value = requestedValue;
|
||||
if (typeof All !== "undefined") All.mixedFiles = requestedValue;
|
||||
result.applied.MixedFiles = requestedValue;
|
||||
} else if (hasRunNumbers) {
|
||||
result.errors.push("Invalid RunNumbers: " + (requestedValue || "(empty)"));
|
||||
} else {
|
||||
// SearchDB/musrfit compatibility: RunNumbers may carry mixed/file specs
|
||||
// (e.g. year/instrument/run or explicit paths) when YEAR/BeamLine are
|
||||
// missing or ambiguous (0). Detect and route to the mixed source field.
|
||||
let beamLineMissing = !params.has("BeamLine")
|
||||
|| String(params.get("BeamLine") || "").trim() === ""
|
||||
|| String(params.get("BeamLine") || "").trim() === "0";
|
||||
let yearMissing = !params.has("YEAR")
|
||||
|| String(params.get("YEAR") || "").trim() === ""
|
||||
|| String(params.get("YEAR") || "").trim() === "0";
|
||||
let parsedMixed = (typeof parseMixedFiles === "function")
|
||||
? parseMixedFiles(requestedRuns) : null;
|
||||
if (requestedRuns !== "" && Array.isArray(parsedMixed) && parsedMixed.length > 0
|
||||
&& (beamLineMissing || yearMissing)) {
|
||||
if (typeof setRunSourceMode === "function") setRunSourceMode("mixed");
|
||||
if (mixedInput) mixedInput.value = requestedRuns;
|
||||
if (typeof All !== "undefined") All.mixedFiles = requestedRuns;
|
||||
result.applied.MixedFiles = requestedRuns;
|
||||
} else {
|
||||
result.errors.push("Invalid RunNumbers: " + (requestedRuns || "(empty)"));
|
||||
}
|
||||
result.errors.push("Invalid " + sourceParam + ": " + (requestedValue || "(empty)"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13936,7 +13931,7 @@ function applyWebURLParameters(search) {
|
||||
} else if (result.applied.BeamLine && result.applied.RunNumbers) {
|
||||
result.action = "plot";
|
||||
} else {
|
||||
result.errors.push("action=plot requires BeamLine and RunNumbers, or MixedFiles.");
|
||||
result.errors.push("action=plot requires BeamLine and RunNumbers, or MixedFiles/RunFiles.");
|
||||
}
|
||||
} else if (requestedAction !== "") {
|
||||
result.errors.push("Unsupported action: " + requestedAction);
|
||||
|
||||
Reference in new issue
Block a user