From 590ee83f61fa0667656ae1fd9997be3643bc65e5 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Mon, 15 Apr 2024 16:32:21 +0300
Subject: [PATCH] adds all SIAv2-specific params for parsing (not used yet in
SQL-query)
---
.../src/main/java/vlkb/common/Coord.java | 7 ++----
.../main/java/vlkb/webapi/SearchServlet.java | 25 +++++++++++++++++--
2 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/data-discovery/src/main/java/vlkb/common/Coord.java b/data-discovery/src/main/java/vlkb/common/Coord.java
index 14b3c72..0bc1f89 100644
--- a/data-discovery/src/main/java/vlkb/common/Coord.java
+++ b/data-discovery/src/main/java/vlkb/common/Coord.java
@@ -9,8 +9,6 @@ class Coord
Pol pol;
-/* TBD: SIAv2
-
Interval fov;
Interval spatres;
Interval specrp;
@@ -27,9 +25,8 @@ class Coord
Integer calib; // 0,1,..,5
String target;
- Stirng format; // access_format MIME or DataLink MIME
-
+ String format; // access_format MIME or DataLink MIME
+ //
Integer maxrec; // implement oveflow and special case maxrec=0
-*/
}
diff --git a/data-discovery/src/main/java/vlkb/webapi/SearchServlet.java b/data-discovery/src/main/java/vlkb/webapi/SearchServlet.java
index 50b9522..b30d436 100644
--- a/data-discovery/src/main/java/vlkb/webapi/SearchServlet.java
+++ b/data-discovery/src/main/java/vlkb/webapi/SearchServlet.java
@@ -68,15 +68,36 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
//Coord coord = new Coord(params);
SubsurveyId subsurveyId = new SubsurveyId(params);
-// FIXME check this! String id = SingleStringParam.parseSingleStringParam(params, "ID");
- // new based on vlkb-volib
Coord coord = new Coord();
coord.pos = Pos.parsePos(params, DEFAULT_SKY_SYSTEM);
coord.band = Band.parseBand(params, DEFAULT_SPEC_SYSTEM);
coord.time = Time.parseTime(params, DEFAULT_TIME_SYSTEM);
coord.pol = Pol.parsePol(params);
+ coord.fov = Interval.parseInterval(params, "FOV");
+ coord.spatres = Interval.parseInterval(params, "SPATRES");
+ coord.specrp = Interval.parseInterval(params, "SPECRP");
+ coord.exptime = Interval.parseInterval(params, "EXPTIME");
+ coord.timeres = Interval.parseInterval(params, "TIMERES");
+
+ coord.id = SingleStringParam.parseSingleStringParam(params, "ID");
+
+ coord.collection = SingleStringParam.parseSingleStringParam(params, "COLLECTION");
+ coord.facility = SingleStringParam.parseSingleStringParam(params, "FACILITY");
+ coord.instrument = SingleStringParam.parseSingleStringParam(params, "INSTRUMENT");
+ coord.dptype = SingleStringParam.parseSingleStringParam(params, "DPTYPE");
+
+ coord.target = SingleStringParam.parseSingleStringParam(params, "TARGET");
+ coord.format = SingleStringParam.parseSingleStringParam(params, "FORMAT");
+
+ coord.calib = Integer.parseInt(SingleStringParam.parseSingleStringParam(params, "CALIB"));
+ coord.maxrec = Integer.parseInt(SingleStringParam.parseSingleStringParam(params, "MAXREC"));
+ // FIXME implement checks (?in vlkb-volib?): 0<= calib <=5 and maxrec >= 0
+
+ // FIXME add to SQL-query params starting from fov ...
+
+
/* query Obscore table */
DbPSearch dbps;
--
GitLab