Commit 70b03e90 authored by Robert Butora's avatar Robert Butora
Browse files

vlkb-obscore: 1. config *_surveys -> *_datasets ; 2. implements ingestion of... 

vlkb-obscore: 1. config *_surveys -> *_datasets ; 2. implements ingestion of given extension HDU (--extnum)
parent 68bee9a7

data-access/engine/src/common/include/fitsfiles.hpp

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ namespace fitsfiles 
      key_values_by_type key_values;

   };



   std::vector<Hdu> fname2hdrstr(std::string filename, unsigned int maxHduPos, const keys_by_type *keys = nullptr);

   std::vector<Hdu> fname2hdrstr(std::string filename, unsigned int maxHduPos, unsigned int minHduPos = 1, const keys_by_type *keys = nullptr);





   // for services

data-access/engine/src/common/src/fitsfiles.cpp

+2 −2
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ string fitsfiles::append_card_if_not_in_header(string header, const vector<fits_ 
// deprecated



vector<fitsfiles::Hdu> fitsfiles::fname2hdrstr(

      string filename, unsigned int maxHduPos,

      string filename, unsigned int maxHduPos, unsigned int minHduPos,

      const keys_by_type* keys)

{

   LOG_trace(__func__);
@@ -369,7 +369,7 @@ vector<fitsfiles::Hdu> fitsfiles::fname2hdrstr( 


   // FIXME enhance fits::header to avoid open the file at each cycle

   unsigned int hdupos;

   for(hdupos = 1; hdupos <= maxHduPos; hdupos++)

   for(hdupos = minHduPos; hdupos <= maxHduPos; hdupos++)

   {

      fits::header hdr(filename, hdupos);

      // FIXME catch run-time except if not IMAGE_HDU -> how to deal with this?

data-access/engine/src/vlkb-obscore/src/config.hpp

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ class config 
   private:

      std::string value(std::string key) {return m_settings.at(key);}



      const std::string fits_dir{"fits_path_surveys"};

      const std::string fits_dir{"fits_path_datasets"};



      const std::string pg_uri{"pg_uri"};

      const std::string pg_schema{"pg_schema"};
@@ -48,7 +48,7 @@ class config 


      std::map<const std::string, std::string> m_settings 

      {

         {fits_dir, "/srv/surveys"},

         {fits_dir, "/srv/datasets"},



            {pg_uri,    empty_string},

            {pg_schema, empty_string},

data-access/engine/src/vlkb-obscore/src/database.hpp

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ namespace database 
         const std::string obscore_access_format,

         const std::string remote_fitsdir,

         const std::string db_uri, const std::string db_schema,

         const std::string fitsdir, int max_hdupos);

         const std::string fitsdir,

			int max_hdupos, int min_hdupos = 1);



   void dbModifyGroups(int sid, const std::string groups,

         const std::string obscore_publisher,

data-access/engine/src/vlkb-obscore/src/database/database.cpp

+4 −2
Original line number Diff line number Diff line
@@ -257,7 +257,8 @@ void database::dbAddSurvey(int sid, const string groups, 
      const string obscore_publisher,

      const string obscore_access_format,

      const string obscore_access_url,

      const string db_uri, const string db_schema, const string fitsdir, int max_hdupos)

      const string db_uri, const string db_schema, const string fitsdir,

		int max_hdupos, int min_hdupos)

{

   LOG_trace(__func__);
@@ -313,7 +314,8 @@ void database::dbAddSurvey(int sid, const string groups, 
      // 4. set optional values which are available (in header or in metadata)

      try

      {

         const std::vector<fitsfiles::Hdu> all_hdu{fitsfiles::fname2hdrstr(pathname, max_hdupos,&in_keys)};

			int min_hdupos = 1;

         const std::vector<fitsfiles::Hdu> all_hdu{fitsfiles::fname2hdrstr(pathname, max_hdupos, min_hdupos, &in_keys)};



         for(fitsfiles::Hdu hdu : all_hdu)

         {