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 a25b6ea5b5d743a8748af1f584a3072c0d66ac75..4a44b776b2b0605f94f3b2031227dc6a06b7154b 100644 --- a/data-access/engine/src/vlkb-obscore/src/database/database.cpp +++ b/data-access/engine/src/vlkb-obscore/src/database/database.cpp @@ -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( diff --git a/data-access/engine/src/vlkb-obscore/src/main.cpp b/data-access/engine/src/vlkb-obscore/src/main.cpp index 9746dc32bd3199a8535871b02e92c8841a0683d7..23e8b0c01599e4d9d18d7f15af2c60e0a9711171 100644 --- a/data-access/engine/src/vlkb-obscore/src/main.cpp +++ b/data-access/engine/src/vlkb-obscore/src/main.cpp @@ -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]);