diff --git a/data-discovery/src/main/java/output/ObscoreExt.java b/data-discovery/src/main/java/output/ObscoreExt.java
index ef75552818cbb85575975227336d72913e7e9bb3..4027f4564f46dc63d9ed2b06b4cc597f2288fce4 100644
--- a/data-discovery/src/main/java/output/ObscoreExt.java
+++ b/data-discovery/src/main/java/output/ObscoreExt.java
@@ -95,7 +95,7 @@ class ObscoreExt
new ColumnInfo( "overlapSky", Integer.class, "Overlap Code for Sky axes" ),
new ColumnInfo( "overlapSpec", Integer.class, "Overlap Code for Spectral axis" ),
- new ColumnInfo( "P1lon", Double.class, "P1 longitude" ),
+/* new ColumnInfo( "P1lon", Double.class, "P1 longitude" ),
new ColumnInfo( "P1lat", Double.class, "P1 latitude" ),
new ColumnInfo( "P2lon", Double.class, "P2 longitude" ),
new ColumnInfo( "P2lat", Double.class, "P2 latitude" ),
@@ -103,7 +103,12 @@ class ObscoreExt
new ColumnInfo( "P3lat", Double.class, "P3 latitude" ),
new ColumnInfo( "P4lon", Double.class, "P4 longitude" ),
new ColumnInfo( "P4lat", Double.class, "P4 latitude" ),
+*/
+ new ColumnInfo( "s_region_galactic", String.class, "Region [GALACTIC]" ),
+ new ColumnInfo( "vel_min", Double.class, "Velocity min" ),
+ new ColumnInfo( "vel_max", Double.class, "Velocity max" ),
+
new ColumnInfo( "file_url", String.class, "Access URL: all file" ),
new ColumnInfo( "cutout_url", String.class, "Access URL: cut file" ),
new ColumnInfo( "merge_url", String.class, "Access URL: demosaicing files" ),
@@ -118,10 +123,15 @@ class ObscoreExt
Integer.valueOf( dataset.overlapCodeSky ),
Integer.valueOf( dataset.overlapCodeVel ),
- Double.valueOf(dataset.vertices_deg.lon[0]), Double.valueOf(dataset.vertices_deg.lat[0]),
+/* Double.valueOf(dataset.vertices_deg.lon[0]), Double.valueOf(dataset.vertices_deg.lat[0]),
Double.valueOf(dataset.vertices_deg.lon[1]), Double.valueOf(dataset.vertices_deg.lat[1]),
Double.valueOf(dataset.vertices_deg.lon[2]), Double.valueOf(dataset.vertices_deg.lat[2]),
Double.valueOf(dataset.vertices_deg.lon[3]), Double.valueOf(dataset.vertices_deg.lat[3]),
+*/
+ dataset.obsCore.s_region_galactic,
+
+ dataset.obsCore.vel_min == null ? null : Double.valueOf(dataset.obsCore.vel_min),
+ dataset.obsCore.vel_min == null ? null : Double.valueOf(dataset.obsCore.vel_max),
dataset.access.accessFileUrl,
dataset.access.accessCutoutUrl,
diff --git a/data-discovery/src/main/java/search/DbPSearch.java b/data-discovery/src/main/java/search/DbPSearch.java
index d4d066d1f8a26b4f77fe45d78109eb858145041a..10ee843389515de3f02c6880e5e81688d8bd8ea0 100644
--- a/data-discovery/src/main/java/search/DbPSearch.java
+++ b/data-discovery/src/main/java/search/DbPSearch.java
@@ -47,11 +47,12 @@ public class DbPSearch
boolean vel_valid = (coord.band != null) && (coord.band.system != Band.System.NONE);
if(vel_valid)
{
+ String prefix = toSpecColumnNamePrefix(coord.band.system);
String vel_no_overlap
- = "((em_min > " + Double.toString(coord.band.getMax())
- + ") OR (em_max < " + Double.toString(coord.band.getMin()) + "))";
+ = "((" + prefix + "_min > " + Double.toString(coord.band.getMax())
+ + ") OR (" + prefix + "_max < " + Double.toString(coord.band.getMin()) + "))";
- theQuery += " AND ( (em_min is null) OR (em_max is null) OR (NOT " + vel_no_overlap + "))";
+ theQuery += " AND ( ("+prefix+"_min is null) OR ("+prefix+"_max is null) OR (NOT " + vel_no_overlap + "))";
/* NOTE '... OR (em_min is null)' statement causes to include 2D datasets if they overlap in sky
* It is the legacy-search behaviour - however is that useful ?
*/
@@ -210,6 +211,7 @@ public class DbPSearch
obsCore.s_dec = res.getDouble("s_dec");
obsCore.s_fov = res.getDouble("s_fov");
obsCore.s_region = res.getString("s_region");
+ obsCore.s_region_galactic = res.getString("s_region_galactic");
obsCore.s_xel1 = res.getLong("s_xel1");
obsCore.s_xel2 = res.getLong("s_xel2");
obsCore.s_resolution = res.getDouble("s_resolution");
@@ -220,6 +222,9 @@ public class DbPSearch
obsCore.t_resolution = res.getDouble("t_resolution");
obsCore.t_xel = res.getLong("t_xel");
+ obsCore.vel_min = res.getDouble("vel_min"); //boolean em_min_valid = !res.wasNull();
+ obsCore.vel_max = res.getDouble("vel_max"); //boolean em_max_valid = !res.wasNull();
+
obsCore.em_min = res.getDouble("em_min"); boolean em_min_valid = !res.wasNull();
obsCore.em_max = res.getDouble("em_max"); boolean em_max_valid = !res.wasNull();
obsCore.em_valid = em_min_valid && em_max_valid;;
@@ -325,7 +330,17 @@ public class DbPSearch
return dbRegion;
}
-
+ private String toSpecColumnNamePrefix(Band.System system)
+ {
+ // vlkb-volib/Band.System: WAVE_Barycentric, VELO_LSRK, GRID, NONE
+ String prefix;
+ switch(system)
+ {
+ case VELO_LSRK: prefix = "vel"; break;
+ default: prefix = "em";
+ }
+ return prefix;
+ }
private void logSqlExInfo(SQLException se)
diff --git a/data-discovery/src/main/java/webapi/FormatResponseFilter.java b/data-discovery/src/main/java/webapi/FormatResponseFilter.java
index d5adcd81a6737526d70e6e6468be1d08881dacc0..c8e745c7e4f27d34eba8ad4ffbca49588341a4b2 100644
--- a/data-discovery/src/main/java/webapi/FormatResponseFilter.java
+++ b/data-discovery/src/main/java/webapi/FormatResponseFilter.java
@@ -217,7 +217,7 @@ public class FormatResponseFilter implements Filter
Double t_min, t_max, t_exptime, t_resolution;
Long t_xel;
- Double em_min, em_max, em_res_power;
+ Double em_min, em_max, em_res_power;
Long em_xel;
boolean em_valid;
@@ -233,6 +233,8 @@ public class FormatResponseFilter implements Filter
boolean inputInsideDb;
boolean dbInsideInput;
+ String s_region_galactic;
+ Double vel_min, vel_max;
}
diff --git a/java-libs/lib/vlkb-volib-0.9.0.jar b/java-libs/lib/vlkb-volib-0.9.0.jar
deleted file mode 100644
index 7a469173ef91db8367fb58af748e1f668e405fe3..0000000000000000000000000000000000000000
Binary files a/java-libs/lib/vlkb-volib-0.9.0.jar and /dev/null differ
diff --git a/siav2-vlkb-extensions.tex b/siav2-vlkb-extensions.tex
deleted file mode 100644
index cd3dfa1183d3feb2742f5a696ab0f86544b2ec3f..0000000000000000000000000000000000000000
--- a/siav2-vlkb-extensions.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-VLKB extension above standard SIAv2 has:
-
-* overlap code
-* reconstructs full URLs for cutout and merge
-* response repeats all input params to the query
-* adds subsurvey metadata
-* groups the results by (sub)surveys
-* adds mergeable (virtual) datasets
-