diff --git a/data-access/engine/src/vlkb-obscore/src/database/SqlSchema.cpp b/data-access/engine/src/vlkb-obscore/src/database/SqlSchema.cpp index b8f18a8a5ed7d320d5d3301cacdafccd0de1a3ba..4575c1b06765c446e066615101d15574beb26619 100644 --- a/data-access/engine/src/vlkb-obscore/src/database/SqlSchema.cpp +++ b/data-access/engine/src/vlkb-obscore/src/database/SqlSchema.cpp @@ -84,8 +84,11 @@ void SqlSchema::reset(void) {dataproduct_type, "dataproduct_type VARCHAR"}, {calib_level, "calib_level INTEGER NOT NULL"}, {obs_collection, "obs_collection VARCHAR NOT NULL"}, + {obs_title, "obs_title VARCHAR"}, {obs_id, "obs_id VARCHAR NOT NULL"}, {obs_publisher_id, "obs_publisher_did VARCHAR PRIMARY KEY"}, + {bib_reference, "bib_reference VARCHAR"}, + {data_rights, "data_rights VARCHAR"}, {access_url, "access_url TEXT"}, {access_format, "access_format VARCHAR"}, {access_estsize, "access_estsize BIGINT"}, diff --git a/data-access/engine/src/vlkb-obscore/src/database/SqlSchema.hpp b/data-access/engine/src/vlkb-obscore/src/database/SqlSchema.hpp index 426671c95af70ff5e970e5369717ef4f4c84ddfd..535da16076cb96326751936db0c9281ea0668d6f 100644 --- a/data-access/engine/src/vlkb-obscore/src/database/SqlSchema.hpp +++ b/data-access/engine/src/vlkb-obscore/src/database/SqlSchema.hpp @@ -34,7 +34,8 @@ class SqlSchema enum verticesgalColId {vgheader_id, p1lon, p1lat, p2lon, p2lat, p3lon, p3lat, p4lon, p4lat}; enum verticesicrsColId {viheader_id, p1ra, p1dec, p2ra, p2dec, p3ra, p3dec, p4ra, p4dec}; enum obscoreColId {dataproduct_type, calib_level, - obs_collection, obs_id, obs_publisher_id, + obs_collection, obs_title, obs_id, obs_publisher_id, + bib_reference, data_rights, access_url, access_format, access_estsize, target_name, s_ra, s_dec, s_fov, s_region, s_region_galactic, s_xel1, s_xel2, s_resolution, t_min, t_max, t_exptime, t_resolution, t_xel, diff --git a/data-access/engine/src/vlkb-obscore/src/database/SqlSchema_INSERT.cpp b/data-access/engine/src/vlkb-obscore/src/database/SqlSchema_INSERT.cpp index 27c8d99f3cdb262c2794bd9f3d6712a41ab50b4e..eddf0a08c3a098c74ff32915785a0dd432ddf4ac 100644 --- a/data-access/engine/src/vlkb-obscore/src/database/SqlSchema_INSERT.cpp +++ b/data-access/engine/src/vlkb-obscore/src/database/SqlSchema_INSERT.cpp @@ -238,6 +238,8 @@ void SqlSchema_INSERT::appendRow( const string& obs_id, const string& obs_publisher_did, + const string& obs_title, + const string& bib_reference, const string& dataproduct_type, const string& o_ucd, @@ -262,13 +264,16 @@ void SqlSchema_INSERT::appendRow( // optional + obscoreRow[SqlSchema::obscoreColId::obs_title] = to_sqlstring(obs_title); + obscoreRow[SqlSchema::obscoreColId::bib_reference] = to_sqlstring(bib_reference); + obscoreRow[SqlSchema::obscoreColId::data_rights] = to_sqlstring(auth_policy); + obscoreRow[SqlSchema::obscoreColId::dataproduct_type] = to_sqlstring(dataproduct_type); + obscoreRow[SqlSchema::obscoreColId::o_ucd] = to_sqlstring(o_ucd); + obscoreRow[SqlSchema::obscoreColId::access_url] = to_sqlstring(access_url); obscoreRow[SqlSchema::obscoreColId::access_format] = to_sqlstring(access_format); obscoreRow[SqlSchema::obscoreColId::access_estsize] = to_string(access_estsize); - obscoreRow[SqlSchema::obscoreColId::o_ucd] = to_sqlstring(o_ucd); - obscoreRow[SqlSchema::obscoreColId::dataproduct_type] = to_sqlstring(dataproduct_type); - obscoreRow[facility_name] = to_sql_value(hdu.key_values, "TELESCOP"); obscoreRow[instrument_name] = to_sql_value(hdu.key_values, "INSTRUME"); obscoreRow[target_name] = to_sql_value(hdu.key_values, "OBJECT"); diff --git a/data-access/engine/src/vlkb-obscore/src/database/SqlSchema_INSERT.hpp b/data-access/engine/src/vlkb-obscore/src/database/SqlSchema_INSERT.hpp index e9048dc0d2183c8dc4a26c3060336ef4b3b74e27..0646f2672944edde02a2597d787ed135b3ddffc2 100644 --- a/data-access/engine/src/vlkb-obscore/src/database/SqlSchema_INSERT.hpp +++ b/data-access/engine/src/vlkb-obscore/src/database/SqlSchema_INSERT.hpp @@ -23,6 +23,8 @@ class SqlSchema_INSERT : public SqlSchema const std::string& obs_id, const std::string& obs_publisher_did, // optional + const std::string& obs_title, + const std::string& bib_reference, const std::string& dataproduct_type, const std::string& o_ucd, diff --git a/data-access/engine/src/vlkb-obscore/src/database/database.cpp b/data-access/engine/src/vlkb-obscore/src/database/database.cpp index a4a78be91c2534ea438907fa0464e4020b88d329..cbf1a0caaab5907055f44a139c63b6ca8abe0586 100644 --- a/data-access/engine/src/vlkb-obscore/src/database/database.cpp +++ b/data-access/engine/src/vlkb-obscore/src/database/database.cpp @@ -307,6 +307,8 @@ void database::dbAddSurvey(int sid, const string groups, const string obs_id = rel_pathname.substr(0, rel_pathname.find_last_of(".")); const string obs_publisher_did = obscore_publisher + "?" + rel_pathname; + // optional + const string obs_title{surv.survSpecies + " | " + surv.survTransition}; // 4. set optional values which are available (in header or in metadata) try @@ -320,6 +322,8 @@ void database::dbAddSurvey(int sid, const string groups, obs_collection, obs_id, obs_publisher_did, + obs_title, + surv.survDescription, surv.dataproductType, surv.oUcd, access_url, access_format, access_estsize,