diff --git a/data-discovery/pom.xml b/data-discovery/pom.xml index 1d20c3e1619c47b888604cd96f3b5fdab8a0c57e..42551caf8ec2c55af0f03b3f59fd2719faa107d6 100644 --- a/data-discovery/pom.xml +++ b/data-discovery/pom.xml @@ -36,7 +36,7 @@ <dependency> <groupId>vo</groupId> <artifactId>vlkb-volib</artifactId> - <version>0.9.3</version> + <version>0.9.4</version> </dependency> <dependency> diff --git a/data-discovery/src/main/java/search/DbObstap.java b/data-discovery/src/main/java/search/DbObstap.java index 53db2f26fddcad137e37cc3ef1af23afc2a63cf9..e673210b4023639edee0e950a49814b06457e468 100644 --- a/data-discovery/src/main/java/search/DbObstap.java +++ b/data-discovery/src/main/java/search/DbObstap.java @@ -98,8 +98,8 @@ public class DbObstap { String prefix = toSpecColumnNamePrefix(qArgs.band.system); String vel_no_overlap - = "((" + prefix + "_min > " + Double.toString(qArgs.band.getMax()) - + ") OR (" + prefix + "_max < " + Double.toString(qArgs.band.getMin()) + "))"; + = "((" + prefix + "_min > " + Double.toString(qArgs.band.max) + + ") OR (" + prefix + "_max < " + Double.toString(qArgs.band.min) + "))"; 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 @@ -172,8 +172,8 @@ public class DbObstap if(interval != null) { String no_overlap - = "((" + colName + " > " + Double.toString(interval.getMax()) - + ") OR (" + colName + " < " + Double.toString(interval.getMin()) + "))"; + = "((" + colName + " > " + Double.toString(interval.max) + + ") OR (" + colName + " < " + Double.toString(interval.min) + "))"; return " AND ( (" + colName + " is null) OR (NOT " + no_overlap + "))"; } @@ -322,11 +322,11 @@ public class DbObstap // FIXME assert qArgs: vel_min <= vel_max // FIXME assert cube: v_min <= v_max - boolean dbInInp = (band.getMin() <= v_min) && (v_min <= band.getMax()) - && (band.getMin() <= v_max) && (v_max <= band.getMax()); + boolean dbInInp = (band.min <= v_min) && (v_min <= band.max) + && (band.min <= v_max) && (v_max <= band.max); - boolean inpInDb = (v_min <= band.getMin()) && (band.getMin() <= v_max) - && (v_min <= band.getMax() ) && (band.getMax() <= v_max); + boolean inpInDb = (v_min <= band.min) && (band.min <= v_max) + && (v_min <= band.max ) && (band.max <= v_max); return convertToOverlapCodeSky(inpInDb, dbInInp);