Commit 2b641439 authored by Robert Butora's avatar Robert Butora
Browse files

output: changes access_url to output SODA-params instead of VLKB-legacy

parent 4f23166e

data-discovery/src/main/java/vlkb/common/Coord.java

+34 −0
Original line number Diff line number Diff line
@@ -317,6 +317,40 @@ class Coord 
   }





   String toVoQueryString()

   {

      StringBuilder sb = new StringBuilder();



      sb.append("skysystem=" + skySystem);



      switch(shape)

      {

         case "CIRCLE" :

            sb.append("&POS=CIRCLE "  + lon + " " + lat + " " + + radius );

            break;



         case "RECT" :

            if(vel_valid)

               sb.append("&POS=RANGE="

                     + " " + (lon - dlon)  + " " + (lon + dlon)  

                     + " " + (lat - dlat)  + " " + (lat + dlat)  

                     + " " + vel_low  + " " + vel_up );



            else       

               sb.append("&POS=RANGE="

                     + " " + (lon - dlon)  + " " + (lon + dlon)  

                     + " " + (lat - dlat)  + " " + (lat + dlat) );

            break;



         default:

            ;// ERROR internal err FIXME  writer.println("<shape> unknown shape: "+ shape +" </shape>");

      }



      return sb.toString();

   }

data-discovery/src/main/java/vlkb/output/Inputs.java

+14 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ class Inputs 
      this.countNullValues = countNullValues;

      this.auth = auth;



      queryString = buildQueryString(coord, subsurveyId, countNullValues);

      queryString = buildVoQueryString(coord, subsurveyId, countNullValues);

      //queryString = buildQueryString(coord, subsurveyId, countNullValues);

   }
@@ -35,5 +36,17 @@ class Inputs 
      return queryString.toString();

   }



   private String buildVoQueryString(Coord coord, SubsurveyId subsurveyId, boolean countNullValues)

   {

      StringBuilder queryString = new StringBuilder();



      queryString.append(coord.toVoQueryString());

      if(subsurveyId.surveyName != null) queryString.append("&surveyname=" + subsurveyId.surveyName);

      if(subsurveyId.species != null) queryString.append("&species=" + subsurveyId.species);

      if(subsurveyId.transition != null) queryString.append("&transition=" + subsurveyId.transition);



      return queryString.toString();

   }



}

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

+2 −1
Original line number Diff line number Diff line
@@ -203,7 +203,8 @@ public class FormatResponseFilter implements Filter 
         dataset.publisherDid   = obsDataset.pubdid_str;



         dataset.access.accessFileUrl   = obsDataset.access_url;

         dataset.access.accessCutoutUrl = fitsRemotePath + "?pubdid=" + dataset.publisherDid + "&amp;" + queryString;

         dataset.access.accessCutoutUrl = fitsRemotePath + "?ID=" + dataset.publisherDid + "&amp;" + queryString;

         //dataset.access.accessCutoutUrl = fitsRemotePath + "?pubdid=" + dataset.publisherDid + "&amp;" + queryString;

         dataset.access.accessMosaicUrl  = null;



         dataset.vertices_deg = convertToVertices(obsDataset.vertices_str);