From a93dc56287ec81f3d71fd865feefaaffa1785ace Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@gmail.com>
Date: Thu, 28 Mar 2024 11:36:58 -0400
Subject: [PATCH] adds ID=/pubdid= without value to merge/cutout-url so as url
params are like input to seacrh (SIAv2 or VLKB-legacy)
---
data-discovery/src/main/java/vlkb/common/Coord.java | 4 ++++
data-discovery/src/main/java/vlkb/output/Dataset.java | 2 +-
.../src/main/java/vlkb/webapi/FormatResponseFilter.java | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/data-discovery/src/main/java/vlkb/common/Coord.java b/data-discovery/src/main/java/vlkb/common/Coord.java
index 50618eb..1dc0caf 100644
--- a/data-discovery/src/main/java/vlkb/common/Coord.java
+++ b/data-discovery/src/main/java/vlkb/common/Coord.java
@@ -202,6 +202,8 @@ class Coord
sb.append("&specsystem=" + vel_type );
}
+ sb.append("&pubdid="); // FIXME id-value will be added in FormatResponseFilter
+
return sb.toString();
}
@@ -243,6 +245,8 @@ class Coord
sb.append("&specsystem=" + vel_type );
}
+ sb.append("&ID="); // FIXME id-value will be added in FormatResponseFilter
+
return sb.toString();
}
diff --git a/data-discovery/src/main/java/vlkb/output/Dataset.java b/data-discovery/src/main/java/vlkb/output/Dataset.java
index 033e1c3..f94ec44 100644
--- a/data-discovery/src/main/java/vlkb/output/Dataset.java
+++ b/data-discovery/src/main/java/vlkb/output/Dataset.java
@@ -69,7 +69,7 @@ class Dataset
this.access = new Access();
this.access.accessFileUrl = null;
this.access.accessCutoutUrl = null;
- this.access.accessMosaicUrl = mergeUrlRoot + "?pubdid=" + publisherDid + "&" + mergeQueryString;
+ this.access.accessMosaicUrl = mergeUrlRoot + "?" + mergeQueryString + publisherDid;
//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 1cbdf4f..5b4f385 100644
--- a/data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java
+++ b/data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java
@@ -245,7 +245,7 @@ public class FormatResponseFilter implements Filter
dataset.publisherDid = obsCore.obs_publisher_did;
dataset.access.accessFileUrl = obsCore.access_url;
- dataset.access.accessCutoutUrl = cutoutUrlRoot + "?ID=" + dataset.publisherDid + "&" + cutoutQueryString;
+ dataset.access.accessCutoutUrl = cutoutUrlRoot + "?" + cutoutQueryString + dataset.publisherDid;
dataset.access.accessMosaicUrl = null;
dataset.vertices_deg = convertToVertices(obsCore.vertices_str);
--
GitLab