Commit 9c885f3e authored by Tifenn Guillas's avatar Tifenn Guillas

Merge branch 'develop' into 'master'

Develop

See merge request !51
parents bdc5dc5d 666ed8ea
......@@ -4,13 +4,20 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [3.3.0]
## [3.4.0]
### Added
- #54: Added search by cone-search
- #56: Added config attribute to Instance entity
### Changed
- #56: Remove 'selectable_row' from Dataset entity
## [3.3.0]
### Added
- #54: Added search by cone-search
## [3.2.1]
### Fixed
- #55: Fixed bug json in json when only one column is selected
- #55: Bug json in json when only one column selected
## [3.2.0]
### Added
......
3.3.0
\ No newline at end of file
3.4.0
\ No newline at end of file
openapi: "3.0.0"
info:
version: 3.3.0
version: 3.4.0
title: Anis Server
description: 'AstroNomical Information System is a generic web tool that aims to facilitate the provision of data (Astrophysics), accessible from a database, to a community of scientists.'
contact:
......
--
-- PostgreSQL database dump
--
-- Dumped from database version 10.14
-- Dumped by pg_dump version 10.14
-- Started on 2020-09-07 16:05:33 CEST
SET statement_timeout = 0;
SET lock_timeout = 0;
SET idle_in_transaction_session_timeout = 0;
SET client_encoding = 'UTF8';
SET standard_conforming_strings = on;
SELECT pg_catalog.set_config('search_path', '', false);
SET check_function_bodies = false;
SET xmloption = content;
SET client_min_messages = warning;
SET row_security = off;
SET default_tablespace = '';
SET default_with_oids = false;
--
-- TOC entry 219 (class 1259 OID 833027)
-- Name: aspic_gama_g02; Type: TABLE; Schema: public; Owner: postgres
--
CREATE TABLE public.aspic_gama_g02 (
cataid numeric NOT NULL,
ra numeric,
"dec" numeric,
z numeric,
fuv numeric,
err_fuv numeric,
nuv numeric,
err_nuv numeric,
mag_auto_u_1 numeric,
magerr_auto_u_1 numeric,
mag_auto_g_1 numeric,
magerr_auto_g_1 numeric,
mag_auto_r_1 numeric,
magerr_auto_r_1 numeric,
mag_auto_i_1 numeric,
magerr_auto_i_1 numeric,
mag_auto_z_1 numeric,
magerr_auto_z_1 numeric,
ks numeric,
err_ks numeric,
ywir numeric,
err_ywir numeric,
sig_hb numeric,
sig_hb_err numeric,
hb_flux numeric,
hb_flux_err numeric,
hb_ew numeric,
hb_ew_err numeric,
sig_hb_abs numeric,
sig_hb_abs_err numeric,
hb_abs_flux numeric,
hb_abs_flux_err numeric,
hb_abs_ew numeric,
hb_abs_ew_err numeric,
sig_hb_b numeric,
sig_hb_b_err numeric,
hb_b_flux numeric,
hb_b_flux_err numeric,
hb_b_ew numeric,
hb_b_ew_err numeric,
sig_oiiib numeric,
sig_oiiib_err numeric,
oiiib_flux numeric,
oiiib_flux_err numeric,
oiiib_ew numeric,
oiiib_ew_err numeric,
sig_oiiir numeric,
sig_oiiir_err numeric,
oiiir_flux numeric,
oiiir_flux_err numeric,
oiiir_ew numeric,
oiiir_ew_err numeric,
sig_ha numeric,
sig_ha_err numeric,
ha_flux numeric,
ha_flux_err numeric,
ha_ew numeric,
ha_ew_err numeric,
sig_ha_abs numeric,
sig_ha_abs_err numeric,
ha_abs_flux numeric,
ha_abs_flux_err numeric,
ha_abs_ew numeric,
ha_abs_ew_err numeric,
sig_ha_b numeric,
sig_ha_b_err numeric,
ha_b_flux numeric,
ha_b_flux_err numeric,
ha_b_ew numeric,
ha_b_ew_err numeric,
sig_niib numeric,
sig_niib_err numeric,
niib_flux numeric,
niib_flux_err numeric,
niib_ew numeric,
niib_ew_err numeric,
sig_niir numeric,
sig_niir_err numeric,
niir_flux numeric,
niir_flux_err numeric,
niir_ew numeric,
niir_ew_err numeric,
url character varying(255),
url_img character varying(255),
chi2_red numeric,
logmstar numeric,
logmstar_err numeric,
sfr numeric,
sfr_err numeric
);
ALTER TABLE public.aspic_gama_g02 OWNER TO anis;
--
-- TOC entry 5271 (class 0 OID 833027)
-- Dependencies: 219
-- Data for Name: aspic_gama_g02; Type: TABLE DATA; Schema: public; Owner: postgres
--
COPY public.aspic_gama_g02 (cataid, ra, "dec", z, fuv, err_fuv, nuv, err_nuv, mag_auto_u_1, magerr_auto_u_1, mag_auto_g_1, magerr_auto_g_1, mag_auto_r_1, magerr_auto_r_1, mag_auto_i_1, magerr_auto_i_1, mag_auto_z_1, magerr_auto_z_1, ks, err_ks, ywir, err_ywir, sig_hb, sig_hb_err, hb_flux, hb_flux_err, hb_ew, hb_ew_err, sig_hb_abs, sig_hb_abs_err, hb_abs_flux, hb_abs_flux_err, hb_abs_ew, hb_abs_ew_err, sig_hb_b, sig_hb_b_err, hb_b_flux, hb_b_flux_err, hb_b_ew, hb_b_ew_err, sig_oiiib, sig_oiiib_err, oiiib_flux, oiiib_flux_err, oiiib_ew, oiiib_ew_err, sig_oiiir, sig_oiiir_err, oiiir_flux, oiiir_flux_err, oiiir_ew, oiiir_ew_err, sig_ha, sig_ha_err, ha_flux, ha_flux_err, ha_ew, ha_ew_err, sig_ha_abs, sig_ha_abs_err, ha_abs_flux, ha_abs_flux_err, ha_abs_ew, ha_abs_ew_err, sig_ha_b, sig_ha_b_err, ha_b_flux, ha_b_flux_err, ha_b_ew, ha_b_ew_err, sig_niib, sig_niib_err, niib_flux, niib_flux_err, niib_ew, niib_ew_err, sig_niir, sig_niir_err, niir_flux, niir_flux_err, niir_ew, niir_ew_err, url, url_img, chi2_red, logmstar, logmstar_err, sfr, sfr_err) FROM stdin;
2343537 36.162575 -4.228418 0.06168 -9999.0 -9999.0 -9999.0 -9999.0 19.3666 0.000940856 18.237 0.000396547 17.6881 0.000350743 17.3413 0.000340303 17.1094 0.00044649 -9999.0 -9999.0 16.94440380240272 0.0057 1.41176 0.111765 147.386 15.0323 5.04562 0.51518 7.08086 1.11626 -131.987 32.5804 -4.51865 1.11562 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 1.12838 0.0 32.2545 5.484 1.1057 0.188069 1.1242 0.0 55.4157 6.92746 1.90095 0.23781 2.32382 0.0537263 568.051 18.5769 25.1713 0.828212 6.54805 4.09869 -34.8483 41.7552 -1.54417 1.85023 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 2.36541 0.0689657 60.1321 7.58228 2.66438 0.3361 2.36597 0.0689821 193.954 7.8292 8.5952 0.348353 GAMA_DR3/gama/G02_Y5_091_355.fit http://www.gama-survey.org/dr3/data/spectra/gama/reduced_27/1d/png/G02_Y5_091_355.png 1.4539229248865058 10.151737935278518 9.754073378451837 3.812972348882642 2.796305316790736
1788881 36.2402 -4.238301 0.06214 22.013 0.046 21.185 0.024 18.9691 0.000820007 17.5127 0.000300377 16.7448 0.000216459 16.3034 0.000199637 15.9684 0.000219477 -9999.0 -9999.0 15.71552093081774 0.0018 1.1242 0.0 27.4934 8.24876 0.609904 0.183013 13.8602 0.0 -132.68 29.8946 -2.94328 0.663321 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 14.2024 0.0 133.275 28.2246 2.95404 0.625769 14.2701 0.0 48.4965 40.5725 1.07446 0.898914 4.18545 0.198376 1233.9 58.4829 15.9545 0.757137 5.12256 0.402927 -758.023 63.5312 -9.80131 0.821794 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 3.69904 0.106143 158.032 13.8784 2.04347 0.179523 3.7053 0.106323 551.54 21.3258 7.13096 0.276244 GAMA_DR3/gama/G02_Y3_006_342.fit http://www.gama-survey.org/dr3/data/spectra/gama/reduced_27/1d/png/G02_Y3_006_342.png 2.423742496247961 10.719200986351614 9.844051813626809 0.3227338175704813 0.1882968476672116
1789890 36.164642 -4.169397 0.10402 21.099 0.019 20.57 0.0090 19.7118 0.00114264 18.4866 0.000443642 17.9292 0.000387229 17.5889 0.000358621 17.3518 0.000526344 -9999.0 -9999.0 17.21133146944058 0.0060 1.1242 0.0 61.5117 28.9882 2.36139 1.11303 14.4006 0.0 -155.853 35.3941 -5.98281 1.35972 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 4.08359 1.50003 42.666 22.4109 1.64055 0.861841 4.10064 1.50629 36.3019 20.8321 1.39694 0.801743 2.35482 0.11237 288.679 19.3187 15.914 1.07414 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 34.8762 29.6012 44.0998 55.9947 2.43116 3.08699 2.41524 0.22677 21.0494 5.68096 1.16033 0.313324 2.41606 0.226847 96.1154 11.5255 5.29893 0.637116 GAMA_DR3/gama/G02_Y5_082_307.fit http://www.gama-survey.org/dr3/data/spectra/gama/reduced_27/1d/png/G02_Y5_082_307.png 3.335582324322374 10.128526687623188 9.289252754179097 6.686186360539965 3.1495999263214616
1789752 36.238906 -4.178767 0.14214 24.433 0.09 23.325 0.036 21.4536 0.00341768 19.9475 0.000986789 18.9848 0.000697223 18.516 0.000635056 18.1256 0.000736899 -9999.0 -9999.0 17.972101907509405 0.0073 4.83655 1.59994 87.0773 30.8447 11.4031 4.04254 6.5627 1.51785 -136.05 31.4662 -17.8163 4.12853 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 0.188547 0.0 6.25742 3.56563 0.818834 0.466738 1.69427 0.0 21.0611 7.79787 2.75503 1.02081 1.69427 0.0 5.8101 14.1763 0.719916 1.75656 2.9023 1.60049 -16.9398 23.6796 -2.09897 2.93414 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 1.6978 0.0 6.87749 3.16906 0.852228 0.39276 1.69427 0.0 5.61988 3.627 0.696269 0.449401 GAMA_DR3/gama/G02_Y5_107_253.fit http://www.gama-survey.org/dr3/data/spectra/gama/reduced_27/1d/png/G02_Y5_107_253.png 2.7366502121691627 10.566711777977593 9.86247060179375 1.0252312851028487 0.7234934763087535
2343918 36.23596 -4.162365 0.20903 25.232 0.208 24.138 0.063 21.187 0.00256365 19.4706 0.00073707 18.3741 0.000500622 17.8907 0.000406513 17.5729 0.000465037 -9999.0 -9999.0 17.329550023916106 0.0053 2.32242 0.595639 110.37 30.7677 6.96279 1.94219 3.18771 0.738787 -130.54 30.2541 -8.23524 1.9103 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 3.46677 2.3946 16.1119 15.3957 1.01784 0.972644 3.4764 2.40125 9.79674 11.4037 0.61933 0.720946 3.25006 0.621923 68.9824 13.2003 4.54774 0.870809 5.90576 0.953347 -94.0574 21.9822 -6.20079 1.44982 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 1.6978 0.0 5.06234 6.95486 0.333787 0.458577 1.69427 0.0 7.35389 3.2333 0.48472 0.213144 GAMA_DR3/gama/G02_Y3_015_358.fit http://www.gama-survey.org/dr3/data/spectra/gama/reduced_27/1d/png/G02_Y3_015_358.png 7.946562803214832 11.200298707270198 10.204868318216658 0.2623157644277296 0.024662972298472533
1789978 36.188498 -4.163845 0.2382 21.843 0.026 21.436 0.016 20.843 0.00252416 19.6231 0.000975016 18.7542 0.000657986 18.3267 0.000676385 18.0685 0.000888444 -9999.0 -9999.0 17.98900897121927 0.012 2.70348 1.28974 18.1832 11.1789 1.55068 0.953446 16.2213 0.0 -34.144 19.3607 -2.91209 1.65145 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 3.11331 1.12027 1.3802 5.79481 0.118086 0.495788 3.12042 1.12283 21.6388 10.3983 1.8543 0.891217 2.01571 0.192584 59.3708 7.5598 5.20693 0.730907 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 85.099 50.3268 216.067 165.101 18.9487 14.5223 2.35072 0.314124 -0.13718 7.61249 -0.012033 0.667743 2.3512 0.314189 48.8707 8.50379 4.28497 0.787403 GAMA_DR3/gama/G02_Y5_091_312.fit http://www.gama-survey.org/dr3/data/spectra/gama/reduced_27/1d/png/G02_Y5_091_312.png 1.5134964811240368 10.880978356075236 10.394753502718462 8.658254262866398 9.355826258280498
1789814 36.222075 -4.171732 0.27638 23.824 0.055 22.524 0.019 21.5891 0.00347751 20.411 0.00122627 19.4441 0.000845147 18.9473 0.000780131 18.581 0.000997363 -9999.0 -9999.0 18.368605844398687 0.0117 1.69427 0.0 6.03775 2.86781 0.96617 0.459027 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 22.3077 0.0 0.0 0.0 0.0 0.0 5.76941 4.49953 7.68786 8.72721 1.23896 1.40652 5.79297 4.51791 5.1736 6.84411 0.836871 1.10713 3.91728 0.31932 75.3841 7.63963 14.972 1.52967 9.40083 0.0 0.0 0.0 0.0 0.0 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 5.04162 1.18783 12.7539 5.77813 2.53099 1.14713 5.0525 1.19039 32.4315 9.31753 6.44979 1.85492 GAMA_DR3/gama/G02_Y5_082_288.fit http://www.gama-survey.org/dr3/data/spectra/gama/reduced_27/1d/png/G02_Y5_082_288.png 3.942253332189462 10.635353159390663 9.959294869634306 12.656123194170437 8.145555138244266
1789368 36.212655 -4.201258 0.31794 25.779 0.271 26.487 0.499 23.0003 0.0119241 20.9599 0.00181921 19.5002 0.000872459 18.9268 0.000758253 18.5524 0.00097919 -9999.0 -9999.0 -9999.0 -9999.0 2.10515 1.02689 28.2604 14.6208 4.15731 2.1513 2.64591 0.985327 -40.2973 15.0066 -5.92796 2.20849 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 1.70056 0.0 9.80333 3.42828 1.44914 0.507016 1.69427 0.0 3.48478 3.13491 0.51633 0.464524 1.69427 0.0 0.0 0.0 0.0 0.0 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 -99999.0 93.5518 29.4085 371.139 144.593 76.7778 31.1664 14.6085 0.0 -36.0865 0.0 -7.40321 0.83699 14.647 0.0 -3.89569 15.4525 -0.811634 3.22075 GAMA_DR3/gama/G02_Y5_107_260.fit http://www.gama-survey.org/dr3/data/spectra/gama/reduced_27/1d/png/G02_Y5_107_260.png 9.361356389985998 11.940832177404799 11.26610197295118 1.2797054854546384 0.27930087622824185
\.
--
-- TOC entry 5084 (class 2606 OID 840720)
-- Name: aspic_gama_g02 aspic_gama_g02_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres
--
--
-- ALTER TABLE ONLY public.aspic_gama_g02
-- ADD CONSTRAINT aspic_gama_g02_pkey PRIMARY KEY (cataid);
--
-- TOC entry 5277 (class 0 OID 0)
-- Dependencies: 219
-- Name: TABLE aspic_gama_g02; Type: ACL; Schema: public; Owner: postgres
--
-- GRANT SELECT ON TABLE public.aspic_gama_g02 TO consult;
-- Completed on 2020-09-07 16:05:33 CEST
--
-- PostgreSQL database dump complete
--
......@@ -99,6 +99,27 @@ ALTER TABLE public.aspic_vipers_dr2_w1 OWNER TO anis;
--
COPY public.aspic_vipers_dr2_w1 (num, alpha, delta, selmag, errselmag, pointing, quadrant, zspec, zflg, norm, epoch, photomask, tsr, ssr, classflag, id_t07, u, g, r, i, z, erru, errg, errr, erri, errz, u_t07, g_t07, r_t07, i_t07, iy_t07, z_t07, erru_t07, errg_t07, errr_t07, erri_t07, erriy_t07, errz_t07, k_video, ks, fuv, nuv, errk_video, errks, errfuv, errnuv, deltaug, deltagr, deltari, ebv, r2, r2_t07, classflag_2, photomask_2, spectromask, spec1d, spec1dnoise, spec1dsky, zflg_vipers) FROM stdin;
125105118 36.2372494 -4.2348133 20.5761 0.0034 W1P198 4 0.2096 23 26.2311 2 1 0.0 0.0 0 495700 21.2228 20.2467 19.621 19.2464 19.0479 0.0138 0.0037 0.0048 0.0034 0.0074 21.11 20.263 19.667 19.284 -99.0 19.204 0.013 0.0040 0.0040 0.0030 -99.0 0.0070 -99.99 18.443 -99.0 21.843 -99.99 0.012 -99.0 0.024 -0.04 0.0020 0.0496 0.02522 5.99 6.01 0 1 1 VIPERS_DR2/spec1D/VIPERS_125105118_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_125105118_noise.fits VIPERS_DR2/spec1DSky/VIPERS_125105118_sky.fits 23.4
125105354 36.1644993 -4.234881 19.2464 0.0034 W1P198 4 0.2096 23 26.2311 2 1 0.0 0.0 0 495700 21.2228 20.2467 19.621 19.2464 19.0479 0.0138 0.0037 0.0048 0.0034 0.0074 21.11 20.263 19.667 19.284 -99.0 19.204 0.013 0.0040 0.0040 0.0030 -99.0 0.0070 -99.99 18.443 -99.0 21.843 -99.99 0.012 -99.0 0.024 -0.04 0.0020 0.0496 0.02522 5.99 6.01 0 1 1 VIPERS_DR2/spec1D/VIPERS_125105354_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_125105354_noise.fits VIPERS_DR2/spec1DSky/VIPERS_125105354_sky.fits 23.4
125105691 36.2276034 -4.2328276 19.2464 0.0034 W1P198 4 0.2096 23 26.2311 2 1 0.0 0.0 0 495700 21.2228 20.2467 19.621 19.2464 19.0479 0.0138 0.0037 0.0048 0.0034 0.0074 21.11 20.263 19.667 19.284 -99.0 19.204 0.013 0.0040 0.0040 0.0030 -99.0 0.0070 -99.99 18.443 -99.0 21.843 -99.99 0.012 -99.0 0.024 -0.04 0.0020 0.0496 0.02522 5.99 6.01 0 1 1 VIPERS_DR2/spec1D/VIPERS_125105691_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_125105691_noise.fits VIPERS_DR2/spec1DSky/VIPERS_125105691_sky.fits 23.4
125106215 36.2312769 -4.2305797 19.2464 0.0034 W1P198 4 0.2096 23 26.2311 2 1 0.0 0.0 0 495700 21.2228 20.2467 19.621 19.2464 19.0479 0.0138 0.0037 0.0048 0.0034 0.0074 21.11 20.263 19.667 19.284 -99.0 19.204 0.013 0.0040 0.0040 0.0030 -99.0 0.0070 -99.99 18.443 -99.0 21.843 -99.99 0.012 -99.0 0.024 -0.04 0.0020 0.0496 0.02522 5.99 6.01 0 1 1 VIPERS_DR2/spec1D/VIPERS_125106215_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_125106215_noise.fits VIPERS_DR2/spec1DSky/VIPERS_125106215_sky.fits 23.4
125106667 36.2357517 -4.2289307 19.2464 0.0034 W1P198 4 0.2096 23 26.2311 2 1 0.0 0.0 0 495700 21.2228 20.2467 19.621 19.2464 19.0479 0.0138 0.0037 0.0048 0.0034 0.0074 21.11 20.263 19.667 19.284 -99.0 19.204 0.013 0.0040 0.0040 0.0030 -99.0 0.0070 -99.99 18.443 -99.0 21.843 -99.99 0.012 -99.0 0.024 -0.04 0.0020 0.0496 0.02522 5.99 6.01 0 1 1 VIPERS_DR2/spec1D/VIPERS_125106667_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_125106667_noise.fits VIPERS_DR2/spec1DSky/VIPERS_125106667_sky.fits 23.4
125106833 36.2395343 -4.2283397 19.2464 0.0034 W1P198 4 0.2096 23 26.2311 2 1 0.0 0.0 0 495700 21.2228 20.2467 19.621 19.2464 19.0479 0.0138 0.0037 0.0048 0.0034 0.0074 21.11 20.263 19.667 19.284 -99.0 19.204 0.013 0.0040 0.0040 0.0030 -99.0 0.0070 -99.99 18.443 -99.0 21.843 -99.99 0.012 -99.0 0.024 -0.04 0.0020 0.0496 0.02522 5.99 6.01 0 1 1 VIPERS_DR2/spec1D/VIPERS_125106833_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_125106833_noise.fits VIPERS_DR2/spec1DSky/VIPERS_125106833_sky.fits 23.4
125108288 36.2220463 -4.2232328 19.2464 0.0034 W1P198 4 0.2096 23 26.2311 2 1 0.0 0.0 0 495700 21.2228 20.2467 19.621 19.2464 19.0479 0.0138 0.0037 0.0048 0.0034 0.0074 21.11 20.263 19.667 19.284 -99.0 19.204 0.013 0.0040 0.0040 0.0030 -99.0 0.0070 -99.99 18.443 -99.0 21.843 -99.99 0.012 -99.0 0.024 -0.04 0.0020 0.0496 0.02522 5.99 6.01 0 1 1 VIPERS_DR2/spec1D/VIPERS_125108288_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_125108288_noise.fits VIPERS_DR2/spec1DSky/VIPERS_125108288_sky.fits 23.4
125108532 36.210931 -4.2222241 19.2464 0.0034 W1P198 4 0.2096 23 26.2311 2 1 0.0 0.0 0 495700 21.2228 20.2467 19.621 19.2464 19.0479 0.0138 0.0037 0.0048 0.0034 0.0074 21.11 20.263 19.667 19.284 -99.0 19.204 0.013 0.0040 0.0040 0.0030 -99.0 0.0070 -99.99 18.443 -99.0 21.843 -99.99 0.012 -99.0 0.024 -0.04 0.0020 0.0496 0.02522 5.99 6.01 0 1 1 VIPERS_DR2/spec1D/VIPERS_125108532_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_125108532_noise.fits VIPERS_DR2/spec1DSky/VIPERS_125108532_sky.fits 23.4
125111094 36.2138261 -4.2123053 19.2464 0.0034 W1P198 4 0.2096 23 26.2311 2 1 0.0 0.0 0 495700 21.2228 20.2467 19.621 19.2464 19.0479 0.0138 0.0037 0.0048 0.0034 0.0074 21.11 20.263 19.667 19.284 -99.0 19.204 0.013 0.0040 0.0040 0.0030 -99.0 0.0070 -99.99 18.443 -99.0 21.843 -99.99 0.012 -99.0 0.024 -0.04 0.0020 0.0496 0.02522 5.99 6.01 0 1 1 VIPERS_DR2/spec1D/VIPERS_125111094_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_125111094_noise.fits VIPERS_DR2/spec1DSky/VIPERS_125111094_sky.fits 23.4
125111482 36.2330599 -4.2115119 19.2464 0.0034 W1P198 4 0.2096 23 26.2311 2 1 0.0 0.0 0 495700 21.2228 20.2467 19.621 19.2464 19.0479 0.0138 0.0037 0.0048 0.0034 0.0074 21.11 20.263 19.667 19.284 -99.0 19.204 0.013 0.0040 0.0040 0.0030 -99.0 0.0070 -99.99 18.443 -99.0 21.843 -99.99 0.012 -99.0 0.024 -0.04 0.0020 0.0496 0.02522 5.99 6.01 0 1 1 VIPERS_DR2/spec1D/VIPERS_125111482_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_125111482_noise.fits VIPERS_DR2/spec1DSky/VIPERS_125111482_sky.fits 23.4
125111652 36.2150437 -4.2103248 19.2464 0.0034 W1P198 4 0.2096 23 26.2311 2 1 0.0 0.0 0 495700 21.2228 20.2467 19.621 19.2464 19.0479 0.0138 0.0037 0.0048 0.0034 0.0074 21.11 20.263 19.667 19.284 -99.0 19.204 0.013 0.0040 0.0040 0.0030 -99.0 0.0070 -99.99 18.443 -99.0 21.843 -99.99 0.012 -99.0 0.024 -0.04 0.0020 0.0496 0.02522 5.99 6.01 0 1 1 VIPERS_DR2/spec1D/VIPERS_125111652_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_125111652_noise.fits VIPERS_DR2/spec1DSky/VIPERS_125111652_sky.fits 23.4
125114056 36.1595776 -4.2014325 19.2464 0.0034 W1P198 4 0.2096 23 26.2311 2 1 0.0 0.0 0 495700 21.2228 20.2467 19.621 19.2464 19.0479 0.0138 0.0037 0.0048 0.0034 0.0074 21.11 20.263 19.667 19.284 -99.0 19.204 0.013 0.0040 0.0040 0.0030 -99.0 0.0070 -99.99 18.443 -99.0 21.843 -99.99 0.012 -99.0 0.024 -0.04 0.0020 0.0496 0.02522 5.99 6.01 0 1 1 VIPERS_DR2/spec1D/VIPERS_125114056_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_125114056_noise.fits VIPERS_DR2/spec1DSky/VIPERS_125114056_sky.fits 23.4
125114643 36.2180953 -4.1989704 19.2464 0.0034 W1P198 4 0.2096 23 26.2311 2 1 0.0 0.0 0 495700 21.2228 20.2467 19.621 19.2464 19.0479 0.0138 0.0037 0.0048 0.0034 0.0074 21.11 20.263 19.667 19.284 -99.0 19.204 0.013 0.0040 0.0040 0.0030 -99.0 0.0070 -99.99 18.443 -99.0 21.843 -99.99 0.012 -99.0 0.024 -0.04 0.0020 0.0496 0.02522 5.99 6.01 0 1 1 VIPERS_DR2/spec1D/VIPERS_125114643_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_125114643_noise.fits VIPERS_DR2/spec1DSky/VIPERS_125114643_sky.fits 23.4
125115553 36.2065377 -4.1957827 19.2464 0.0034 W1P198 4 0.2096 23 26.2311 2 1 0.0 0.0 0 495700 21.2228 20.2467 19.621 19.2464 19.0479 0.0138 0.0037 0.0048 0.0034 0.0074 21.11 20.263 19.667 19.284 -99.0 19.204 0.013 0.0040 0.0040 0.0030 -99.0 0.0070 -99.99 18.443 -99.0 21.843 -99.99 0.012 -99.0 0.024 -0.04 0.0020 0.0496 0.02522 5.99 6.01 0 1 1 VIPERS_DR2/spec1D/VIPERS_125115553_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_125115553_noise.fits VIPERS_DR2/spec1DSky/VIPERS_125115553_sky.fits 23.4
125116628 36.223869 -4.1916085 19.2464 0.0034 W1P198 4 0.2096 23 26.2311 2 1 0.0 0.0 0 495700 21.2228 20.2467 19.621 19.2464 19.0479 0.0138 0.0037 0.0048 0.0034 0.0074 21.11 20.263 19.667 19.284 -99.0 19.204 0.013 0.0040 0.0040 0.0030 -99.0 0.0070 -99.99 18.443 -99.0 21.843 -99.99 0.012 -99.0 0.024 -0.04 0.0020 0.0496 0.02522 5.99 6.01 0 1 1 VIPERS_DR2/spec1D/VIPERS_125116628_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_125116628_noise.fits VIPERS_DR2/spec1DSky/VIPERS_125116628_sky.fits 23.4
125117050 36.2288209 -4.190055 19.2464 0.0034 W1P198 4 0.2096 23 26.2311 2 1 0.0 0.0 0 495700 21.2228 20.2467 19.621 19.2464 19.0479 0.0138 0.0037 0.0048 0.0034 0.0074 21.11 20.263 19.667 19.284 -99.0 19.204 0.013 0.0040 0.0040 0.0030 -99.0 0.0070 -99.99 18.443 -99.0 21.843 -99.99 0.012 -99.0 0.024 -0.04 0.0020 0.0496 0.02522 5.99 6.01 0 1 1 VIPERS_DR2/spec1D/VIPERS_125117050_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_125117050_noise.fits VIPERS_DR2/spec1DSky/VIPERS_125117050_sky.fits 23.4
125117096 36.2272057 -4.1891178 19.2464 0.0034 W1P198 4 0.2096 23 26.2311 2 1 0.0 0.0 0 495700 21.2228 20.2467 19.621 19.2464 19.0479 0.0138 0.0037 0.0048 0.0034 0.0074 21.11 20.263 19.667 19.284 -99.0 19.204 0.013 0.0040 0.0040 0.0030 -99.0 0.0070 -99.99 18.443 -99.0 21.843 -99.99 0.012 -99.0 0.024 -0.04 0.0020 0.0496 0.02522 5.99 6.01 0 1 1 VIPERS_DR2/spec1D/VIPERS_125117096_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_125117096_noise.fits VIPERS_DR2/spec1DSky/VIPERS_125117096_sky.fits 23.4
125119416 36.1620435 -4.1832106 19.2464 0.0034 W1P198 4 0.2096 23 26.2311 2 1 0.0 0.0 0 495700 21.2228 20.2467 19.621 19.2464 19.0479 0.0138 0.0037 0.0048 0.0034 0.0074 21.11 20.263 19.667 19.284 -99.0 19.204 0.013 0.0040 0.0040 0.0030 -99.0 0.0070 -99.99 18.443 -99.0 21.843 -99.99 0.012 -99.0 0.024 -0.04 0.0020 0.0496 0.02522 5.99 6.01 0 1 1 VIPERS_DR2/spec1D/VIPERS_125119416_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_125119416_noise.fits VIPERS_DR2/spec1DSky/VIPERS_125119416_sky.fits 23.4
125120491 36.1635683 -4.1786638 19.2464 0.0034 W1P198 4 0.2096 23 26.2311 2 1 0.0 0.0 0 495700 21.2228 20.2467 19.621 19.2464 19.0479 0.0138 0.0037 0.0048 0.0034 0.0074 21.11 20.263 19.667 19.284 -99.0 19.204 0.013 0.0040 0.0040 0.0030 -99.0 0.0070 -99.99 18.443 -99.0 21.843 -99.99 0.012 -99.0 0.024 -0.04 0.0020 0.0496 0.02522 5.99 6.01 0 1 1 VIPERS_DR2/spec1D/VIPERS_125120491_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_125120491_noise.fits VIPERS_DR2/spec1DSky/VIPERS_125120491_sky.fits 23.4
125120596 36.2108996 -4.178203 19.2464 0.0034 W1P198 4 0.2096 23 26.2311 2 1 0.0 0.0 0 495700 21.2228 20.2467 19.621 19.2464 19.0479 0.0138 0.0037 0.0048 0.0034 0.0074 21.11 20.263 19.667 19.284 -99.0 19.204 0.013 0.0040 0.0040 0.0030 -99.0 0.0070 -99.99 18.443 -99.0 21.843 -99.99 0.012 -99.0 0.024 -0.04 0.0020 0.0496 0.02522 5.99 6.01 0 1 1 VIPERS_DR2/spec1D/VIPERS_125120596_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_125120596_noise.fits VIPERS_DR2/spec1DSky/VIPERS_125120596_sky.fits 23.4
125121303 36.2396546 -4.1750736 19.2464 0.0034 W1P198 4 0.2096 23 26.2311 2 1 0.0 0.0 0 495700 21.2228 20.2467 19.621 19.2464 19.0479 0.0138 0.0037 0.0048 0.0034 0.0074 21.11 20.263 19.667 19.284 -99.0 19.204 0.013 0.0040 0.0040 0.0030 -99.0 0.0070 -99.99 18.443 -99.0 21.843 -99.99 0.012 -99.0 0.024 -0.04 0.0020 0.0496 0.02522 5.99 6.01 0 1 1 VIPERS_DR2/spec1D/VIPERS_125121303_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_125121303_noise.fits VIPERS_DR2/spec1DSky/VIPERS_125121303_sky.fits 23.4
101121877 30.8151647 -5.974833 19.2464 0.0034 W1P198 4 0.2096 23 26.2311 2 1 0.0 0.0 0 495700 21.2228 20.2467 19.621 19.2464 19.0479 0.0138 0.0037 0.0048 0.0034 0.0074 21.11 20.263 19.667 19.284 -99.0 19.204 0.013 0.0040 0.0040 0.0030 -99.0 0.0070 -99.99 18.443 -99.0 21.843 -99.99 0.012 -99.0 0.024 -0.04 0.0020 0.0496 0.02522 5.99 6.01 0 1 1 VIPERS_DR2/spec1D/VIPERS_101121877_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_101121877_noise.fits VIPERS_DR2/spec1DSky/VIPERS_101121877_sky.fits 23.4
101122063 30.4001899 -5.9778899 22.6929 0.0493 W1P197 3 0.9226 21 2.9409 2 1 0.0 0.0 -2 \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N VIPERS_DR2/spec1D/VIPERS_101122063_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_101122063_noise.fits VIPERS_DR2/spec1DSky/VIPERS_101122063_sky.fits 21.5
101122068 30.4430395 -5.9775326 21.4163 0.0191 W1P197 3 1.0308 2 4.1758 2 1 0.8647142 1.0 1 494816 24.2625 24.0494 22.7203 21.4163 20.5294 0.1581 0.0885 0.061 0.0191 0.0219 24.451 23.917 22.84 21.518 -99.0 20.735 0.158 0.058 0.035 0.015 -99.0 0.018 -99.99 18.962 -99.0 -99.0 -99.99 0.013 -99.0 -99.0 -0.04 0.0020 0.0496 0.02454 5.04 4.77 1 1 1 VIPERS_DR2/spec1D/VIPERS_101122068_bis.fits VIPERS_DR2/spec1Dnoise/VIPERS_101122068_noise.fits VIPERS_DR2/spec1DSky/VIPERS_101122068_sky.fits 2.4
......
This diff is collapsed.
......@@ -13,3 +13,4 @@ psql -v ON_ERROR_STOP=1 -f /sql/observations_info.sql --username "anis" --dbname
psql -v ON_ERROR_STOP=1 -f /sql/svom_sdb_dc1.sql --username "anis" --dbname "anis_test"
psql -v ON_ERROR_STOP=1 -f /sql/colibridb.sql --username "anis" --dbname "anis_test"
psql -v ON_ERROR_STOP=1 -f /sql/aspic_vipers_dr2_w1.sql --username "anis" --dbname "anis_test"
psql -v ON_ERROR_STOP=1 -f /sql/aspic_gama_g02.sql --username "anis" --dbname "anis_test"
......@@ -36,6 +36,7 @@ services:
- ./conf-dev/svom_sdb_dc1.sql:/sql/svom_sdb_dc1.sql
- ./conf-dev/colibridb.sql:/sql/colibridb.sql
- ./conf-dev/aspic_vipers_dr2_w1.sql:/sql/aspic_vipers_dr2_w1.sql
- ./conf-dev/aspic_gama_g02.sql:/sql/aspic_gama_g02.sql
- ./conf-dev/init-postgres.sh:/docker-entrypoint-initdb.d/init-postgres.sh
adminer:
......
......@@ -64,7 +64,6 @@ final class DatasetAction extends AbstractAction
'count',
'vo',
'data_path',
'selectable_row',
'config',
'id_dataset_family'
);
......@@ -117,7 +116,6 @@ final class DatasetAction extends AbstractAction
$dataset->setCount($parsedBody['count']);
$dataset->setVo($parsedBody['vo']);
$dataset->setDataPath($parsedBody['data_path']);
$dataset->setSelectableRow($parsedBody['selectable_row']);
$dataset->setConfig($parsedBody['config']);
$this->em->flush();
}
......
......@@ -83,7 +83,6 @@ final class DatasetListAction extends AbstractAction
'count',
'vo',
'data_path',
'selectable_row',
'config',
'project_name'
);
......@@ -136,7 +135,6 @@ final class DatasetListAction extends AbstractAction
$dataset->setCount($parsedBody['count']);
$dataset->setVo($parsedBody['vo']);
$dataset->setDataPath($parsedBody['data_path']);
$dataset->setSelectableRow($parsedBody['selectable_row']);
$dataset->setConfig($parsedBody['config']);
$dataset->setProject($project);
$dataset->setDatasetFamily($datasetFamily);
......
......@@ -94,6 +94,7 @@ final class InstanceAction extends AbstractAction
} else {
$instance->setClientUrl(null);
}
$instance->setConfig($parsedBody['config']);
$this->em->flush();
}
}
......@@ -74,6 +74,7 @@ final class InstanceListAction extends AbstractAction
if (!$this->isEmptyField('client_url', $parsedBody)) {
$instance->setClientUrl($parsedBody['client_url']);
}
$instance->setConfig($parsedBody['config']);
$this->em->persist($instance);
$this->em->flush();
......
......@@ -77,13 +77,6 @@ class Dataset implements \JsonSerializable
*/
protected $dataPath;
/**
* @var bool
*
* @Column(type="boolean", name="selectable_row", nullable=false)
*/
protected $selectableRow;
/**
* @var string
*
......@@ -195,16 +188,6 @@ class Dataset implements \JsonSerializable
$this->dataPath = $dataPath;
}
public function getSelectableRow()
{
return $this->selectableRow;
}
public function setSelectableRow($selectableRow)
{
$this->selectableRow = $selectableRow;
}
public function getConfig()
{
return $this->config;
......@@ -251,7 +234,6 @@ class Dataset implements \JsonSerializable
'count' => $this->getCount(),
'vo' => $this->getVo(),
'data_path' => $this->getDataPath(),
'selectable_row' => $this->getSelectableRow(),
'config' => $this->getConfig(),
'project_name' => $this->getProject()->getName(),
'id_dataset_family' => $this->getDatasetFamily()->getId()
......
......@@ -42,6 +42,13 @@ class Instance implements \JsonSerializable
*/
protected $clientUrl;
/**
* @var string
*
* @Column(type="json", nullable=true)
*/
protected $config;
/**
* @var Anis\Entity\DatasetFamily[]
*
......@@ -81,6 +88,16 @@ class Instance implements \JsonSerializable
$this->clientUrl = $clientUrl;
}
public function getConfig()
{
return $this->config;
}
public function setConfig($config)
{
$this->config = $config;
}
public function getDatasetFamilies()
{
return $this->datasetFamilies;
......@@ -101,6 +118,7 @@ class Instance implements \JsonSerializable
'name' => $this->getName(),
'label' => $this->getLabel(),
'client_url' => $this->getClientUrl(),
'config' => $this->getConfig(),
'nb_dataset_families' => $this->getDatasetFamilies()->count(),
'nb_datasets' => $this->getNbDatasets()
];
......
......@@ -228,7 +228,6 @@ final class AttributeActionTest extends TestCase
$dataset->setCount(10000);
$dataset->setVo(false);
$dataset->setDataPath('/mnt/obs_cat');
$dataset->setSelectableRow(false);
$dataset->setProject($project);
$dataset->setDatasetFamily($family);
$this->entityManager->persist($dataset);
......
......@@ -132,7 +132,6 @@ final class AttributeListActionTest extends TestCase
$dataset->setCount(10000);
$dataset->setVo(false);
$dataset->setDataPath('/mnt/obs_cat');
$dataset->setSelectableRow(false);
$dataset->setProject($project);
$dataset->setDatasetFamily($family);
$this->entityManager->persist($dataset);
......
......@@ -178,7 +178,6 @@ final class CriteriaFamilyActionTest extends TestCase
$dataset->setCount(10000);
$dataset->setVo(false);
$dataset->setDataPath('/mnt/obs_cat');
$dataset->setSelectableRow(false);
$dataset->setProject($project);
$dataset->setDatasetFamily($family);
$this->entityManager->persist($dataset);
......
......@@ -179,7 +179,6 @@ final class CriteriaFamilyListActionTest extends TestCase
$dataset->setCount(10000);
$dataset->setVo(false);
$dataset->setDataPath('/mnt/obs_cat');
$dataset->setSelectableRow(false);
$dataset->setProject($project);
$dataset->setDatasetFamily($family);
$this->entityManager->persist($dataset);
......
......@@ -134,7 +134,6 @@ final class DatasetActionTest extends TestCase
'count' => 5000,
'vo' => false,
'data_path' => '/mnt/dataset1',
'selectable_row' => false,
'config' => '{}',
'id_dataset_family' => 1
);
......@@ -199,7 +198,6 @@ final class DatasetActionTest extends TestCase
$dataset->setCount(10000);
$dataset->setVo(false);
$dataset->setDataPath('/mnt/obs_cat');
$dataset->setSelectableRow(false);
$dataset->setProject($project);
$dataset->setDatasetFamily($family);
$this->entityManager->persist($dataset);
......
......@@ -125,7 +125,6 @@ final class DatasetListActionTest extends TestCase
'count' => 10000,
'vo' => false,
'data_path' => '/mnt/dataset1',
'selectable_row' => false,
'config' => '{}',
'project_name' => 'anis_project',
'id_dataset_family' => 1
......@@ -191,7 +190,6 @@ final class DatasetListActionTest extends TestCase
$dataset1->setCount(10000);
$dataset1->setVo(false);
$dataset1->setDataPath('/mnt/dataset1');
$dataset1->setSelectableRow(false);
$dataset1->setProject($project);
$dataset1->setDatasetFamily($family);
$this->entityManager->persist($dataset1);
......@@ -204,7 +202,6 @@ final class DatasetListActionTest extends TestCase
$dataset2->setCount(5000);
$dataset2->setVo(false);
$dataset2->setDataPath('/mnt/dataset2');
$dataset2->setSelectableRow(false);
$dataset2->setProject($project);
$dataset2->setDatasetFamily($family);
$this->entityManager->persist($dataset2);
......
......@@ -130,7 +130,6 @@ final class DatasetListByInstanceActionTest extends TestCase
$dataset->setCount(10000);
$dataset->setVo(false);
$dataset->setDataPath('/mnt/obs_cat');
$dataset->setSelectableRow(false);
$dataset->setProject($project);
$dataset->setDatasetFamily($family);
$this->entityManager->persist($dataset);
......@@ -143,7 +142,6 @@ final class DatasetListByInstanceActionTest extends TestCase
$dataset2->setCount(5000);
$dataset2->setVo(false);
$dataset2->setDataPath('/mnt/observations');
$dataset2->setSelectableRow(false);
$dataset2->setProject($project);
$dataset2->setDatasetFamily($family);
$this->entityManager->persist($dataset2);
......
......@@ -70,6 +70,7 @@ final class InstanceActionTest extends TestCase
$fields = array(
'label' => 'AspiC',
'client_url' => 'http://aspic.lam.fr',
'config' => '{}',
'nb_dataset_families' => 0,
'nb_datasets' => 0
);
......
......@@ -63,6 +63,7 @@ final class InstanceListActionTest extends TestCase
'name' => 'aspic',
'label' => 'Aspic',
'client_url' => 'http://cesam.lam.fr/aspic',
'config' => '{}',
'nb_dataset_families' => 0,
'nb_datasets' => 0
);
......
......@@ -197,7 +197,6 @@ final class OutputCategoryActionTest extends TestCase
$dataset->setCount(10000);
$dataset->setVo(false);
$dataset->setDataPath('/mnt/obs_cat');
$dataset->setSelectableRow(false);
$dataset->setProject($project);
$dataset->setDatasetFamily($family);
$this->entityManager->persist($dataset);
......