renames class ObsDataset -> ObsCore (5e2b7f4c) · Commits · ViaLactea / vlkb-siav2

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ import java.util.Iterator;
		class Dataset
		{

		FormatResponseFilter.ObsDataset obsDataset;
		FormatResponseFilter.ObsCore obsCore;

		class Access
		{

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

+25 −25

Original line number	Diff line number	Diff line
		@@ -114,43 +114,43 @@ public final class XmlSerializer
		{
		for(Dataset dataset : subsurvey.datasetArr)
		{
		if(dataset.obsDataset == null) continue; // skip mergeable datasets
		if(dataset.obsCore == null) continue; // skip mergeable datasets

		astro.addRow( new Object[]
		{
		// ObsCore
		dataset.obsDataset.dataproduct_type,//dataset.dataType,
		new Integer( dataset.obsDataset.calib_level ),
		dataset.obsDataset.obs_collection,
		dataset.obsDataset.obs_id,
		dataset.obsDataset.obs_publisher_did,
		dataset.obsCore.dataproduct_type,//dataset.dataType,
		new Integer( dataset.obsCore.calib_level ),
		dataset.obsCore.obs_collection,
		dataset.obsCore.obs_id,
		dataset.obsCore.obs_publisher_did,

		dataset.obsDataset.access_url,//dataset.access.accessCutoutUrl,
		dataset.obsDataset.access_format,
		new Long( dataset.obsDataset.access_estsize ),
		dataset.obsCore.access_url,//dataset.access.accessCutoutUrl,
		dataset.obsCore.access_format,
		new Long( dataset.obsCore.access_estsize ),

		dataset.obsDataset.target_name,
		dataset.obsCore.target_name,

		new Double(dataset.obsDataset.s_ra),new Double(dataset.obsDataset.s_dec),new Double(dataset.obsDataset.s_fov),
		dataset.obsDataset.s_region,
		new Long( dataset.obsDataset.s_xel1 ), new Long( dataset.obsDataset.s_xel2 ),
		new Double(dataset.obsDataset.s_resolution),
		new Double(dataset.obsCore.s_ra),new Double(dataset.obsCore.s_dec),new Double(dataset.obsCore.s_fov),
		dataset.obsCore.s_region,
		new Long( dataset.obsCore.s_xel1 ), new Long( dataset.obsCore.s_xel2 ),
		new Double(dataset.obsCore.s_resolution),

		new Double(dataset.obsDataset.t_min), new Double(dataset.obsDataset.t_max),
		new Double(dataset.obsDataset.t_exptime), new Double(dataset.obsDataset.t_resolution),
		new Long( dataset.obsDataset.t_xel ),
		new Double(dataset.obsCore.t_min), new Double(dataset.obsCore.t_max),
		new Double(dataset.obsCore.t_exptime), new Double(dataset.obsCore.t_resolution),
		new Long( dataset.obsCore.t_xel ),

		new Double(dataset.obsDataset.em_min), new Double(dataset.obsDataset.em_max),
		new Double(dataset.obsDataset.em_res_power),
		new Long( dataset.obsDataset.em_xel ),
		new Double(dataset.obsCore.em_min), new Double(dataset.obsCore.em_max),
		new Double(dataset.obsCore.em_res_power),
		new Long( dataset.obsCore.em_xel ),

		dataset.obsDataset.o_ucd,
		dataset.obsCore.o_ucd,

		dataset.obsDataset.pol_states,
		new Long( dataset.obsDataset.pol_xel ),
		dataset.obsCore.pol_states,
		new Long( dataset.obsCore.pol_xel ),

		dataset.obsDataset.facility_name,
		dataset.obsDataset.instrument_name,
		dataset.obsCore.facility_name,
		dataset.obsCore.instrument_name,


		// VLKB extensions

data-discovery/src/main/java/vlkb/search/DbPSearch.java

+44 −44

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ public class DbPSearch



		public FormatResponseFilter.ObsDataset[] queryOutputData(String[] pubdidArr, Coord coord, SubsurveyId subsurveyId)
		public FormatResponseFilter.ObsCore[] queryOutputData(String[] pubdidArr, Coord coord, SubsurveyId subsurveyId)
		{
		LOGGER.info("");
		double lon = coord.lon;
		@@ -210,7 +210,7 @@ public class DbPSearch

		//LOGGER.info(theQuery);

		List<FormatResponseFilter.ObsDataset> obsDatasetList = new ArrayList<>();
		List<FormatResponseFilter.ObsCore> obsCoreList = new ArrayList<>();

		LOGGER.info("Connecting to: " + dbConn.uri() + " with optional user/pwd: " + dbConn.userName() +" / "+ dbConn.password() );
		try(
		@@ -222,56 +222,56 @@ public class DbPSearch

		while (res.next())
		{
		FormatResponseFilter.ObsDataset obsDataset = new FormatResponseFilter.ObsDataset();
		FormatResponseFilter.ObsCore obsCore = new FormatResponseFilter.ObsCore();

		obsDataset.dataproduct_type = res.getString("dataproduct_type");
		obsDataset.calib_level = res.getInt("calib_level");
		obsDataset.obs_collection = res.getString("obs_collection");
		obsDataset.obs_id = res.getString("obs_id");
		obsDataset.obs_publisher_did = res.getString("obs_publisher_did");
		obsCore.dataproduct_type = res.getString("dataproduct_type");
		obsCore.calib_level = res.getInt("calib_level");
		obsCore.obs_collection = res.getString("obs_collection");
		obsCore.obs_id = res.getString("obs_id");
		obsCore.obs_publisher_did = res.getString("obs_publisher_did");

		obsDataset.access_url = res.getString("access_url");
		obsDataset.access_format = res.getString("access_format");
		obsDataset.access_estsize = res.getLong("access_estsize");
		obsCore.access_url = res.getString("access_url");
		obsCore.access_format = res.getString("access_format");
		obsCore.access_estsize = res.getLong("access_estsize");

		obsDataset.target_name = res.getString("target_name");
		obsCore.target_name = res.getString("target_name");

		obsDataset.s_ra = res.getDouble("s_ra");
		obsDataset.s_dec = res.getDouble("s_dec");
		obsDataset.s_fov = res.getDouble("s_fov");
		obsDataset.s_region = res.getString("s_region");
		obsDataset.s_xel1 = res.getLong("s_xel1");
		obsDataset.s_xel2 = res.getLong("s_xel2");
		obsDataset.s_resolution = res.getDouble("s_resolution");
		obsCore.s_ra = res.getDouble("s_ra");
		obsCore.s_dec = res.getDouble("s_dec");
		obsCore.s_fov = res.getDouble("s_fov");
		obsCore.s_region = res.getString("s_region");
		obsCore.s_xel1 = res.getLong("s_xel1");
		obsCore.s_xel2 = res.getLong("s_xel2");
		obsCore.s_resolution = res.getDouble("s_resolution");

		obsDataset.t_min = res.getDouble("t_min");
		obsDataset.t_max = res.getDouble("t_max");
		obsDataset.t_exptime = res.getDouble("t_exptime");
		obsDataset.t_resolution = res.getDouble("t_resolution");
		obsDataset.t_xel = res.getLong("t_xel");
		obsCore.t_min = res.getDouble("t_min");
		obsCore.t_max = res.getDouble("t_max");
		obsCore.t_exptime = res.getDouble("t_exptime");
		obsCore.t_resolution = res.getDouble("t_resolution");
		obsCore.t_xel = res.getLong("t_xel");

		obsDataset.em_min = res.getDouble("em_min"); boolean em_min_valid = !res.wasNull();
		obsDataset.em_max = res.getDouble("em_max"); boolean em_max_valid = !res.wasNull();
		obsDataset.em_valid = em_min_valid && em_max_valid;;
		obsDataset.em_res_power = res.getDouble("em_res_power");
		obsDataset.em_xel = res.getLong("em_xel");
		obsCore.em_min = res.getDouble("em_min"); boolean em_min_valid = !res.wasNull();
		obsCore.em_max = res.getDouble("em_max"); boolean em_max_valid = !res.wasNull();
		obsCore.em_valid = em_min_valid && em_max_valid;;
		obsCore.em_res_power = res.getDouble("em_res_power");
		obsCore.em_xel = res.getLong("em_xel");

		obsDataset.o_ucd = res.getString("o_ucd");
		obsCore.o_ucd = res.getString("o_ucd");

		obsDataset.pol_states = res.getString("pol_states");
		obsDataset.pol_xel = res.getLong("pol_xel");
		obsCore.pol_states = res.getString("pol_states");
		obsCore.pol_xel = res.getLong("pol_xel");

		obsDataset.facility_name = res.getString("facility_name");
		obsDataset.instrument_name = res.getString("instrument_name");
		obsCore.facility_name = res.getString("facility_name");
		obsCore.instrument_name = res.getString("instrument_name");

		obsDataset.vertices_str = res.getString("polygon_region_galactic");
		obsDataset.inputInsideDb = res.getBoolean("inputInsideDb");
		obsDataset.dbInsideInput = res.getBoolean("dbInsideInput");
		obsCore.vertices_str = res.getString("polygon_region_galactic");
		obsCore.inputInsideDb = res.getBoolean("inputInsideDb");
		obsCore.dbInsideInput = res.getBoolean("dbInsideInput");

		obsDatasetList.add(obsDataset);
		obsCoreList.add(obsCore);
		}

		LOGGER.info("From DB collected # of ObsDataset : " + obsDatasetList.size());
		LOGGER.info("From DB collected # of ObsCore : " + obsCoreList.size());
		}
		catch (SQLException se)
		{
		@@ -279,7 +279,7 @@ public class DbPSearch
		se.printStackTrace();
		}

		FormatResponseFilter.ObsDataset[] cubes = obsDatasetList.toArray(new FormatResponseFilter.ObsDataset[0]);
		FormatResponseFilter.ObsCore[] cubes = obsCoreList.toArray(new FormatResponseFilter.ObsCore[0]);

		return cubes;
		}

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

+13 −13

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@ public class FormatResponseFilter implements Filter


		/* FIXME type needed in DbPSearch */
		static class ObsDataset
		static class ObsCore
		{
		String dataproduct_type;
		Integer calib_level;
		@@ -192,39 +192,39 @@ public class FormatResponseFilter implements Filter
		dbps = new DbPSearch();
		}

		FormatResponseFilter.ObsDataset[] obsDatasetArr = dbps.queryOutputData(pubdidArr, coord, subsurveyId);
		FormatResponseFilter.ObsCore[] obsCoreArr = dbps.queryOutputData(pubdidArr, coord, subsurveyId);

		return convert(obsDatasetArr, coord, queryString, fitsRemotePath);
		return convert(obsCoreArr, coord, queryString, fitsRemotePath);
		}





		private Dataset[] convert(FormatResponseFilter.ObsDataset[] obsDatasetArr, Coord coord, String queryString, String fitsRemotePath)
		private Dataset[] convert(FormatResponseFilter.ObsCore[] obsCoreArr, Coord coord, String queryString, String fitsRemotePath)
		{
		List<Dataset> datasetList = new ArrayList<Dataset>();

		for(FormatResponseFilter.ObsDataset obsDataset : obsDatasetArr)
		for(FormatResponseFilter.ObsCore obsCore : obsCoreArr)
		{
		Dataset dataset = new Dataset();

		dataset.obsDataset = obsDataset;
		dataset.obsCore = obsCore;

		dataset.queryString = queryString;
		dataset.subsurvey_id = obsDataset.obs_collection;
		dataset.overlapCodeSky = convertToOverlapCodeSky(obsDataset.inputInsideDb, obsDataset.dbInsideInput);
		dataset.overlapCodeVel = convertToOverlapCodeVel(coord, obsDataset.em_valid, obsDataset.em_min, obsDataset.em_max);
		dataset.subsurvey_id = obsCore.obs_collection;
		dataset.overlapCodeSky = convertToOverlapCodeSky(obsCore.inputInsideDb, obsCore.dbInsideInput);
		dataset.overlapCodeVel = convertToOverlapCodeVel(coord, obsCore.em_valid, obsCore.em_min, obsCore.em_max);
		dataset.overlapCode = convertToOverlapCode(dataset.overlapCodeSky, dataset.overlapCodeVel);
		dataset.dataType = obsDataset.dataproduct_type;
		dataset.publisherDid = obsDataset.obs_publisher_did;
		dataset.dataType = obsCore.dataproduct_type;
		dataset.publisherDid = obsCore.obs_publisher_did;

		dataset.access.accessFileUrl = obsDataset.access_url;
		dataset.access.accessFileUrl = obsCore.access_url;
		dataset.access.accessCutoutUrl = fitsRemotePath + "?ID=" + dataset.publisherDid + "&" + queryString;
		//dataset.access.accessCutoutUrl = fitsRemotePath + "?pubdid=" + dataset.publisherDid + "&" + queryString;
		dataset.access.accessMosaicUrl = null;

		dataset.vertices_deg = convertToVertices(obsDataset.vertices_str);
		dataset.vertices_deg = convertToVertices(obsCore.vertices_str);

		datasetList.add(dataset);
		}