Skip to content
Snippets Groups Projects
Commit cafa96d8 authored by Robert Butora's avatar Robert Butora
Browse files

updates vlkb-volib to 0.9.4 (Band Time parsing)

parent d38e2009
No related branches found
No related tags found
No related merge requests found
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<dependency> <dependency>
<groupId>vo</groupId> <groupId>vo</groupId>
<artifactId>vlkb-volib</artifactId> <artifactId>vlkb-volib</artifactId>
<version>0.9.3</version> <version>0.9.4</version>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -98,8 +98,8 @@ public class DbObstap ...@@ -98,8 +98,8 @@ public class DbObstap
{ {
String prefix = toSpecColumnNamePrefix(qArgs.band.system); String prefix = toSpecColumnNamePrefix(qArgs.band.system);
String vel_no_overlap String vel_no_overlap
= "((" + prefix + "_min > " + Double.toString(qArgs.band.getMax()) = "((" + prefix + "_min > " + Double.toString(qArgs.band.max)
+ ") OR (" + prefix + "_max < " + Double.toString(qArgs.band.getMin()) + "))"; + ") OR (" + prefix + "_max < " + Double.toString(qArgs.band.min) + "))";
theQuery += " AND ( ("+prefix+"_min is null) OR ("+prefix+"_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 /* NOTE '... OR (em_min is null)' statement causes to include 2D datasets if they overlap in sky
...@@ -172,8 +172,8 @@ public class DbObstap ...@@ -172,8 +172,8 @@ public class DbObstap
if(interval != null) if(interval != null)
{ {
String no_overlap String no_overlap
= "((" + colName + " > " + Double.toString(interval.getMax()) = "((" + colName + " > " + Double.toString(interval.max)
+ ") OR (" + colName + " < " + Double.toString(interval.getMin()) + "))"; + ") OR (" + colName + " < " + Double.toString(interval.min) + "))";
return " AND ( (" + colName + " is null) OR (NOT " + no_overlap + "))"; return " AND ( (" + colName + " is null) OR (NOT " + no_overlap + "))";
} }
...@@ -322,11 +322,11 @@ public class DbObstap ...@@ -322,11 +322,11 @@ public class DbObstap
// FIXME assert qArgs: vel_min <= vel_max // FIXME assert qArgs: vel_min <= vel_max
// FIXME assert cube: v_min <= v_max // FIXME assert cube: v_min <= v_max
boolean dbInInp = (band.getMin() <= v_min) && (v_min <= band.getMax()) boolean dbInInp = (band.min <= v_min) && (v_min <= band.max)
&& (band.getMin() <= v_max) && (v_max <= band.getMax()); && (band.min <= v_max) && (v_max <= band.max);
boolean inpInDb = (v_min <= band.getMin()) && (band.getMin() <= v_max) boolean inpInDb = (v_min <= band.min) && (band.min <= v_max)
&& (v_min <= band.getMax() ) && (band.getMax() <= v_max); && (v_min <= band.max ) && (band.max <= v_max);
return convertToOverlapCodeSky(inpInDb, dbInInp); return convertToOverlapCodeSky(inpInDb, dbInInp);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment