Commit 6894a28e authored by Robert Butora's avatar Robert Butora
Browse files

updates to pre-release of volib v0.9.0. And removes append POSSYS and BANDSYS... 

updates to pre-release of volib v0.9.0. And removes append POSSYS and BANDSYS to queryString build (is done in vlkb-volib POS and BAND toString)
parent 590ee83f

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

+5 −5
Original line number Diff line number Diff line
@@ -362,19 +362,19 @@ public class FormatResponseFilter implements Filter 


      StringBuilder sb = new StringBuilder();



      sb.append("POSSYS=" + coord.pos.system.toString());

      //sb.append("POSSYS=" + coord.pos.system.toString());

      switch(coord.pos.shape)

      {

         case CIRCLE:

            sb.append("&POS=" + coord.pos.circle.toString());

            sb.append("POS=" + coord.pos.circle.toString());

            break;



         case RANGE:

            sb.append("&POS=" + coord.pos.range.toString());

            sb.append("POS=" + coord.pos.range.toString());

            break;



         case POLYGON:

            sb.append("&POS=" + coord.pos.polygon.toString());

            sb.append("POS=" + coord.pos.polygon.toString());

            break;



         default:
@@ -384,7 +384,7 @@ public class FormatResponseFilter implements Filter 
      if(coord.band != null)

      {

         sb.append("&" + coord.band.toString());

         sb.append("&BANDSYS=" + coord.band.system.toString() );

         //sb.append("&BANDSYS=" + coord.band.system.toString() );

      }



      sb.append("&ID="); // FIXME id-value will be added in FormatResponseFilter

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

+2 −2
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ public class SearchServlet extends javax.servlet.http.HttpServlet 
         coord.target = SingleStringParam.parseSingleStringParam(params, "TARGET");

         coord.format = SingleStringParam.parseSingleStringParam(params, "FORMAT");



         coord.calib  = Integer.parseInt(SingleStringParam.parseSingleStringParam(params, "CALIB"));

         coord.maxrec = Integer.parseInt(SingleStringParam.parseSingleStringParam(params, "MAXREC"));

         // coord.calib  = Integer.parseInt(SingleStringParam.parseSingleStringParam(params, "CALIB"));

         // coord.maxrec = Integer.parseInt(SingleStringParam.parseSingleStringParam(params, "MAXREC"));

         // FIXME implement checks (?in vlkb-volib?): 0<= calib <=5 and maxrec >= 0



         // FIXME add to SQL-query params starting from fov ...