Commit f3ce058f authored by Robert Butora's avatar Robert Butora
Browse files

vlkb-obscore: fixes two typo bugs in SID-from SID-to handling

parent 64471659

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

+8 −1
Original line number Diff line number Diff line
@@ -269,6 +269,9 @@ void database::dbAddSurvey(int sid, const string groups, 


   // 2, storage-filter identifies the files: collect them

   string storageFilter = surv.getStorageFilter();



	LOG_STREAM << "StorageFilter: " << storageFilter << endl;



   std::vector<string> pathnames = fitsfiles::globVector(fitsdir + "/" + storageFilter);

   if(pathnames.size() == 0)

   {
@@ -291,6 +294,9 @@ void database::dbAddSurvey(int sid, const string groups, 
   };

   SqlSchema_INSERT cmdInsert;

   const string access_format{obscore_access_format};



	LOG_STREAM << "FITS files found: " << to_string(pathnames.size()) << endl;



   for(unsigned int i=0; i < pathnames.size(); i++)

   {

      // do optional obscore::access_* fields
@@ -314,9 +320,10 @@ void database::dbAddSurvey(int sid, const string groups, 
      // 4. set optional values which are available (in header or in metadata)

      try

      {

			int min_hdupos = 1;

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



			//LOG_STREAM << "HDU-count: " << to_string(all_hdu.size()) << endl;



         for(fitsfiles::Hdu hdu : all_hdu)

         {

            cmdInsert.appendRow(

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

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ int cmd_dbAdd(int argc, char * argv[]) 


      case 4:

         sid_from = std::stoi(argv[1]);

         sid_to   = sid_from;

			if(0 == string{"--extnum"}.compare(string{argv[2]}))

			{

         	min_hdupos = max_hdupos = 1 + std::stoi(argv[3]);