From 9998184426e47b347b461e50dd32182085acab1b Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Thu, 11 Nov 2021 17:26:14 +0100
Subject: [PATCH] read archives for multi-query from backend configuration
endpoint
---
src/components/query/QueryMultipleArchives.js | 15 ++++++++++++-
src/utils/form/parseMultipleArchivesForm.js | 22 ++-----------------
2 files changed, 16 insertions(+), 21 deletions(-)
diff --git a/src/components/query/QueryMultipleArchives.js b/src/components/query/QueryMultipleArchives.js
index b148f14..530a72a 100644
--- a/src/components/query/QueryMultipleArchives.js
+++ b/src/components/query/QueryMultipleArchives.js
@@ -45,7 +45,20 @@ export default function QueryMultipleArchives() {
let archive_queries = []
// create a list of queries based on the filled in form
- let queries = parseQueryForm(query_schema_name, formData);
+ // let queries = parseQueryForm(query_schema_name, formData);
+ let base_query = parseQueryForm(query_schema_name, formData);
+ let archives = config.archives
+ let queries = [];
+ archives.map((archive) => {
+ let esap_query = base_query + "&archive_uri=" + archive
+
+ queries.push({
+ archive: archive,
+ esap_query: esap_query,
+ });
+ return null;
+ });
+
console.log("queries:", queries);
diff --git a/src/utils/form/parseMultipleArchivesForm.js b/src/utils/form/parseMultipleArchivesForm.js
index 6dc536a..8e3339c 100644
--- a/src/utils/form/parseMultipleArchivesForm.js
+++ b/src/utils/form/parseMultipleArchivesForm.js
@@ -1,32 +1,14 @@
export default function parseMultipleArchivesForm(formData) {
- // now hardcoded, later read this from the configuration on the backend
- //let archives = ["apertif", "astron_vo"];
- let archives = ["apertif","astron_vo"];
-
- let queries = [];
let base_query = "";
let formInput = Object.entries(formData);
-
- // construct the base esap_query by iterating over all the fields in the form
+ // construct the esap base query by iterating over all the fields in the form
for (let [key, value] of formInput) {
base_query += `${`${base_query}` ? "&" : ""}` + key + "=" + value;
}
console.log("base_query:", base_query);
- console.log("archives:", archives);
-
- archives.map((archive) => {
- let esap_query = base_query + "&archive_uri=" + archive
-
- queries.push({
- archive: archive,
- esap_query: esap_query,
- });
- return null;
- });
- console.log("queries:", queries);
- return queries;
+ return base_query
}
--
GitLab