From 8fc2fce6beab109c28b36cb9b7bda4df06a94c8d Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@gmail.com>
Date: Tue, 26 Mar 2024 14:25:21 -0400
Subject: [PATCH] generates queryString for cutoutUrl, mergeUrl from Coord (not
original request::queryString)
---
data-discovery/src/main/java/vlkb/output/Dataset.java | 2 +-
.../src/main/java/vlkb/webapi/FormatResponseFilter.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/data-discovery/src/main/java/vlkb/output/Dataset.java b/data-discovery/src/main/java/vlkb/output/Dataset.java
index 64a4185..dd6a071 100644
--- a/data-discovery/src/main/java/vlkb/output/Dataset.java
+++ b/data-discovery/src/main/java/vlkb/output/Dataset.java
@@ -70,7 +70,7 @@ class Dataset
this.access = new Access();
this.access.accessFileUrl = null;
this.access.accessCutoutUrl = null;
- this.access.accessMosaicUrl = mergeUrlRoot + "?pubdid=" + publisherDid + "&" + /*inputs.*/queryString;
+ this.access.accessMosaicUrl = mergeUrlRoot + "?pubdid=" + publisherDid + "&" + coord.toVoQueryString();///*inputs.*/queryString;
this.vertices_deg = mergeVertices(datasetList, /*inputs.*/coord);
}
diff --git a/data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java b/data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java
index 86eead8..21a613c 100644
--- a/data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java
+++ b/data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java
@@ -220,7 +220,7 @@ public class FormatResponseFilter implements Filter
dataset.publisherDid = obsCore.obs_publisher_did;
dataset.access.accessFileUrl = obsCore.access_url;
- dataset.access.accessCutoutUrl = fitsRemotePath + "?ID=" + dataset.publisherDid + "&" + queryString;
+ dataset.access.accessCutoutUrl = fitsRemotePath + "?ID=" + dataset.publisherDid + "&" + coord.toVoQueryString();//queryString;
//dataset.access.accessCutoutUrl = fitsRemotePath + "?pubdid=" + dataset.publisherDid + "&" + queryString;
dataset.access.accessMosaicUrl = null;
--
GitLab