Treat RunNumbers as mixed when year/beamline missing for SearchDB compatibility
This commit is contained in:
1 parent
81b5df669f
commit
5ac33b5599
1 file changed
+26
-1
+26
-1
@@ -13847,6 +13847,9 @@ function applyWebURLParameters(search) {
|
||||
if (instrumentValue) {
|
||||
instrumentInput.value = instrumentValue;
|
||||
result.applied.BeamLine = instrumentValue;
|
||||
} else if (String(requestedBeamLine || "").trim() === "0") {
|
||||
// SearchDB/musrfit use 0 to indicate mixed/ambiguous beamline.
|
||||
result.applied.BeamLine = "";
|
||||
} else {
|
||||
result.errors.push("Unsupported BeamLine: " + requestedBeamLine);
|
||||
}
|
||||
@@ -13868,6 +13871,9 @@ function applyWebURLParameters(search) {
|
||||
if (validYear) {
|
||||
yearInput.value = requestedYear;
|
||||
result.applied.YEAR = requestedYear;
|
||||
} else if (requestedYear === "0") {
|
||||
// SearchDB/musrfit use 0 to indicate mixed/ambiguous year.
|
||||
result.applied.YEAR = "";
|
||||
} else {
|
||||
let rangeText = minimumYear > 0
|
||||
? minimumYear + "-" + currentMax : "a supported four-digit year";
|
||||
@@ -13897,7 +13903,26 @@ function applyWebURLParameters(search) {
|
||||
runInput.value = requestedRuns;
|
||||
result.applied.RunNumbers = requestedRuns;
|
||||
} else {
|
||||
result.errors.push("Invalid RunNumbers: " + (requestedRuns || "(empty)"));
|
||||
// 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)"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user