Commit e960ba61 authored by Robert Butora's avatar Robert Butora
Browse files

changes overlap-code type int->Integer to allow for null in tables

parent a8098492

data-discovery/src/main/java/webapi/formatfilter/Dataset.java

+3 −3
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ class Dataset 
   }





   int overlapCodeSky;

   int overlapCodeVel;

   int overlapCode;

   Integer overlapCodeSky;

   Integer overlapCodeVel;

   Integer overlapCode;

   String dataType;

   String publisherDid;

   Access access;

data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java

+7 −7
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ public class FormatResponseFilter implements Filter 
   }





   private int convertToOverlapCodeSky(boolean inpInDb, boolean dbInInp)

   private Integer convertToOverlapCodeSky(boolean inpInDb, boolean dbInInp)

   {

      if(!inpInDb && !dbInInp) return 4; // parial overlap

      else if( inpInDb && !dbInInp) return 3; // input region completely inside fits-datacube
@@ -273,7 +273,7 @@ public class FormatResponseFilter implements Filter 
   }





   private int convertToOverlapCodeVel(Band band, boolean v_valid, double v_min, double v_max)

   private Integer convertToOverlapCodeVel(Band band, boolean v_valid, double v_min, double v_max)

   {

      if((band != null) && v_valid)

      {
@@ -291,19 +291,19 @@ public class FormatResponseFilter implements Filter 
            return convertToOverlapCodeSky(inpInDb, dbInInp);



         }

         else ;// FIXME other v_type NotImplemented yet

         else return null;// FIXME other v_type NotImplemented yet

      }



      return -1; // FIXME use enums; meaning: overlap code in velocity not applicable --> dont print in XML

      return null;

   }







   private int convertToOverlapCode(int ovcSky, int ovcVel)

   private Integer convertToOverlapCode(Integer ovcSky, Integer ovcVel)

   {

      if(ovcVel == -1) return ovcSky; // 2D images

      if(ovcVel == null) return ovcSky; // 2D images

      else if(ovcSky == ovcVel) return ovcSky;

      else return 4;

      else return 4;// partial overlap

   }