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

adds ID=/pubdid= without value to merge/cutout-url so as url params are like... 

adds ID=/pubdid= without value to merge/cutout-url so as url params are like input to seacrh (SIAv2 or VLKB-legacy)
parent 5ae6dcf1

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

+4 −0
Original line number Diff line number Diff line
@@ -202,6 +202,8 @@ class Coord 
         sb.append("&specsystem=" + vel_type );

      }



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



      return sb.toString();

   }
@@ -243,6 +245,8 @@ class Coord 
         sb.append("&specsystem=" + vel_type );

      }



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



      return sb.toString();

   }

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

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ class Dataset 
      this.access = new Access();

      this.access.accessFileUrl   = null;

      this.access.accessCutoutUrl = null;

      this.access.accessMosaicUrl = mergeUrlRoot + "?pubdid=" + publisherDid + "&" + mergeQueryString;

      this.access.accessMosaicUrl = mergeUrlRoot + "?" + mergeQueryString + publisherDid;



      //this.vertices_deg = mergeVertices(datasetList, /*inputs.*/coord);

   }

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

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ public class FormatResponseFilter implements Filter 
         dataset.publisherDid   = obsCore.obs_publisher_did;



         dataset.access.accessFileUrl   = obsCore.access_url;

         dataset.access.accessCutoutUrl = cutoutUrlRoot + "?ID=" + dataset.publisherDid + "&" + cutoutQueryString;

         dataset.access.accessCutoutUrl = cutoutUrlRoot + "?" + cutoutQueryString + dataset.publisherDid;

         dataset.access.accessMosaicUrl  = null;



         dataset.vertices_deg = convertToVertices(obsCore.vertices_str);