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 3facbb347dc461380b561ff141dae565994f2642..08e278443d98046c04de2d11161fbb6b2ba7019b 100644 --- a/data-access/engine/src/vlkb-obscore/src/database/database.cpp +++ b/data-access/engine/src/vlkb-obscore/src/database/database.cpp @@ -319,55 +319,57 @@ void database::dbAddSurvey(int sid, const string groups, // 4. set optional values which are available (in header or in metadata) try - { + { ostringstream restfrq; - restfrq << "RESTFRQ = " << setw(20) << surv.restFrequency << " / VLKB added"; + restfrq.setf(ios::fixed, ios::floatfield); + restfrq.setf(ios::showpoint); + restfrq << "RESTFRQ = " << setw(20) << setprecision(1) << surv.restFrequency << left << setw(50) << " / VLKB added"; vector<string> extra_cards{restfrq.str()}; - for(size_t i=0; i<extra_cards.size(); i++) LOG_STREAM << "extra_cards["<< i<<"]: "<< extra_cards[i] << endl; + for(size_t i=0; i<extra_cards.size(); i++) LOG_STREAM << "extra_cards["<< i<<"]: "<< extra_cards[i] << "<" << endl; - const std::vector<fitsfiles::Hdu> all_hdu{fitsfiles::fname2hdrstr(pathname, extra_cards, max_hdupos, min_hdupos, &in_keys)}; + const std::vector<fitsfiles::Hdu> all_hdu{fitsfiles::fname2hdrstr(pathname, extra_cards, max_hdupos, min_hdupos, &in_keys)}; //LOG_STREAM << "HDU-count: " << to_string(all_hdu.size()) << endl; - for(fitsfiles::Hdu hdu : all_hdu) - { - LOG_STREAM << "HDU: " << hdu.m_header << endl; - cmdInsert.appendRow( - calib_level, - obs_collection, - obs_id, - obs_publisher_did, - obs_title, - surv.survDescription, - surv.dataproductType, - surv.oUcd, - access_url, access_format, access_estsize, - hdu, - surv.restFrequency, - surv.authPolicy, - groups); - } - } - catch (std::exception const &e) - { - LOG_STREAM << "ERR " + string(__func__) + ": " << pathname << " : "<< e.what() << endl; - } - } - - db.dbExecCmds(cmdInsert.getINSERT()); + for(fitsfiles::Hdu hdu : all_hdu) + { + //LOG_STREAM << "HDU: " << hdu.m_header << "<" << endl; + cmdInsert.appendRow( + calib_level, + obs_collection, + obs_id, + obs_publisher_did, + obs_title, + surv.survDescription, + surv.dataproductType, + surv.oUcd, + access_url, access_format, access_estsize, + hdu, + surv.restFrequency, + surv.authPolicy, + groups); + } + } + catch (std::exception const &e) + { + LOG_STREAM << "ERR " + string(__func__) + ": " << pathname << " : "<< e.what() << endl; + } + } + + db.dbExecCmds(cmdInsert.getINSERT()); } void database::dbModifyGroups(int sid, const string groups, - const string obscore_publisher, - const string db_uri, const string db_schema) + const string obscore_publisher, + const string db_uri, const string db_schema) { - LOG_trace(__func__); + LOG_trace(__func__); - DbConn db(db_uri, db_schema); - Survey surv = db.querySurveyAttributes(sid); + DbConn db(db_uri, db_schema); + Survey surv = db.querySurveyAttributes(sid); vector<string> cmdModGroups {